Update grammar to support complex indices for macros (#59)

Doenet · Nov 28, 2023 · a03aa89 · a03aa89
1 parent 079bcb2
commit a03aa89
Show file tree

Hide file tree

Showing 4 changed files with 428 additions and 217 deletions.
diff --git a/packages/parser/src/macros/macros.peggy b/packages/parser/src/macros/macros.peggy
@@ -141,7 +141,7 @@ BalancedParenText
 PropAttrs = "{" _? @(@Attr _?)* "}"
 
 PropIndex
-    = "[" _? value:(Macro / TextWithoutClosingSquareBrace) _? "]" {
+    = "[" _? value:(@(FunctionMacro / Macro / TextWithoutClosingSquareBrace) _?)* "]" {
             return withPosition({ type: "index", value });
         }
 

diff --git a/packages/parser/src/macros/types.ts b/packages/parser/src/macros/types.ts
@@ -112,7 +112,7 @@ export type PropIndex = {
     start: { offset: number; line: number; column: number };
     end: { offset: number; line: number; column: number };
   };
-} & { type: "index"; value: Macro | TextWithoutClosingSquareBrace };
+} & { type: "index"; value: (FunctionMacro | Macro | TextWithoutClosingSquareBrace)[] };
 export type Attr =
   | ({
       position: {