scrall 0.10.1__tar.gz → 0.12.2__tar.gz

{scrall-0.10.1/src/scrall.egg-info → scrall-0.12.2}/PKG-INFO

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

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

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

{scrall-0.10.1 → scrall-0.12.2}/src/scrall/parse/scrall.peg

@@ -52,7 +52,7 @@ FALSE_RESULT_OP = ':'
 switch = switch_input DECISION_OP SP* case_block // Boolean expr triggers case_block
 switch_input = rnum / scalar_expr
 case_block = '{' LINEWRAP* case+ LINEWRAP*'}'
-case = LINEWRAP* trigger_set? ':' LINEWRAP* component_statement_set
+case = LINEWRAP* trigger_set? ':' (SP+ / LINEWRAP*) component_statement_set
 trigger_set = enum_value (',' SP+ enum_value)* SP*
 enum_value = '_' name // Scalar switch has enum value cases
 DECISION_OP = '?'
@@ -105,7 +105,8 @@ ITS = 'ITS'
 // Creation, deletion and references
 new_instance = '*' new_inst_init // create an instance of a class as an action
 new_lineage = '*[' SP* new_inst_init (';' SP+ new_inst_init)+ SP* ']' // create all instances of a lineage
-new_inst_init = name attr_init? (SP+ to_ref)* // specify class, attr inits, and any required references
+new_inst_init = name attr_init? (SP+ to_ref)* (SP+ to_state)? // specify class, attr inits, and any required references
+to_state = '>' SP* name
 attr_init = '(' SP* (attr_value_init (',' SP+ attr_value_init)* SP*)? ')' // all attrs to init for a new instance
 attr_value_init = (name SP? ':' SP+ scalar_expr )*
 update_ref = (instance_set SP+)? to_ref // relate or unrelated to me or explicit instance_set

{scrall-0.10.1 → scrall-0.12.2}/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')
@@ -60,7 +60,7 @@ Type_expr_a = namedtuple('Type_expr_a', 'type selector')
 Attr_value_init_a = namedtuple('Attr_value_init_a', 'attr scalar_expr')
 To_ref_a = namedtuple('To_ref_a', 'rnum iset1 iset2')
 Update_ref_a = namedtuple('Update_ref_a', 'iset to_ref')
-New_inst_a = namedtuple('New_inst_a', 'cname attrs rels')
+New_inst_a = namedtuple('New_inst_a', 'cname attrs rels state')
 New_lineage_a = namedtuple('New_lineage_a', 'inits')
 Output_Flow_a = namedtuple('Output_Flow_a', 'output')
 Projection_a = namedtuple('Projection_a', 'expand attrs')
@@ -677,7 +677,8 @@ class ScrallVisitor(PTNodeVisitor):
         _logger.info(f'  :: {node.value}')
 
         _logger.info(f"  < {children}")
-        params = children.results.get('supplied_params', [])
+        params = children.results.get('supplied_params')
+        params = params[0] if params else []
         result = {'name': children[0].name, 'params': params}
         _logger.info(f"  > {result}")
         return result
@@ -1032,10 +1033,25 @@ class ScrallVisitor(PTNodeVisitor):
         _logger.info(f"  < {children}")
         a = children.results.get('attr_init')
         r = children.results.get('to_ref')
-        result = New_inst_a(cname=children[0], attrs=a[0] if a else [], rels=None if not r else r)
+        s = children.results.get('to_state')
+        result = New_inst_a(cname=children[0], attrs=a[0] if a else [], rels=None if not r else r,
+                            state=s[0].name if s else None)
         _logger.info(f"  > {result}")
         return result
 
+    @classmethod
+    def visit_to_state(cls, node, children):
+        """
+        '>' SP* name
+        """
+        _logger.info("to_state = '>' SP* name")
+        _logger.info(f'  :: {node.value}')
+
+        _logger.info(f"  < {children}")
+        result = children[0]
+        return result
+
+
     @classmethod
     def visit_attr_init(cls, node, children):
         """
@@ -1430,7 +1446,8 @@ class ScrallVisitor(PTNodeVisitor):
             _logger.info(f"  > {result}")
             return result
 
-        if len(children) == 1 and (isinstance(children[0], N_a) or (isinstance(children[0], IN_a))):
+        if len(children) == 1 and (isinstance(children[0], N_a) or (isinstance(children[0], IN_a)) or
+                                   isinstance(children[0], Type_expr_a)):
             result = children[0]
             _logger.info(f"  > {result}")
             return result
@@ -1439,10 +1456,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.10.1 → scrall-0.12.2/src/scrall.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: scrall
-Version: 0.10.1
+Version: 0.12.2
 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.1 → scrall-0.12.2}/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.10.1 → scrall-0.12.2}/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.10.1 → scrall-0.12.2}/tests/test_decision_wrap.py

@@ -17,7 +17,7 @@ expected_parse = Execution_Unit_a(
                         statement_set=Seq_Statement_Set_a(
                             input_tokens=[],
                             statement=New_inst_a(
-                                cname=N_a(name='cat'), attrs=[], rels=None),
+                                cname=N_a(name='cat'), attrs=[], rels=None, state=None),
                             block=None
                         ),
                         output_token=None

{scrall-0.10.1 → scrall-0.12.2}/tests/test_decision_wrap_false.py

@@ -17,7 +17,7 @@ expected_parse = Execution_Unit_a(
                         statement_set=Seq_Statement_Set_a(
                             input_tokens=[],
                             statement=New_inst_a(
-                                cname=N_a(name='cat'), attrs=[], rels=None),
+                                cname=N_a(name='cat'), attrs=[], rels=None, state=None),
                             block=None), output_token=None
                     )
                 ]),
@@ -28,7 +28,7 @@ expected_parse = Execution_Unit_a(
                         statement_set=Seq_Statement_Set_a(
                             input_tokens=[],
                             statement=New_inst_a(
-                                cname=N_a(name='dog'), attrs=[], rels=None),
+                                cname=N_a(name='dog'), attrs=[], rels=None, state=None),
                             block=None), output_token=None
                     )
                 ])

{scrall-0.10.1 → scrall-0.12.2}/tests/test_ping_actions.py

@@ -49,7 +49,7 @@ actions = [
              input_tokens=[],
              statement=Signal_a(
                  event='Try redirect', supplied_params=[
-                     [Supplied_Parameter_a(pname='new dest', sval=IN_a(name='new dest'))]],
+                     Supplied_Parameter_a(pname='new dest', sval=IN_a(name='new dest'))],
                  dest=Signal_Dest_a(
                      target_iset=INST_a(
                          components=[PATH_a(hops=[R_a(rnum='R53'), N_a(name='Cabin')])]),
@@ -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.10.1 → scrall-0.12.2}/tests/test_signals.py

@@ -24,7 +24,7 @@ actions = [
              statement=External_Signal_a(
                  event='Goto floor',
                  supplied_params=[
-                     [Supplied_Parameter_a(pname='Dest floor', sval=N_a(name='my level'))]
+                     Supplied_Parameter_a(pname='Dest floor', sval=N_a(name='my level'))
                  ]), block=None),
          output_token=None)
      ),

{scrall-0.10.1 → scrall-0.12.2}/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.10.1/src/scrall/__init__.py

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