scrall 0.9.3__tar.gz → 0.10.0__tar.gz

{scrall-0.9.3/src/scrall.egg-info → scrall-0.10.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: scrall
-Version: 0.9.3
+Version: 0.10.0
 Summary: Starr's Concise Relational Action Language - For Shlaer-Mellor Executable UML
 Author-email: Leon Starr <leon_starr@modelint.com>
 License: MIT License

{scrall-0.9.3 → scrall-0.10.0}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "scrall"
-version = "0.9.3"
+version = "0.10.0"
 description = "Starr's Concise Relational Action Language - For Shlaer-Mellor Executable UML"
 readme = "README.md"
 authors = [{ name = "Leon Starr", email = "leon_starr@modelint.com" }]

scrall-0.10.0/src/scrall/__init__.py

@@ -0,0 +1 @@
+version = "0.10.0"

{scrall-0.9.3 → scrall-0.10.0}/src/scrall/parse/scrall.peg

@@ -74,9 +74,9 @@ inst_assignment = flow_output SP+ INST_ASSIGN SP+ instance_set
 INST_ASSIGN = '.=' / '..='
 
 // Synchronous call action (method or ee operation or type operation)
-call = ('~' / instance_set) op_chain? // Post-parse verify that last element is an operation, otherwise invalid call
+call = instance_set op_chain? // Post-parse verify that last element is an operation, otherwise invalid call
 operation = owner? '.' name supplied_params
-owner = name
+owner = '~' / name
 supplied_params = '(' SP* (param (',' SP+ param)*)? SP* ')'
 param = (name SP* ':' SP*)? scalar_expr // Comma above keeps scalar_expr from grabbing next param
 

{scrall-0.9.3 → scrall-0.10.0}/src/scrall/parse/visitor.py

@@ -157,7 +157,7 @@ class ScrallVisitor(PTNodeVisitor):
         _logger.info(f'  :: {node.value}')
 
         _logger.info(f"< {children}")
-        result = [c for c in children if c]
+        result = children[:]
         _logger.info(f"  -> {result}")
         return result
 
@@ -239,7 +239,7 @@ class ScrallVisitor(PTNodeVisitor):
 
         _logger.info(f"  < {children}")
         _logger.info(f"  > pass")
-        return children
+        return children[:]  # Removes the result component
 
     @classmethod
     def visit_statement(cls, node, children):
@@ -333,7 +333,7 @@ class ScrallVisitor(PTNodeVisitor):
 
         _logger.info(f"  < {children}")
         _logger.info("  > pass")
-        return children
+        return children[:]
 
     @classmethod
     def visit_attr_type_def(cls, node, children):
@@ -354,7 +354,7 @@ class ScrallVisitor(PTNodeVisitor):
 
         _logger.info(f"  < {children}")
         _logger.info(f"  > pass")
-        return children
+        return children[:]
 
     @classmethod
     def visit_row(cls, node, children):
@@ -376,7 +376,7 @@ class ScrallVisitor(PTNodeVisitor):
 
         _logger.info(f"  < {children}")
         _logger.info(f"  > pass")
-        return children
+        return children[:]
 
     # Implicit table assignment
     @classmethod
@@ -483,7 +483,7 @@ class ScrallVisitor(PTNodeVisitor):
 
         _logger.info(f"  < {children}")
         _logger.info(f"  > pass")
-        return children
+        return children[:]
 
     @classmethod
     def visit_column_op(cls, node, children):
@@ -592,7 +592,7 @@ class ScrallVisitor(PTNodeVisitor):
         _logger.info(f'  :: {node.value}')
 
         _logger.info(f"  < {children}")
-        result = children
+        result = children[:]
         _logger.info(f"  > {result}")
         return result
 
@@ -781,7 +781,7 @@ class ScrallVisitor(PTNodeVisitor):
         _logger.info(f'  :: {node.value}')
 
         _logger.info(f"  < {children}")
-        result = children
+        result = children[:]
         _logger.info(f"  > {result}")
         return result
 
@@ -832,7 +832,7 @@ class ScrallVisitor(PTNodeVisitor):
         owner = children.results.get('owner')
         p = children.results.get('supplied_params')
         result = Op_a(
-            owner='implicit' if not owner else owner[0],
+            owner='_implicit' if not owner else owner[0],
             op_name=children.results['name'][0].name,
             supplied_params=[] if not p else p[0]
         )
@@ -841,7 +841,12 @@ class ScrallVisitor(PTNodeVisitor):
 
     @classmethod
     def visit_owner(cls, node, children):
-        result = ''.join(children)
+        """
+        '~' / name
+        """
+        name = children.results.get('name')
+        # This is either ~ signifying an external service or a single instance flow (instance set)
+        result = name[0].name if name else '_external'
         return result
 
     @classmethod
@@ -853,7 +858,7 @@ class ScrallVisitor(PTNodeVisitor):
         _logger.info(f'  :: {node.value}')
 
         _logger.info(f"  < {children}")
-        result = children if children else []
+        result = children[:]
         _logger.info(f"  > {result}")
         return result
 
@@ -903,7 +908,7 @@ class ScrallVisitor(PTNodeVisitor):
         _logger.info(f'  :: {node.value}')
 
         _logger.info(f"  < {children}")
-        result = Iteration_a(*children)
+        result = Iteration_a(*children)  # TODO: Check this for inclusion of results member
         _logger.info(f"  > {result}")
         return result
 
@@ -944,7 +949,7 @@ class ScrallVisitor(PTNodeVisitor):
                 # Just like above case, but returning an IN_a (parameter name)
                 result = p[0]
             else:
-                result = INST_a(children)
+                result = INST_a(children[:])
         _logger.info(f"  > {result}")
         return result
 
@@ -1012,7 +1017,7 @@ class ScrallVisitor(PTNodeVisitor):
         _logger.info(f'  :: {node.value}')
 
         _logger.info(f"  < {children}")
-        result = New_lineage_a(children)
+        result = New_lineage_a(children[:])
         _logger.info(f"  > {result}")
         return result
 
@@ -1109,7 +1114,7 @@ class ScrallVisitor(PTNodeVisitor):
         _logger.info(f'  :: {node.value}')
 
         _logger.info(f"  < {children}")
-        result = Scalar_Call_a(children)
+        result = Scalar_Call_a(children[:])
         _logger.info(f"  > {result}")
         return result
 
@@ -1146,7 +1151,7 @@ class ScrallVisitor(PTNodeVisitor):
         _logger.info(f'  :: {node.value}')
 
         _logger.info(f"  < {children}")
-        result = children
+        result = children[:]
         _logger.info(f"  > {result}")
         return result
 
@@ -1428,7 +1433,7 @@ class ScrallVisitor(PTNodeVisitor):
             return result
             # TODO: include opchain if supplied
 
-        result = children
+        result = children[:]
         _logger.info(f"  > {result}")
         return result
 
@@ -1459,7 +1464,7 @@ class ScrallVisitor(PTNodeVisitor):
         _logger.info(f'  :: {node.value}')
 
         _logger.info(f"  < {children}")
-        result = Op_chain_a(children)
+        result = Op_chain_a(children[:])
         _logger.info(f"  > {result}")
         return result
 
@@ -1568,7 +1573,7 @@ class ScrallVisitor(PTNodeVisitor):
         _logger.info(f'  :: {node.value}')
 
         _logger.info(f"  < {children}")
-        result = PATH_a(children)
+        result = PATH_a(children[:])
         _logger.info(f"  > {result}")
         return result
 

{scrall-0.9.3 → scrall-0.10.0/src/scrall.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: scrall
-Version: 0.9.3
+Version: 0.10.0
 Summary: Starr's Concise Relational Action Language - For Shlaer-Mellor Executable UML
 Author-email: Leon Starr <leon_starr@modelint.com>
 License: MIT License

scrall-0.10.0/tests/test_calls.py

@@ -0,0 +1,77 @@
+""" test_calls.py - Test method calls and calls to an external service """
+
+import pytest
+from scrall.parse.parser import ScrallParser
+from scrall.parse.visitor import *
+
+actions = [
+    ("~.Goto floor( Dest floor: ^new dest )",
+    Execution_Unit_a(
+        statement_set=Seq_Statement_Set_a(
+            input_tokens=[],
+            statement=Call_a(
+                call=INST_a(
+                    components=[
+                        Op_a(owner='_external', op_name='Goto floor',
+                             supplied_params=[
+                                 Supplied_Parameter_a(
+                                     pname='Dest floor', sval=IN_a(name='new dest')
+                                 )
+                             ])]), op_chain=None), block=None), output_token=None)
+     ),
+    #  Execution_Unit_a(
+    #      statement_set=Seq_Statement_Set_a(
+    #          input_tokens=[],
+    #          statement=Call_a(
+    #              call=None,
+    #              op_chain=Op_chain_a(
+    #                  components=[
+    #                      Scalar_op_a(
+    #                          name=N_a(name='Goto floor'),
+    #                          supplied_params=[
+    #                              Supplied_Parameter_a(
+    #                                  pname='Dest floor',
+    #                                  sval=IN_a(name='new dest')
+    #                              )
+    #                          ]
+    #                      )
+    #                  ]
+    #              )
+    #          ), block=None),
+    #      output_token=None)
+    #  ),
+    (".Ping( dir: Travel direction.opposite )",
+    Execution_Unit_a(
+        statement_set=Seq_Statement_Set_a(
+            input_tokens=[],
+            statement=Call_a(
+                call=INST_a(
+                    components=[
+                        Op_a(
+                            owner='_implicit',
+                            op_name='Ping',
+                            supplied_params=[
+                                Supplied_Parameter_a(
+                                    pname='dir',
+                                    sval=INST_PROJ_a(
+                                        iset=N_a(name='Travel direction'),
+                                        projection=Projection_a(
+                                            expand=None, attrs=[N_a(name='opposite')]
+                                        )
+                                    )
+                                )
+                            ]
+                        )
+                    ]
+                ),
+                op_chain=None),
+            block=None),
+        output_token=None)
+     ),
+]
+
+@pytest.mark.parametrize("text, expected", actions)
+def test_call_action(text, expected):
+    parse = ScrallParser.parse_text(scrall_text=text, debug=False)[0]
+    print(parse)
+    assert parse[0] == expected

scrall-0.9.3/src/scrall/__init__.py

@@ -1 +0,0 @@
-version = "0.9.3"

scrall-0.9.3/tests/test_calls.py

@@ -1,39 +0,0 @@
-""" test_calls.py - Test method calls and calls to an external service """
-
-import pytest
-from scrall.parse.parser import ScrallParser
-from scrall.parse.visitor import (
-    Execution_Unit_a, Seq_Statement_Set_a, Call_a, Op_chain_a, Scalar_op_a,
-    Supplied_Parameter_a, N_a, IN_a,
-)
-
-actions = [
-    ("~.Goto floor( Dest floor: ^new dest )",
-     Execution_Unit_a(
-         statement_set=Seq_Statement_Set_a(
-             input_tokens=[],
-             statement=Call_a(
-                 call=None,
-                 op_chain=Op_chain_a(
-                     components=[
-                         Scalar_op_a(
-                             name=N_a(name='Goto floor'),
-                             supplied_params=[
-                                 Supplied_Parameter_a(
-                                     pname='Dest floor',
-                                     sval=IN_a(name='new dest')
-                                 )
-                             ]
-                         )
-                     ]
-                 )
-             ), block=None),
-         output_token=None)
-     ),
-]
-
-@pytest.mark.parametrize("text, expected", actions)
-def test_call_action(text, expected):
-    parse = ScrallParser.parse_text(scrall_text=text, debug=False)[0]
-    print(parse)
-    assert parse[0] == expected