Bugfix

divs1210 · Nov 2, 2023 · 826ed93 · 826ed93
1 parent 58d0c81
commit 826ed93
Show file tree

Hide file tree

Showing 2 changed files with 22 additions and 5 deletions.
diff --git a/src/grammar.js b/src/grammar.js
diff --git a/src/grammar.pegjs b/src/grammar.pegjs
@@ -508,8 +508,8 @@ ifExpr     = 'if' _ '(' _ cond:expression _ ')' _ then:expression _else:((_ 'els
 
 lambdaExpr = '(' _ args:((SYMBOL (_ ',' _ SYMBOL)*)?) _ ')' _ '=>' _ body:expression { return lambdaNode(args, body);     }
 
-
-getStringExpr = f:fromExpr ks:((_ ':' _ SYMBOL)+)                                    { return getStringExprNode(f, ks);   }
+getStringExpr = f:fromMapExpr ks:((_ ':' _ SYMBOL)+)                                 { return getStringExprNode(f, ks);   }
+fromMapExpr   = fnCall / MAP / SYMBOL
 
 getExpr    = f:fromExpr _ ks:(keyExpr+)                                              { return getExprNode(f, ks);         }
 fromExpr   = fnCall / LIST / MAP / SYMBOL / STRING
@@ -526,7 +526,7 @@ loopExprArgs = first:loopExprArg rest:(_ ',' _ loopExprArg)* {
 }
 loopExprArg  = name:SYMBOL _ '=' _ value:expression                                  { return { name, value };            }
 
-dotNotation = x:(fnCall / getExpr / primary) y:(_ '.' _ (fnCall / grouping / SYMBOL))+         
+dotNotation = x:(fnCall / getExpr / getStringExpr / primary) y:(_ '.' _ (fnCall / grouping / SYMBOL))+         
                                                                                     { return dotNotation(x, y);          }
 
 primary    = REAL / INTEGER / CHAR / STRING / REGEX / BOOL / NULL / SYMBOL / LIST / MAP / block / grouping