Prevent empty index access ([])

trufflesuite · Apr 28, 2021 · a1a6f35 · a1a6f35
1 parent 0a505d7
commit a1a6f35
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 2 deletions.
diff --git a/packages/parse-mapping-lookup/src/grammar.ts b/packages/parse-mapping-lookup/src/grammar.ts
@@ -41,8 +41,8 @@ export const definitions: Definitions<Forms> = {
 
   value: ({ construct }) =>
     noCharOf("]").pipe(
-      many(),
-      map(characters => construct({ contents: characters.join("") }))
+      then(noCharOf("]").pipe(many())),
+      map(([first, rest]) => construct({ contents: [first, ...rest].join("") }))
     ),
 
   indexAccess: ({ construct, tie }) =>

diff --git a/packages/parse-mapping-lookup/src/parser.spec.ts b/packages/parse-mapping-lookup/src/parser.spec.ts
@@ -86,6 +86,12 @@ const testCases = [
       position: 2
     }
   },
+  {
+    expression: `m[1].s[]`,
+    trace: {
+      position: 7
+    }
+  },
   {
     expression: `m[hex"deadbeef"]`,
     value: expression({