COMMON: update json error message

Author: chrisws

src/common/sberr.c

@@ -367,6 +367,10 @@ void err_array() {
   rt_raise(MSG_ARRAY_SE);
 }
 
+void err_json(int pos) {
+  err_throw(MSG_ERR_JSON, pos);
+}
+
 void err_form_input() {
   err_throw(ERR_FORM_INPUT);
 }

src/common/sberr.h

@@ -76,6 +76,7 @@ void err_run_err(const char *file);
 void err_ref_var();
 void err_ref_circ_var();
 void err_array();
+void err_json(int pos);
 void err_form_input();
 void err_memory();
 void err_network();

src/common/var_map.c

@@ -528,7 +528,7 @@ int map_create_array(var_p_t dest, JsonTokens *json, int end_position, int index
   list.head = NULL;
   list.tail = NULL;
 
-  while (i < json->num_tokens) {
+  while (i < json->num_tokens && !prog_error) {
     jsmntok_t token = json->tokens[i];
     if (token.start > end_position) {
       break;
@@ -545,7 +545,7 @@ int map_create_array(var_p_t dest, JsonTokens *json, int end_position, int index
             cols = curcol;
           }
         }
-        while (delim != NULL) {
+        while (delim != NULL && !prog_error) {
           rows++;
           curcol = 0;
           len -= (delim - str) + 1;
@@ -583,7 +583,7 @@ int map_create_array(var_p_t dest, JsonTokens *json, int end_position, int index
 int map_create(var_p_t dest, JsonTokens *json, int end_position, int index) {
   hashmap_create(dest, 0);
   int i = index;
-  while (i < json->num_tokens) {
+  while (i < json->num_tokens && !prog_error) {
     jsmntok_t token = json->tokens[i];
     if (token.start > end_position) {
       break;
@@ -593,7 +593,12 @@ int map_create(var_p_t dest, JsonTokens *json, int end_position, int index) {
       var_p_t value = hashmap_putv(dest, key);
       i = map_read_next_token(value, json, i + 1);
     } else {
-      err_array();
+      int position = token.start;
+      if (i > 0) {
+        // error near end of previous token
+        position = json->tokens[i - 1].start;
+      }
+      err_json(position);
       break;
     }
   }

src/languages/messages.en.h

@@ -124,6 +124,7 @@
 #define MSG_MISSING_ENDTRY      "TRY without END TRY"
 #define MSG_FUNC_NOT_ASSIGNED   "The value returned from %s was not assigned"
 #define MSG_RETURN_NOT_ASSIGNED "FUNC (line %d) - result not assigned"
+#define MSG_ERR_JSON            "JSON decode error. Error near position [%d]"
 
 // executor
 #define WORD_ERROR_AT           "ERROR AT"