Fix number parsing for bases between 2 and 9.

Allow multisyms to have number keys.
janet-lang · Jan 2, 2019 · 29ec30c · 29ec30c
1 parent 122312d
commit 29ec30c
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 1 deletion.
diff --git a/src/core/multisym.c b/src/core/multisym.c
@@ -30,7 +30,16 @@ static JanetSlot multisym_parse_part(JanetCompiler *c, const uint8_t *sympart, i
     if (sympart[0] == ':') {
         return janetc_cslot(janet_symbolv(sympart, len));
     } else {
-        return janetc_resolve(c, janet_symbol(sympart + 1, len - 1));
+        double index;
+        int err;
+        index = janet_scan_number(sympart + 1, len - 1, &err);
+        if (err) {
+            /* not a number */
+            return janetc_resolve(c, janet_symbol(sympart + 1, len - 1));
+        } else {
+            /* is a number */
+            return janetc_cslot(janet_wrap_number(index));
+        }
     }
 }
 

diff --git a/src/core/strtod.c b/src/core/strtod.c
@@ -272,6 +272,11 @@ double janet_scan_number(
     if (str + 1 < end && str[0] == '0' && str[1] == 'x') {
         base = 16;
         str += 2;
+    } else if (str + 1 < end  &&
+            str[0] >= '0' && str[0] <= '9' &&
+            str[1] == 'r') {
+        base = str[0] - '0';
+        str += 2;
     } else if (str + 2 < end  &&
             str[0] >= '0' && str[0] <= '9' &&
             str[1] >= '0' && str[1] <= '9' &&