scrall 0.8.8__tar.gz → 0.8.10__tar.gz

{scrall-0.8.8/src/scrall.egg-info → scrall-0.8.10}/PKG-INFO

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

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

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

{scrall-0.8.8 → scrall-0.8.10}/src/scrall/parse/scrall.peg

@@ -61,10 +61,11 @@ DECISION_OP = '?'
 signal_action = signal_spec SP+ (signal_dest / ee_dest / SIGNAL_OP / ASYNCH)
 // SIGNAL_OP only destination means: copy dest from false result of decision action
 signal_spec = name supplied_params?
-signal_dest = SIGNAL_OP LINEWRAP? SP? instance_set assigner_partition? (SP+ delay)?
+signal_dest = SIGNAL_OP LINEWRAP? SP? (assigner / instance_set) (SP+ delay)?
+assigner = rnum assigner_partition?
 ee_dest = ASYNCH LINEWRAP? SP? name
 delay = DELAY_OP SP* scalar_expr
-assigner_partition = '|' instance_set
+assigner_partition = '( ' instance_set ' )'
 DELAY_OP = '@'
 SIGNAL_OP = '->'
 ASYNCH = '=>'

{scrall-0.8.8 → scrall-0.8.10}/src/scrall/parse/visitor.py

@@ -22,15 +22,16 @@ Inst_Assignment_a = namedtuple('Inst_Assignment_a', 'lhs card rhs X')
 EE_Signal_a = namedtuple('EE_Signal_a', 'event supplied_params ee')
 Signal_a = namedtuple('Signal_a', 'event supplied_params dest')
 """Signal sent to trigger event at destination with optional supplied parameters"""
-Signal_Action_a = namedtuple('Signal_Action_a', 'event supplied_params dest delay assigner_partition')
-Signal_Dest_a = namedtuple('Signal_Dest_a', 'target_iset assigner_partition delay')
+Signal_Action_a = namedtuple('Signal_Action_a', 'event supplied_params dest delay')
+Signal_Dest_a = namedtuple('Signal_Dest_a', 'target_iset assigner_dest delay')
+Assigner_Dest_a = namedtuple('Assigner_Dest_a', 'rnum partition')
 Signal_Choice_a = namedtuple('Signal_Choice_a', 'decision true_signal false_signal')
 Sequence_Token_a = namedtuple('Sequence_Token_a', 'name')
 Execution_Unit_a = namedtuple('Execution_Unit_a', 'statement_set output_token')
 Seq_Statement_Set_a = namedtuple('Seq_Statement_Set_a', 'input_tokens statement block')
 Comp_Statement_Set_a = namedtuple('Comp_Statement_Set_a', 'statement block')
 Decision_a = namedtuple('Decision_a', 'input true_result false_result')
-Delete_Action_a = namedtuple('Delete_Action_a', 'instance_sets')
+Delete_Group_a = namedtuple('Delete_Group_a', 'instance_sets')
 Case_a = namedtuple('Case_a', 'enums comp_statement_set')
 Switch_a = namedtuple('Switch_a', 'input_flow cases')
 MATH_a = namedtuple('MATH_a', 'op operands')
@@ -706,16 +707,32 @@ class ScrallVisitor(PTNodeVisitor):
     def visit_signal_dest(cls, node, children):
         """
         """
-        _logger.info("signal_action = signal_spec SP+ (signal_dest / ee_dest / SIGNAL_OP / ASYNCH)")
+        _logger.info("signal_dest = SIGNAL_OP LINEWRAP? SP? (assigner / instance_set) (SP+ delay)?")
         _logger.info(f'  :: {node.value}')
 
         _logger.info(f"  < {children}")
-        iset = children[0]
-        ap = children.results.get('assigner_partition')
-        ap = None if not ap else ap[0]
+        iset = children.results.get('instance_set')
+        iset = iset[0] if iset else None
+        assigner = children.results.get('assigner')
+        assigner = assigner[0] if assigner else None
         delay = children.results.get('delay')
         delay = 0 if not delay else delay[0]
-        result = Signal_Dest_a(target_iset=iset, assigner_partition=N_a(ap), delay=delay)
+        result = Signal_Dest_a(target_iset=iset, assigner_dest=assigner, delay=delay)
+        _logger.info(f"  > {result}")
+        return result
+
+    @classmethod
+    def visit_assigner(cls, node, children):
+        """
+        An instance set that partitions an assigner
+        """
+        _logger.info("assigner = rnum assigner_partition?")
+        _logger.info(f'  :: {node.value}')
+
+        _logger.info(f"  < {children}")
+        rnum = children.results.get('rnum')
+        ap = children.results.get('assigner_partition')
+        result = Assigner_Dest_a(rnum=rnum[0], partition=ap[0] if ap else None)
         _logger.info(f"  > {result}")
         return result
 
