handle nested arrays and dictionaries

chee · May 5, 2017 · 94ab24c · 94ab24c
1 parent 3fb3858
commit 94ab24c
Showing 1 changed file with 16 additions and 2 deletions.
diff --git a/code/parse.js b/code/parse.js
@@ -22,10 +22,10 @@ const escapes = {
 }
 
 const escape = string =>
-  string.replace(/\\(.)/g, (_, character) => escapes[character])
+  string.replace(/\\([\"])/g, (_, character) => escapes[character])
 
 // TODO add support for binary data
-const tokens = /^\s*(?:([,;=(){}])|"((?:[^\\"]|\\["\\])*)")/
+const tokens = /^\s*(?:([,;=(){}])|"((?:\\"|[^"])*)")/
 
 // string.js
 const stringAction = {
@@ -99,6 +99,14 @@ const action = {
       container = last.container
       key = last.key
       state = last.state
+    },
+    // trailing ; in dictionary definitions
+    [dictKey] () {
+      const last = stack.pop()
+      value = container
+      container = last.container
+      key = last.key
+      state = last.state
     }
   },
   '(': {
@@ -113,18 +121,24 @@ const action = {
         key,
         state: dictSeparator
       })
+      container = []
+      state = firstArrayValue
     },
     [firstArrayValue] () {
       stack.push({
         container,
         state: arraySeparator
       })
+      container = []
+      state = firstArrayValue
     },
     [arrayValue] () {
       stack.push({
         container,
         state: arraySeparator
       })
+      container = []
+      state = firstArrayValue
     }
   },
   ')': {