fix: replace standalone functioncalls to expression nodes

Author: HongleiGu

evaluation_function/analyzer/interpreter.py

@@ -119,9 +119,9 @@ def execute_statement(self, node: ASTNode):
         elif isinstance(node, ConditionalNode):
             self.execute_conditional(node)
 
-        elif isinstance(node, FunctionNode):
-            # Already registered in run()
-            pass
+        # elif isinstance(node, FunctionNode):
+        #     # Already registered in run()
+        #     pass
 
         elif isinstance(node, BlockNode):
             self.execute_block(node)

evaluation_function/parser/parser.py

@@ -277,7 +277,27 @@ def _parse_fallback(self, code: str) -> ProgramNode:
                 statements.append(ReturnNode(value=value))
                 i += 1
                 continue
-            
+            # Detect standalone function calls
+            func_call_match = re.match(r'^([A-Za-z_]\w*)\s*\((.*)\)\s*$', stripped)
+            if func_call_match:
+                func_name = func_call_match.group(1)
+                args_str = func_call_match.group(2)
+
+                # Optional: ensure it's not a keyword accidentally matched
+                if func_name.lower() not in {"if", "for", "while", "return", "print", "function"}:
+                    args = self._parse_argument_list(args_str)
+
+                    call_node = FunctionCallNode(
+                        function_name=func_name,
+                        arguments=args
+                    )
+
+                    statements.append(
+                        ExpressionStatementNode(expression=call_node)
+                    )
+
+                    i += 1
+                    continue
             # Skip unknown lines
             i += 1
 
@@ -650,7 +670,27 @@ def _parse_block_fallback(self, lines: List[str], indent_unit: int) -> BlockNode
                 statements.append(AssignmentNode(target=target, value=value))
                 i += 1
                 continue
-            
+            # Detect standalone function calls
+            func_call_match = re.match(r'^([A-Za-z_]\w*)\s*\((.*)\)\s*$', stripped)
+            if func_call_match:
+                func_name = func_call_match.group(1)
+                args_str = func_call_match.group(2)
+
+                # Optional: ensure it's not a keyword accidentally matched
+                if func_name.lower() not in {"if", "for", "while", "return", "print", "function"}:
+                    args = self._parse_argument_list(args_str)
+
+                    call_node = FunctionCallNode(
+                        function_name=func_name,
+                        arguments=args
+                    )
+
+                    statements.append(
+                        ExpressionStatementNode(expression=call_node)
+                    )
+
+                    i += 1
+                    continue
             # Unknown statement - skip
             i += 1
 

evaluation_function/tests/test_scope.py

@@ -5,18 +5,7 @@
 import pytest
 
 from ..analyzer.interpreter import Interpreter
-from ..schemas.ast_nodes import (
-    ProgramNode,
-    FunctionNode,
-    BlockNode,
-    AssignmentNode,
-    VariableNode,
-    LiteralNode,
-    BinaryOpNode,
-    OperatorType,
-    FunctionCallNode,
-    ReturnNode,
-)
+from ..schemas.ast_nodes import *
 
 
 def test_global_modification():
@@ -138,16 +127,18 @@ def test_mixed_scoping():
                 target=VariableNode(name="b"),
                 value=LiteralNode(value=2),
             ),
-            FunctionCallNode(
-                function_name="func",
-                arguments=[VariableNode(name="a")],
+            ExpressionStatementNode(
+                expression = FunctionCallNode(
+                    function_name="func",
+                    arguments=[VariableNode(name="a")],
+                )
             ),
         ]),
     )
 
     interp = Interpreter()
     result = interp.run(program)
-    print(result)
+
 
     assert result["variables"]["a"] == 1
     assert result["variables"]["b"] == 200