Merge JSON5 support into 7.0

modules/database/src/ioc/dbStatic/dbLex.l

@@ -10,6 +10,7 @@
 
 newline     "\n"
 backslash   "\\"
+singlequote "'"
 doublequote "\""
 comment     "#"
 whitespace  [ \t\r\n]
@@ -18,17 +19,30 @@ stringchar  [^"\n\\]
 bareword    [a-zA-Z0-9_\-+:.\[\]<>;]
 
 punctuation [:,\[\]{}]
-normalchar  [^"\\\0-\x1f]
+normalchar  [^"'\\\0-\x1f]
 barechar    [a-zA-Z0-9_\-+.]
-escapedchar ({backslash}["\\/bfnrt])
+escapedchar ({backslash}[^ux1-9])
 hexdigit    [0-9a-fA-F]
+latinchar   ({backslash}"x"{hexdigit}{2})
 unicodechar ({backslash}"u"{hexdigit}{4})
-jsonchar    ({normalchar}|{escapedchar}|{unicodechar})
-jsondqstr   ({doublequote}{jsonchar}*{doublequote})
-int         ("-"?([0-9]|[1-9][0-9]+))
+jsondqchar  ({normalchar}|{singlequote}|{escapedchar}|{latinchar}|{unicodechar})
+jsondqstr   ({doublequote}{jsondqchar}*{doublequote})
+jsonsqchar  ({normalchar}|{doublequote}|{escapedchar}|{latinchar}|{unicodechar})
+jsonsqstr   ({singlequote}{jsonsqchar}*{singlequote})
+jsonstr     ({jsondqstr}|{jsonsqstr})
+
+sign        ([+-]?)
+int         ({sign}([0-9]|[1-9][0-9]+))
 frac        ("."[0-9]+)
-exp         ([eE][+-]?[0-9]+)
-number      ({int}{frac}?{exp}?)
+exp         ([eE]{sign}[0-9]+)
+jsonnum     ({int}{frac}?{exp}?)
+intexp      ({int}"."{exp}?)
+fracexp     ({sign}{frac}{exp}?)
+specialnum  ("NaN"|{sign}"Infinity")
+
+zerox       ("0x"|"0X")
+hexint      ({sign}{zerox}{hexdigit}+)
+number      ({jsonnum}|{intexp}|{fracexp}|{specialnum}|{hexint})
 
 %{
 #undef YY_INPUT
@@ -97,7 +111,7 @@ static int yyreset(void)
 
 <JSON>{punctuation}     return yytext[0];
 
-<JSON>{jsondqstr} {
+<JSON>{jsonstr} {
     yylval.Str = dbmfStrdup((char *) yytext);
     return jsonSTRING;
 }

modules/database/src/ioc/dbStatic/dbLexRoutines.c

@@ -1172,12 +1172,14 @@ static void dbRecordField(char *name,char *value)
         yyerror(NULL);
         return;
     }
-    if (*value == '"') {
+
+    if (*value == '"' || *value == '\'') {
         /* jsonSTRING values still have their quotes */
         value++;
         value[strlen(value) - 1] = 0;
+        dbTranslateEscape(value, value);    /* in-place; safe & legal */
     }
-    dbTranslateEscape(value, value);    /* in-place; safe & legal */
+
     status = dbPutString(pdbentry,value);
     if (status) {
         char msg[128];
@@ -1203,12 +1205,14 @@ static void dbRecordInfo(char *name, char *value)
     if (duplicate) return;
     ptempListNode = (tempListNode *)ellFirst(&tempList);
     pdbentry = ptempListNode->item;
-    if (*value == '"') {
+
+    if (*value == '"' || *value == '\'') {
         /* jsonSTRING values still have their quotes */
         value++;
         value[strlen(value) - 1] = 0;
+        dbTranslateEscape(value, value);    /* in-place; safe & legal */
     }
-    dbTranslateEscape(value, value);    /* yuck: in-place, but safe */
+
     status = dbPutInfo(pdbentry,name,value);
     if (status) {
         epicsPrintf("Can't set \"%s\" info \"%s\" to \"%s\"\n",

modules/database/src/ioc/dbStatic/dbYacc.y

@@ -32,8 +32,8 @@ static int yyAbort = 0;
 
 %token jsonNULL jsonTRUE jsonFALSE
 %token <Str> jsonNUMBER jsonSTRING jsonBARE
-%type <Str> json_value json_object json_array
-%type <Str> json_members json_pair json_elements json_string
+%type <Str> json_value json_string json_object json_array
+%type <Str> json_members json_pair json_key json_elements
 
 %%
 
@@ -299,13 +299,24 @@ json_members: json_pair
     if (dbStaticDebug>2) printf("json %s\n", $$);
 };
 
-json_pair: json_string ':' json_value
+json_pair: json_key ':' json_value
 {
     $$ = dbmfStrcat3($1, ":", $3);
     dbmfFree($1); dbmfFree($3);
     if (dbStaticDebug>2) printf("json %s\n", $$);
 };
 
+json_key: jsonSTRING
+    | jsonBARE
+{
+    /* A key containing any of these characters must be quoted for YAJL */
+    if (strcspn($1, "+-.") < strlen($1)) {
+        $$ = dbmfStrcat3("\"", $1, "\"");
+        dbmfFree($1);
+    }
+    if (dbStaticDebug>2) printf("json %s\n", $$);
+};
+
 json_string: jsonSTRING
     | jsonBARE
 {