scrall 0.11.0__tar.gz → 0.12.0__tar.gz

{scrall-0.11.0/src/scrall.egg-info → scrall-0.12.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: scrall
-Version: 0.11.0
+Version: 0.12.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.11.0 → scrall-0.12.0}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "scrall"
-version = "0.11.0"
+version = "0.12.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.12.0/src/scrall/__init__.py

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

{scrall-0.11.0 → scrall-0.12.0}/src/scrall/parse/visitor.py

@@ -46,7 +46,7 @@ Qualified_Name_a = namedtuple('Qualified_Name_a', 'iset cname aname')
 Flow_Output_a = namedtuple('Flow_Output_a', 'name exp_type')
 PATH_a = namedtuple('PATH_a', 'hops')
 INST_a = namedtuple('INST_a', 'components')
-INST_PROJ_a = namedtuple('INST_PROJ_a', 'iset projection')
+INST_PROJ_a = namedtuple('INST_PROJ_a', 'iset projection op_chain')
 TEXPR_a = namedtuple('TEXPR_a', 'table hexpr selection projection')
 R_a = namedtuple('R_a', 'rnum')
 IN_a = namedtuple('IN_a', 'name')
@@ -1455,10 +1455,11 @@ class ScrallVisitor(PTNodeVisitor):
         iset = children.results.get('instance_set')
         if iset:
             p = children.results.get('projection')
-            result = INST_PROJ_a(iset=iset[0], projection=None if not p else p[0])
+            o = children.results.get('op_chain')
+            op_chain = None if not o else o[0]
+            result = INST_PROJ_a(iset=iset[0], projection=None if not p else p[0], op_chain=op_chain)
             _logger.info(f"  > {result}")
             return result
-            # TODO: include opchain if supplied
 
         result = children[:]
         _logger.info(f"  > {result}")

{scrall-0.11.0 → scrall-0.12.0/src/scrall.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: scrall
-Version: 0.11.0
+Version: 0.12.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.11.0 → scrall-0.12.0}/tests/test_calls.py

@@ -57,7 +57,8 @@ actions = [
                                         iset=N_a(name='Travel direction'),
                                         projection=Projection_a(
                                             expand=None, attrs=[N_a(name='opposite')]
-                                        )
+                                        ),
+                                        op_chain=None
                                     )
                                 )
                             ]

{scrall-0.11.0 → scrall-0.12.0}/tests/test_decision_scalar_expr.py

@@ -36,7 +36,8 @@ actions = [
                                                 iset=N_a(name='Travel direction'),
                                                 projection=Projection_a(
                                                 expand=None,
-                                                attrs=[N_a(name='opposite')]))]))]), X=(31, 81)), block=None),
+                                                attrs=[N_a(name='opposite')]), op_chain=None)
+                                                  ]))]), X=(31, 81)), block=None),
                                 output_token=None),
                             Execution_Unit_a(
                                 statement_set=Seq_Statement_Set_a(

{scrall-0.11.0 → scrall-0.12.0}/tests/test_ping_actions.py

@@ -99,8 +99,9 @@ actions = [
                  Criteria_Selection_a(card='ALL', criteria=BOOL_a(op='AND', operands=[
                      BOOL_a(op='==', operands=[N_a(name='Floor'),
                            INST_PROJ_a(iset=N_a(name='nearest dest'),
-                                 projection=Projection_a(expand=None, attrs=[N_a(name='Floor')]))]),
-                                 N_a(name='Shaft')]))]), projection=None)), block=None), output_token=None
+                                 projection=Projection_a(expand=None, attrs=[N_a(name='Floor')]), op_chain=None)]),
+                                 N_a(name='Shaft')]))]), projection=None, op_chain=None)), block=None),
+                         output_token=None
                          )
     ),
 ]

{scrall-0.11.0 → scrall-0.12.0}/tests/test_state_actions.py

@@ -19,7 +19,7 @@ actions = [
         statement=Decision_a(input=BOOL_a(
             op='NOT', operands=INST_PROJ_a(iset=INST_a(
                 components=[PATH_a(hops=[R_a(rnum='R2'), N_a(name='Shaft')])]),
-                projection=Projection_a(expand=None, attrs=[N_a(name='In service')]))),
+                projection=Projection_a(expand=None, attrs=[N_a(name='In service')]), op_chain=None)),
             true_result=Comp_Statement_Set_a(statement=
                     Signal_a(event='Take out of service', supplied_params=[],
                              dest=Signal_Dest_a(target_iset=N_a(name='ME'),
@@ -32,7 +32,7 @@ actions = [
          statement=Decision_a(input=BOOL_a(
              op='NOT', operands=INST_PROJ_a(iset=INST_a(
                  components=[PATH_a(hops=[R_a(rnum='R2'), N_a(name='Shaft')])]),
-                 projection=Projection_a(expand=None, attrs=[N_a(name='In service')]))),
+                 projection=Projection_a(expand=None, attrs=[N_a(name='In service')]), op_chain=None)),
              true_result=Comp_Statement_Set_a(statement=
                      Signal_a(event='Take out of service', supplied_params=[],
                               dest=Signal_Dest_a(target_iset=N_a(name='ME'),

scrall-0.11.0/src/scrall/__init__.py

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