add function calls to expr parsing

ALescoulie · Mar 6, 2024 · b26c186 · b26c186
1 parent eb9d0f1
commit b26c186
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 4 deletions.
diff --git a/lib/Mentat/SyntaxParser.hs b/lib/Mentat/SyntaxParser.hs
@@ -30,9 +30,12 @@ shuntingYard (toT : restT) exprs ops = case toT of
   TLeaf (TOp op) -> do
     (mergedExprs, mergedOps) <- combineExprs exprs ops $ Just op
     shuntingYard restT mergedExprs mergedOps
-  TNode node innerTok -> do
+  TNode _ innerTok -> do
     innerExpr <- shuntingYard innerTok [] []
     shuntingYard restT (innerExpr : exprs) ops
+  TFxn name args -> do -- if you encounter a fxn
+    argExprs <- mapM (\x -> shuntingYard x [] []) args
+    shuntingYard restT (FxnE name argExprs : exprs) ops
   _ -> Left EmptyExpr
 
 

diff --git a/test/SyntaxParserSpec.hs b/test/SyntaxParserSpec.hs
@@ -5,18 +5,19 @@ import Mentat.ParseTypes
 import Mentat.SyntaxParser
 import Prelude hiding (lex)
 import Test.Hspec
+import Mentat.ParseTypes (Statment(Constraint))
 
 spec :: Spec
 spec = do
   describe "Testing whole program parsing" $ do
-    let pg1 = ["x := 1", "y := 2", "f(n) := 2 * n", "2 = x * y"]
+    let pg1 = ["x := 1", "y := 2", "f(n) := 2 * n", "2 = x * y", "f(2x)"]
     let out1 =
           Program
             [ Declaration "x" (LitE $ RL 1)
             , Declaration "y" (LitE $ RL 2)
             , Fxn $ Function "f" ["n"] (BinOpE Mul (VarE "n") (LitE $ RL 2))
-            , Constraint
-                (BinOpE Eql (BinOpE Mul (VarE "y") (VarE "x")) (LitE $ RL 2))
+            , Constraint (BinOpE Eql (BinOpE Mul (VarE "y") (VarE "x")) (LitE $ RL 2))
+            , Constraint $ FxnE "f" [(BinOpE Mul (VarE "x") (LitE $ RL 2))]
             ]
 
     let maybePg1 = parseProgram pg1