WIP Shorthand syntax for frame and label lookups

nilenso · Jun 23, 2024 · b3aa704 · b3aa704
1 parent 2aceb75
commit b3aa704
Show file tree

Hide file tree

Showing 2 changed files with 22 additions and 5 deletions.
diff --git a/src/bean/interpreter.cljs b/src/bean/interpreter.cljs
@@ -95,9 +95,21 @@
       :FunctionInvocation (apply-f sheet
                                    (eval-sub-ast arg)
                                    (rest args))
-      :FunctionChain (let [[expr [_ fn-name & fn-args]] args]
+      :FrameLookup (eval-sub-ast
+                    [:FunctionInvocation
+                     [:Name "frame"]
+                     [:Expression [:CellRef "B" "3"]]])
+      :FunctionChain (let [[expr [node-type*
+                                  [_ name* :as name-node]
+                                  & fn-args]] args]
                        (eval-sub-ast
-                        (concat [:FunctionInvocation fn-name expr] fn-args)))
+                        (case node-type*
+                          :LabelLookup
+                          [:FunctionInvocation
+                           [:Name "get"] expr
+                           [:Expression [:Value [:QuotedString name*]]]]
+                          :FunctionInvocation
+                          (concat [:FunctionInvocation name-node expr] fn-args))))
       :Expression (if (util/is-expression? arg)
                     (let [[left op right] args]
                       (apply-op (eval-sub-ast op)

diff --git a/src/bean/parser/parser.cljs b/src/bean/parser/parser.cljs
@@ -20,12 +20,17 @@
     MatrixRef = CellRef <':'> CellRef
 
     Operation = '+' | '*' | '=' | '<' | '>'
-    Expression = Value | CellRef | MatrixRef | FunctionChain | Expression Operation Expression | FunctionInvocation | FunctionDefinition | Name
+    Expression = (Value | CellRef | MatrixRef | FunctionChain |
+                Expression Operation Expression | FunctionInvocation |
+                FunctionDefinition | FrameLookup) / Name
+
     FunctionInvocation = (FunctionDefinition | Name) <'('> [Expression {<' '> Expression}] <')'>
     FunctionDefinition = <'{'> Expression <'}'>
-    FunctionChain = Expression <'.'> FunctionInvocation
+    FunctionChain = Expression [<'.'> (FunctionInvocation | LabelLookup)]
 
-    Name = #'[a-z]+'
+    Name = #'[a-zA-Z0-9 ]+(?<! )'
+    FrameLookup = <'$'> Name
+    LabelLookup = Name
 
     Value = Integer / <'\"'> QuotedString <'\"'>
     QuotedString = #'[^\"]+'