More bug fixes

Author: lines-of-codes

src/langParser.py

@@ -4,6 +4,7 @@
 import mathParser.values
 import executor
 from typing import Any
+import mathParser.values
 
 
 # Constants
@@ -70,6 +71,10 @@ def parse_type_from_value(value) -> Types:
             return Types.Array
         if isinstance(value, LambdaExpr):
             return Types.Action
+        if isinstance(value, mathParser.values.Number):
+            if executor.check_is_float(repr(value)):
+               return Types.Float
+            return Types.Integer
         if value in {None, "null"}:
             return Types.Void
         if not isinstance(value, str):
@@ -86,10 +91,11 @@ def parse_type_from_value(value) -> Types:
         if value.startswith("new Dynamic"):
             return Types.Dynamic
 
-        is_float = executor.check_is_float(value)
         if value.startswith('"') or value.endswith('"'):
             return Types.String
 
+        is_float = executor.check_is_float(value)
+
         if is_float:
             return Types.Float
         if not is_float:

src/lexer.py

@@ -545,7 +545,10 @@ def handle_base_keywords(self, tc: list, original_text: str) -> tuple:
                 elif i == ")":
                     in_arguments_list = False
                 elif in_arguments_list:
+                    if is_found_equal_sign:
+                        arguments += "="
                     arguments += i
+                    is_found_equal_sign = False
 
             existing_arguments: set = set()
             def parse_function_argument(arg):
@@ -859,10 +862,11 @@ def analyse_command(self, tc: list, original_text: str = None) -> tuple:
                 argpos += 1
 
             flex = Lexer(custom_symbol_table, self.parser)
-            print(function_object.function_body)
             res, error = flex.analyse_command(function_object.function_body.split(), original_text=function_object.function_body)
             for name in function_object.arguments:
                 custom_symbol_table.DeleteVariable(name[1])
+            if error:
+                return res, error
             valtype = self.parser.parse_type_from_value(res)
             if valtype != function_object.return_type:
                 return f"InvalidTypeException: Return value mismatched. Expected {function_object.return_type.value}, found {valtype.value}.", Exceptions.InvalidTypeException

src/tests.py

@@ -233,10 +233,12 @@ def test_array(self):
         self.assertTrue((processor.execute("arr").data == np.array([0, 2, 3, 0, 0])).all())
 
     def test_lambda(self):
+        self.assertEqual(processor.execute("int num = 7"), None)
         self.assertEqual(processor.execute("Action add = lambda int (int one, int two) => one + two"), None)
-        self.assertEqual(processor.execute("Action nothing = lambda void () => print(\"this does something\")"), None)
+        self.assertEqual(processor.execute("Action nothing = lambda void () => num = 25"), None)
         self.assertEqual(processor.execute("add(2, 5)"), 7)
         self.assertEqual(processor.execute("nothing()"), None)
+        self.assertEqual(processor.execute("num"), 25)
 
 
 if __name__ == "__main__":