feat: Added mathematical operation type and refined parsing

Testfile/test_call/call1.ccs

@@ -1,5 +1,6 @@
 test() => (
     let x = 5;
+    test();
 );
 
 test();

Testfile/test_call/call2.ccs

@@ -2,7 +2,7 @@ let a = 5;
 let b = 10;
 let c = 3;
 
-test(a b c) => (
+test(b, b, c) => (
     let d = (a + b + c);
 );
 

Testfile/test_define/define3.ccs

@@ -1,4 +1 @@
-let x = (a b) => (
-    if (a == b) then:
-        show("a equals b");
-);
+letx=(a b)=>(if(a==b)then:show("a equals b"););

Testfile/test_if/if1.ccs

@@ -1,8 +1,6 @@
 let a = 1;
 let b = 1;
 
-(a == b)
-
 if (a == b) then:
 (
     let x = 10;

Testfile/test_math_op/math_op1.ccs

@@ -0,0 +1 @@
+let x = 5 + (10 - 12);

Testfile/test_named_call/named_call3.ccs

@@ -1,9 +1,3 @@
-let a = 5;
-let b = 10;
-let c = 2;
-
-test (a b c) => (
-    let x = (a - b + c);
-);
-
-test(a b c);
+fact(nbr) => {
+    (nbr == 1) ? 1 : (nbr * fact((nbr - 1));)
+};

src/glados-main/CCSAstParser.hs

@@ -54,6 +54,11 @@ parseBody = parseMany parseWhiteSpace *> parseChar '{'
     *> parseMany parseCCSAst >>= \args -> parseMany parseWhiteSpace <* parseChar '}'
     Data.Functor.$> AstList args
 
+parseArgList :: Parser Ast
+parseArgList = parseMany parseWhiteSpace *> parseChar '('
+    *> parseMany (parseCCSAst <* parseSome (parseChar ',')) >>= \args -> parseMany parseWhiteSpace <* parseChar ')'
+    Data.Functor.$> AstList args
+
 parseIf :: Parser Ast
 parseIf = parseOr (parseMany parseWhiteSpace *> parseString "if" *> parseAstList >>=
     \cond -> parseMany parseWhiteSpace *> parseString "then:" *> parseCCSAst >>= \thenExpr ->
@@ -65,7 +70,7 @@ parseIf = parseOr (parseMany parseWhiteSpace *> parseString "if" *> parseAstList
     parseMany parseWhiteSpace Data.Functor.$> If cond thenExpr elseExpr)
 
 parseLambda :: Parser Ast
-parseLambda = parseAstList >>= \params ->
+parseLambda = parseArgList >>= \params ->
     parseMany parseWhiteSpace *> parseString "=>" *>
     parseOr parseAstList parseBody
     >>= \body -> parseMany parseWhiteSpace
@@ -78,12 +83,20 @@ parseNamedFunc = parseAstSymbol >>= \name ->
 
 parseCall :: Parser Ast
 parseCall = parseAstSymbol >>= \name ->
-    parseAstList >>= \args -> parseSeparator
+    parseArgList >>= \args -> parseSeparator
     Data.Functor.$> AstCall name args
 
+parseMathOperation :: Parser Ast
+parseMathOperation = parseMany parseWhiteSpace
+    *> parseOr parseAstList (parseOr parseAstSymbol parseAstInt)  >>= \arg1 -> parseMany parseWhiteSpace
+    *> parseOperator >>= \op -> parseMany parseWhiteSpace
+    *> parseOr parseAstList (parseOr parseAstSymbol parseAstInt) >>= \arg2 -> parseMany parseWhiteSpace
+    Data.Functor.$> AstMathOp arg1 (Operator op) arg2
+
 parseCCSAst :: Parser Ast
 parseCCSAst = parseAstLogicOperator
           <|> parseAstOperator
+          <|> parseMathOperation
           <|> parseIf
           <|> parseDefine
           <|> parseAssign

src/glados-main/Types.hs

@@ -8,6 +8,7 @@ data Ast = AstInt Int
          | AstSymbol String
          | AstString String
          | AstList [Ast]
+         | AstMathOp Ast Ast Ast
          | Assign Ast Ast
          | Define Ast Ast
          | If Ast Ast Ast