@@ -724,7 +741,7 @@ class ScrallVisitor(PTNodeVisitor):
         """
         An instance set that partitions an assigner
         """
-        _logger.info("assigner_partition = '(' instance_set ')'")
+        _logger.info("assigner_partition = '( ' instance_set ' )'")
         _logger.info(f'  :: {node.value}')
 
         _logger.info(f"  < {children}")
@@ -1082,7 +1099,7 @@ class ScrallVisitor(PTNodeVisitor):
 
         _logger.info(f"  < {children}")
         iset = children.results.get('instance_set')
-        result = Delete_Action_a(instance_sets=iset)
+        result = Delete_Group_a(instance_sets=iset)
         _logger.info(f"  > {result}")
         return result
 

{scrall-0.8.8 → scrall-0.8.10/src/scrall.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: scrall
-Version: 0.8.8
+Version: 0.8.10
 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.8.8 → scrall-0.8.10}/tests/test_delete.py

@@ -2,12 +2,12 @@
 
 import pytest
 from scrall.parse.parser import ScrallParser
-from scrall.parse.visitor import Execution_Unit_a, N_a, INST_a, PATH_a, R_a, Seq_Statement_Set_a, Delete_Action_a
+from scrall.parse.visitor import Execution_Unit_a, N_a, INST_a, PATH_a, R_a, Seq_Statement_Set_a, Delete_Group_a
 
 actions = [
     ("!* siamese, /R1/Cat",
         Execution_Unit_a(statement_set=Seq_Statement_Set_a(
-            input_tokens=[], statement=Delete_Action_a(
+            input_tokens=[], statement=Delete_Group_a(
                 instance_sets=[N_a(name='siamese'),
                    INST_a(components=[PATH_a(hops=[R_a(rnum='R1'),
                        N_a(name='Cat')])])]), block=None), output_token=None)

{scrall-0.8.8 → scrall-0.8.10}/tests/test_ping_actions.py

@@ -49,7 +49,7 @@ actions = [
                 [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')])]),
-                                       assigner_partition=N_a(name=None), delay=0)),
+                                       assigner_dest=None, delay=0)),
             block=None), output_token=None)
     ),
     ("TRAN.Go to floor( Dest floor: ^new dest, Shaft )",
@@ -64,7 +64,7 @@ actions = [
         Execution_Unit_a(statement_set=Seq_Statement_Set_a(input_tokens=[],
             statement=Signal_a(event='Change requested', supplied_params=[],
                                dest=Signal_Dest_a(target_iset=N_a(name='ME'),
-                               assigner_partition=N_a(name=None), delay=0)),
+                               assigner_dest=None, delay=0)),
             block=None), output_token=None)
      ),
     ("shaft aslevs ..= /R2/R28/Shaft Level/R3/Accessible Shaft Level",

{scrall-0.8.8 → scrall-0.8.10}/tests/test_signals.py

@@ -10,7 +10,7 @@ actions = [
         Execution_Unit_a(statement_set=Seq_Statement_Set_a(input_tokens=[],
            statement=Signal_a(event='Change requested', supplied_params=[],
                               dest=Signal_Dest_a(target_iset=N_a(name='ME'),
-                              assigner_partition=N_a(name=None), delay=0)),
+                              assigner_dest=None, delay=0)),
            block=None), output_token=None)
      ),
     ("Ready to go -> /R53/Transfer",
@@ -18,7 +18,7 @@ actions = [
            statement=Signal_a(event='Ready to go', supplied_params=[], dest=Signal_Dest_a(
                target_iset=INST_a(
                    components=[PATH_a(hops=[R_a(rnum='R53'), N_a(name='Transfer')])]),
-               assigner_partition=N_a(name=None), delay=0)),
+               assigner_dest=None, delay=0)),
            block=None), output_token=None)
      ),
 ]

{scrall-0.8.8 → scrall-0.8.10}/tests/test_state_actions.py

@@ -23,7 +23,7 @@ actions = [
             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'),
-                             assigner_partition=N_a(name=None), delay=0)), block=None),
+                             assigner_dest=None, delay=0)), block=None),
             false_result=None),
         block=None), output_token=None)
     ),
@@ -36,7 +36,7 @@ actions = [
              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'),
-                              assigner_partition=N_a(name=None), delay=0)), block=None),
+                              assigner_dest=None, delay=0)), block=None),
              false_result=None),
          block=None), output_token=None))]
 

scrall-0.8.8/src/scrall/__init__.py

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