Merge pull request #59 from engineerjoe440/bugfix/dereferenced-method…

…-return ENH/FIX: Support Dereferenced Function/Method Returns
klauer · Apr 12, 2023 · a8f09ab · a8f09ab
2 parents 8988e2e + f214d07
commit a8f09ab
Show file tree

Hide file tree

Showing 4 changed files with 34 additions and 4 deletions.
diff --git a/blark/iec.lark b/blark/iec.lark
@@ -708,7 +708,7 @@ UNARY_OPERATOR: LOGICAL_NOT
               | MINUS
               | PLUS
 
-function_call: symbolic_variable "(" [ param_assignment ( "," param_assignment )* ","? ] ")"
+function_call: symbolic_variable "(" [ param_assignment ( "," param_assignment )* ","? ] ")" DEREFERENCED?
 
 ?primary_expression: "(" expression ")"      -> parenthesized_expression
                    | function_call
@@ -749,7 +749,7 @@ reset_statement: _variable "R="i expression ";"+
 reference_assignment_statement: _variable "REF="i expression ";"+
 
 // method ::= expression [DEREFERENCED] '.' _identifier '(' ')';
-method_statement: symbolic_variable "(" ")" ";"+
+method_statement: symbolic_variable "(" ")" DEREFERENCED? ";"+
 
 // B.3.2.2
 return_statement.1: "RETURN"i ";"*

diff --git a/blark/tests/source/dereference_method.st b/blark/tests/source/dereference_method.st
@@ -0,0 +1,8 @@
+METHOD DoSomething
+VAR
+    Something : BOOL;
+END_VAR
+
+Something := anObject.WriteLine(THIS^.something.t, THIS^.GetTagName()^, INT_TO_STRING(BOOL_TO_INT(THIS^.someAttribute)));
+
+END_METHOD
diff --git a/blark/tests/test_transformer.py b/blark/tests/test_transformer.py
@@ -1072,7 +1072,17 @@ def test_action_roundtrip(rule_name, value):
         )),
         param("chained_function_call_statement", tf.multiline_code_block(
             """
-            uut.call1().call2().call3.call4().done();
+            uut.call1().call2().call3().call4().done();
+            """
+        )),
+        param("chained_function_call_statement", tf.multiline_code_block(
+            """
+            uut.call1()^.call2().call3()^.call4().done();
+            """
+        )),
+        param("chained_function_call_statement", tf.multiline_code_block(
+            """
+            uut.call1()^.call2(A := 1).call3(B := 2)^.call4().done();
             """
         )),
     ],

diff --git a/blark/transform.py b/blark/transform.py
@@ -1587,6 +1587,7 @@ def __str__(self) -> str:
 class FunctionCall(Expression):
     name: SymbolicVariable
     parameters: List[ParameterAssignment]
+    dereferenced: bool
     meta: Optional[Meta] = meta_field()
 
     @property
@@ -1621,6 +1622,12 @@ def from_lark(
         first_parameter: Optional[ParameterAssignment] = None,
         *remaining_parameters: ParameterAssignment,
     ) -> FunctionCall:
+        # Remove the Dereference Token if Present in the Remaining Parameters
+        dereferenced = False
+        if remaining_parameters:
+            if str(remaining_parameters[-1]) == "^":
+                dereferenced = True
+                remaining_parameters = remaining_parameters[:-1]
         # Condition parameters (which may be `None`) to represent empty tuple
         if first_parameter is None:
             parameters = []
@@ -1630,11 +1637,15 @@ def from_lark(
         return FunctionCall(
             name=name,
             parameters=parameters,
+            dereferenced=dereferenced
         )
 
     def __str__(self) -> str:
+        dereference = ""
         parameters = ", ".join(str(param) for param in self.parameters)
-        return f"{self.name}({parameters})"
+        if self.dereferenced:
+            dereference = "^"
+        return f"{self.name}({parameters}){dereference}"
 
 
 @dataclass
@@ -2620,6 +2631,7 @@ def from_lark(
         return FunctionCallStatement(
             name=invocation.name,
             parameters=invocation.parameters,
+            dereferenced=invocation.dereferenced,
             meta=invocation.meta,
         )