readJSON: fix parsing JSONish when the field names are also JS reserv…

…ed words Also tidy up lexer using a #define for reserved words
espruino · Nov 29, 2023 · 9949075 · 9949075
1 parent d6d1fff
commit 9949075
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 6 deletions.
diff --git a/src/jslex.c b/src/jslex.c
@@ -1077,7 +1077,7 @@ void jslGetTokenString(char *str, size_t len) {
 char *jslGetTokenValueAsString() {
   assert(lex->tokenl < JSLEX_MAX_TOKEN_LENGTH);
   lex->token[lex->tokenl]  = 0; // add final null
-  if (lex->tokenl==0 && lex->tk >= _LEX_R_LIST_START && lex->tk <= _LEX_R_LIST_END) {
+  if (lex->tokenl==0 && LEX_IS_RESERVED_WORD(lex->tk)) {
     // pretokenised - so we'll work out the name from our token name list
     // this isn't fast, but won't be called very often
     jslTokenAsString(lex->tk, lex->token, sizeof(lex->token));
@@ -1094,7 +1094,7 @@ int jslGetTokenLength() {
 JsVar *jslGetTokenValueAsVar() {
   if (lex->tokenValue) {
     return jsvLockAgain(lex->tokenValue);
-  } else if (lex->tk >= _LEX_R_LIST_START && lex->tk <= _LEX_R_LIST_END) {
+  } else if (LEX_IS_RESERVED_WORD(lex->tk)) {
     // in pretokenised code, we must make this up
     return jsvNewFromString(jslReservedWordAsString(lex->tk));
   } else {
@@ -1106,7 +1106,7 @@ JsVar *jslGetTokenValueAsVar() {
 
 bool jslIsIDOrReservedWord() {
   return lex->tk == LEX_ID ||
-         (lex->tk >= _LEX_R_LIST_START && lex->tk <= _LEX_R_LIST_END);
+         LEX_IS_RESERVED_WORD(lex->tk);
 }
 
 /* Match failed - report error message */

diff --git a/src/jslex.h b/src/jslex.h
@@ -124,6 +124,9 @@ _LEX_OPERATOR2_END = LEX_NULLISH,
 _LEX_TOKENS_END = _LEX_OPERATOR2_END, /* always the last entry for symbols */
 } LEX_TYPES;
 
+// Is the supplied token an ID that is a JS reserved word
+#define LEX_IS_RESERVED_WORD(tk) (tk >= _LEX_R_LIST_START && tk <= _LEX_R_LIST_END)
+
 
 typedef struct JslCharPos {
   JsvStringIterator it;

diff --git a/src/jswrap_json.c b/src/jswrap_json.c
@@ -137,9 +137,9 @@ JsVar *jswrap_json_parse_internal(JSONFlags flags) {
   case '{': {
     JsVar *obj = jsvNewObject(); if (!obj) return 0;
     jslGetNextToken(); // {
-    while ((lex->tk == LEX_STR || lex->tk == LEX_ID) && !jspHasError()) {
-      if (!(flags&JSON_DROP_QUOTES) && (lex->tk == LEX_ID)) {
-	jslMatch(LEX_STR);
+    while ((lex->tk == LEX_STR || jslIsIDOrReservedWord()) && !jspHasError()) {
+      if (!(flags&JSON_DROP_QUOTES) && jslIsIDOrReservedWord()) {
+	      jslMatch(LEX_STR);
         return obj;
       }
       JsVar *key = jsvAsArrayIndexAndUnLock(jslGetTokenValueAsVar());