scrall 0.8.1__tar.gz → 0.8.6__tar.gz

{scrall-0.8.1/src/scrall.egg-info → scrall-0.8.6}/PKG-INFO

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

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

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

{scrall-0.8.1 → scrall-0.8.6}/src/scrall/__main__.py

@@ -63,11 +63,13 @@ def main():
         text = args.expr + '\n'
         d = args.debug
         result = ScrallParser.parse_text(scrall_text=text, debug=d)
+        pass
 
     if args.file:
         fpath = Path(args.file)
         d = args.debug
         result = ScrallParser.parse_file(file_input=fpath, debug=d)
+        pass
 
     # logger.info("No problemo")  # We didn't die on an exception, basically
     print("\nNo problemo")

{scrall-0.8.1 → scrall-0.8.6}/src/scrall/parse/scrall.peg

@@ -43,9 +43,9 @@ rename_attr = RENAME SP* name
 RENAME = '>>'
 
 // Decision action
-decision = scalar_expr SP* true_result false_result? // Control flow version of an if-then
-true_result = DECISION_OP SP* component_statement_set
-false_result = (LINEWRAP* / SP*) FALSE_RESULT_OP SP* component_statement_set // Else
+decision = scalar_expr true_result false_result?
+true_result = DECISION_OP LINEWRAP? SP? component_statement_set
+false_result = SP FALSE_RESULT_OP LINEWRAP? SP? component_statement_set // Else
 FALSE_RESULT_OP = ':'
 
 // Switch action
@@ -58,11 +58,11 @@ enum_value = '_' name // Scalar switch has enum value cases
 DECISION_OP = '?'
 
 // Signal action
-signal_action = signal_spec SP+ (signal_dest / ee_dest)
-signal = signal_spec SP+ (signal_dest / ee_dest)
+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)?
-ee_dest = ASYNCH SP* name
+signal_dest = SIGNAL_OP LINEWRAP? SP? instance_set assigner_partition? (SP+ delay)?
+ee_dest = ASYNCH LINEWRAP? SP? name
 delay = DELAY_OP SP* scalar_expr
 assigner_partition = '|' instance_set
 DELAY_OP = '@'
@@ -73,7 +73,7 @@ ASYNCH = '=>'
 inst_assignment = flow_output SP+ INST_ASSIGN SP+ instance_set
 INST_ASSIGN = '.=' / '..='
 
-// Synchronous call action (method or ee operation)
+// 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
 operation = owner? '.' name supplied_params
 owner = name
@@ -110,16 +110,17 @@ attr_init = '(' SP* (attr_value_init (',' SP+ attr_value_init)* SP*)? ')' // all
 attr_value_init = (name SP? ':' SP+ scalar_expr )*
 update_ref = (instance_set SP+)? to_ref // relate or unrelated to me or explicit instance_set
 to_ref = '&' rnum SP+ instance_set (',' SP+ instance_set)? // non-associative or associative reference
-delete = '!*' SP* instance_set (',' SP+ instance_set) // supports multi-delete transaction
+delete = '!*' SP* instance_set (',' SP+ instance_set)* // supports multi-delete transaction
 
 // Scalar call
 //scalar_call = scalar_expr
 
-// math and boolean operator precedence
-scalar_assignment = scalar_output_set SP* SCALAR_ASSIGN SP* (scalar_expr projection?) (',' SP* scalar_expr projection?)*
-scalar_output_set = flow_output (',' SP* flow_output)*
+// Scalar assignment
+scalar_assignment = scalar_output_set SP* SCALAR_ASSIGN SP* scalar_expr projection? (',' SP* scalar_expr projection?)*
+scalar_output_set = qualified_name / flow_output (',' SP+ flow_output)*
+qualified_name = name '.' name
 flow_output = name (TYPE_ASSIGN name)?
-projection = '.' (name / '(' ( (ALL / (name (',' SP+ name)*) )? ')'))
+projection = '.' (name / '(' ( (ALL / (name (',' SP+ name)*) )? ')')) // TODO: Why is empty () ok in projection?
 ALL = '*'
 
 scalar_expr = SP* scalar_logical_or SP*

{scrall-0.8.1 → scrall-0.8.6}/src/scrall/parse/visitor.py

@@ -41,6 +41,7 @@ BOOL_a = namedtuple('BOOL_a', 'op operands')
 Scalar_Assignment_a = namedtuple('Scalar_Assignment_a', 'lhs rhs')
 Table_Assignment_a = namedtuple('Table_Assignment_a', 'type assign_tuple lhs rhs X')
 Scalar_RHS_a = namedtuple('Scalar_RHS_a', 'expr attrs')
+Qualified_Name_a = namedtuple('Qualified_Name_a', 'cname aname')
 Flow_Output_a = namedtuple('Flow_Output_a', 'name exp_type')
 PATH_a = namedtuple('PATH_a', 'hops')
 INST_a = namedtuple('INST_a', 'components')
@@ -200,7 +201,7 @@ class ScrallVisitor(PTNodeVisitor):
         _logger.info(f">> {[k for k in children.results.keys()]}")
 
         _logger.info(f"  < {children}")
-        input_tokens = getresult('sequence_token', children)
+        input_tokens = children.results.get('sequence_token', [])
         b = getresult('block', children)
         s = getresult('statement', children)
         result = Seq_Statement_Set_a(input_tokens=input_tokens, statement=s, block=b)
@@ -645,23 +646,34 @@ class ScrallVisitor(PTNodeVisitor):
     def visit_signal_action(cls, node, children):
         """
         """
-        _logger.info("signal = signal_spec (signal_dest / ee_dest)")
+        _logger.info("signal_action = signal_spec SP+ (signal_dest / ee_dest / SIGNAL_OP)")
         _logger.info(f'  :: {node.value}')
 
         _logger.info(f"  < {children}")
         sdest = children.results.get('signal_dest')
-        if sdest:
+        eedest = children.results.get('ee_dest')
+        if not sdest and not eedest:
+            # Dest should be supplied by false result in decision
+            result = Signal_a(
+                event=children[0]['name'],
+                supplied_params=children[0]['params'],
+                dest=None
+            )
+        elif sdest:
+            # Signal instance set or assigner destination
             result = Signal_a(
                 event=children[0]['name'],
                 supplied_params=children[0]['params'],
                 dest=children[1]
             )
         else:
+            # Otherwise it must be an EE destination
             result = EE_Signal_a(
                 event=children[0]['name'],
                 supplied_params=children[0]['params'],
                 ee=children[1]
             )
+
         _logger.info(f"  > {result}")
         return result
 
@@ -694,7 +706,7 @@ class ScrallVisitor(PTNodeVisitor):
     def visit_signal_dest(cls, node, children):
         """
         """
-        _logger.info("signal_dest = SIGNAL_OP instance_set assigner_partition? delay?")
+        _logger.info("signal_action = signal_spec SP+ (signal_dest / ee_dest / SIGNAL_OP / ASYNCH)")
         _logger.info(f'  :: {node.value}')
 
         _logger.info(f"  < {children}")
@@ -703,7 +715,7 @@ class ScrallVisitor(PTNodeVisitor):
         ap = None if not ap else ap[0]
         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_partition=N_a(ap), delay=delay)
         _logger.info(f"  > {result}")
         return result
 
@@ -996,7 +1008,7 @@ 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=None if not a else a[0], rels=None if not r else r[0])
+        result = New_inst_a(cname=children[0], attrs=a[0] if a else [], rels=None if not r else r[0])
         _logger.info(f"  > {result}")
         return result
 
@@ -1009,7 +1021,7 @@ class ScrallVisitor(PTNodeVisitor):
         _logger.info(f'  :: {node.value}')
 
         _logger.info(f"  < {children}")
-        result = children
+        result = children.results.get('attr_value_init')
         _logger.info(f"  > {result}")
         return result
 
@@ -1082,7 +1094,7 @@ class ScrallVisitor(PTNodeVisitor):
         _logger.info(f"  > {result}")
         return result
 
-    # Math and boolean operator precedence
+    # Scalar Assigment
     @classmethod
     def visit_scalar_assignment(cls, node, children):
         """
@@ -1099,11 +1111,19 @@ class ScrallVisitor(PTNodeVisitor):
         _logger.info(f"  > {result}")
         return result
 
+    @classmethod
+    def visit_qualified_name(cls, node, children):
+        """
+        """
+        _logger.info("qualified_name = name '.' name")
+        _logger.info(f'  :: {node.value}')
+        return Qualified_Name_a(cname=children[0].name, aname=children[1].name)
+
     @classmethod
     def visit_scalar_output_set(cls, node, children):
         """
         """
-        _logger.info("scalar_output_set = flow_output (',' flow_output)*")
+        _logger.info("scalar_output_set = qualified_name / flow_output (',' SP+ flow_output)*")
         _logger.info(f'  :: {node.value}')
 
         _logger.info(f"  < {children}")

{scrall-0.8.1 → scrall-0.8.6/src/scrall.egg-info}/PKG-INFO

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

@@ -7,7 +7,7 @@ from scrall.parse.visitor import Execution_Unit_a, N_a, INST_a, PATH_a, R_a, Seq
 actions = [
     ("!* siamese, /R1/Cat",
         Execution_Unit_a(statement_set=Seq_Statement_Set_a(
-            input_tokens=None, statement=Delete_Action_a(
+            input_tokens=[], statement=Delete_Action_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.1 → scrall-0.8.6}/tests/test_ping_actions.py

@@ -9,20 +9,20 @@ from scrall.parse.visitor import Execution_Unit_a, Signal_a, Signal_Dest_a, N_a,
 
 actions = [
     ("{\n    a = b\n    c = d\n}<1>",
-        Execution_Unit_a(statement_set=Seq_Statement_Set_a(input_tokens=None, statement=None, block=[
+        Execution_Unit_a(statement_set=Seq_Statement_Set_a(input_tokens=[], statement=None, block=[
 
-            Execution_Unit_a(statement_set=Seq_Statement_Set_a(input_tokens=None,
+            Execution_Unit_a(statement_set=Seq_Statement_Set_a(input_tokens=[],
                statement=Scalar_Assignment_a(
                    lhs=[Flow_Output_a(name=N_a(name='a'), exp_type=None)],
                    rhs=Scalar_RHS_a(expr=N_a(name='b'), attrs=None)), block=None), output_token=None),
 
-            Execution_Unit_a(statement_set=Seq_Statement_Set_a(input_tokens=None,
+            Execution_Unit_a(statement_set=Seq_Statement_Set_a(input_tokens=[],
                statement=Scalar_Assignment_a(
                   lhs=[Flow_Output_a(name=N_a(name='c'), exp_type=None)],
                   rhs=Scalar_RHS_a(expr=N_a(name='d'), attrs=None)), block=None), output_token=None)]),
                output_token=Sequence_Token_a(name='1'))),
     ("^dir? {\n    _up:\n        a = b\n    _down:\n        a = c\n}\n",
-            Execution_Unit_a(statement_set=Seq_Statement_Set_a(input_tokens=None,
+            Execution_Unit_a(statement_set=Seq_Statement_Set_a(input_tokens=[],
                 statement=Switch_a(input_flow=IN_a(name='dir'), cases=[
                     Case_a(enums=['up'], comp_statement_set=Comp_Statement_Set_a(
                         statement=Scalar_Assignment_a(
@@ -36,7 +36,7 @@ actions = [
      ),
 
     ("stop here floors #= shaft aslevs( Stop requested ).Floor",
-        Execution_Unit_a(statement_set=Seq_Statement_Set_a(input_tokens=None,
+        Execution_Unit_a(statement_set=Seq_Statement_Set_a(input_tokens=[],
             statement=Table_Assignment_a(type='implicit', assign_tuple=False,
                 lhs='stop here floors',
                 rhs=TEXPR_a(table=INST_a(components=[N_a(name='shaft aslevs')]), hexpr=None,
@@ -44,7 +44,7 @@ actions = [
                             projection=Projection_a(expand=None, attrs=[N_a(name='Floor')])),
             X=(0, 56)), block=None), output_token=None)),
     ("Try redirect( ^new dest ) -> /R53/Cabin",
-        Execution_Unit_a(statement_set=Seq_Statement_Set_a(input_tokens=None,
+        Execution_Unit_a(statement_set=Seq_Statement_Set_a(input_tokens=[],
             statement=Signal_a(event='Try redirect', supplied_params=[
                 [Supplied_Parameter_a(pname='new dest', sval=IN_a(name='new dest'))]],
                     dest=Signal_Dest_a(target_iset=
@@ -53,7 +53,7 @@ actions = [
             block=None), output_token=None)
     ),
     ("TRAN.Go to floor( Dest floor: ^new dest, Shaft )",
-        Execution_Unit_a(statement_set=Seq_Statement_Set_a(input_tokens=None,
+        Execution_Unit_a(statement_set=Seq_Statement_Set_a(input_tokens=[],
             statement=Call_a(call=INST_a(components=[Op_a(owner='TRAN', op_name='Go to floor',
                           supplied_params=[Supplied_Parameter_a(pname='Dest floor', sval=IN_a(name='new dest')),
                                            Supplied_Parameter_a(pname='Shaft', sval=N_a(name='Shaft'))])]
@@ -61,14 +61,14 @@ actions = [
             block=None), output_token=None)
     ),
     ("Change requested -> ME",
-        Execution_Unit_a(statement_set=Seq_Statement_Set_a(input_tokens=None,
+        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)),
             block=None), output_token=None)
      ),
     ("shaft aslevs ..= /R2/R28/Shaft Level/R3/Accessible Shaft Level",
-        Execution_Unit_a(statement_set=Seq_Statement_Set_a(input_tokens=None,
+        Execution_Unit_a(statement_set=Seq_Statement_Set_a(input_tokens=[],
             statement=Inst_Assignment_a(
                 lhs=Flow_Output_a(name=N_a(name='shaft aslevs'), exp_type=None), card='M',
                 rhs=INST_a(components=[PATH_a(hops=[
@@ -77,7 +77,7 @@ actions = [
             X=(0, 62)), block=None), output_token=None)
      ),
     ("requested stops ..= shaft aslevs( Stop requested: avalue )",
-        Execution_Unit_a(statement_set=Seq_Statement_Set_a(input_tokens=None,
+        Execution_Unit_a(statement_set=Seq_Statement_Set_a(input_tokens=[],
             statement=Inst_Assignment_a(
                 lhs=Flow_Output_a(name=N_a(name='requested stops'), exp_type=None), card='M',
                 rhs=INST_a(components=[N_a(name='shaft aslevs'), Criteria_Selection_a(card='ALL',
@@ -85,7 +85,7 @@ actions = [
             X=(0, 58)), block=None), output_token=None)
      ),
     ("=>> Accessible Shaft Level( Floor: nearest dest.Floor; Shaft )",
-        Execution_Unit_a(statement_set=Seq_Statement_Set_a(input_tokens=None, statement=Output_Flow_a(
+        Execution_Unit_a(statement_set=Seq_Statement_Set_a(input_tokens=[], statement=Output_Flow_a(
             output=INST_PROJ_a(iset=INST_a(components=[N_a(name='Accessible Shaft Level'),
                  Criteria_Selection_a(card='ALL', criteria=BOOL_a(op='AND', operands=[
                      BOOL_a(op='==', operands=[N_a(name='Floor'),

{scrall-0.8.1 → scrall-0.8.6}/tests/test_selection.py

@@ -7,7 +7,7 @@ from scrall.parse.visitor import Execution_Unit_a, Signal_a, Signal_Dest_a, N_a,
 
 actions = [
     ("s ..= Shaft(Inservice; Cleared)",
-        Execution_Unit_a(statement_set=Seq_Statement_Set_a(input_tokens=None,
+        Execution_Unit_a(statement_set=Seq_Statement_Set_a(input_tokens=[],
            statement=Inst_Assignment_a(
                lhs=Flow_Output_a(name=N_a(name='s'), exp_type=None), card='M',
                rhs=INST_a(components=[N_a(name='Shaft'), Criteria_Selection_a(card='ALL',
@@ -15,7 +15,7 @@ actions = [
                X=(0, 31)), block=None), output_token=None)
      ),
     ("c ..= Cabin(Speed > slowest + buffer)",
-        Execution_Unit_a(statement_set=Seq_Statement_Set_a(input_tokens=None,
+        Execution_Unit_a(statement_set=Seq_Statement_Set_a(input_tokens=[],
            statement=Inst_Assignment_a(
                lhs=Flow_Output_a(name=N_a(name='c'), exp_type=None), card='M',
                rhs=INST_a(components=[N_a(name='Cabin'), Criteria_Selection_a(card='ALL',
@@ -24,7 +24,7 @@ actions = [
                X=(0, 37)), block=None), output_token=None)
     ),
     ("c ..= Cabin(Speed > slowest)",
-        Execution_Unit_a(statement_set=Seq_Statement_Set_a(input_tokens=None,
+        Execution_Unit_a(statement_set=Seq_Statement_Set_a(input_tokens=[],
            statement=Inst_Assignment_a(
                lhs=Flow_Output_a(name=N_a(name='c'), exp_type=None), card='M',
                rhs=INST_a(components=[N_a(name='Cabin'), Criteria_Selection_a(card='ALL',
@@ -32,7 +32,7 @@ actions = [
            X=(0, 28)), block=None), output_token=None)
      ),
     ("s ..= Shaft(In service: TRUE)",
-        Execution_Unit_a(statement_set=Seq_Statement_Set_a(input_tokens=None,
+        Execution_Unit_a(statement_set=Seq_Statement_Set_a(input_tokens=[],
              statement=Inst_Assignment_a(
                  lhs=Flow_Output_a(name=N_a(name='s'), exp_type=None), card='M',
                  rhs=INST_a(components=[N_a(name='Shaft'), Criteria_Selection_a(card='ALL',
@@ -40,14 +40,14 @@ actions = [
              X=(0, 29)), block=None), output_token=None)
      ),
     ("s ..= Shaft(In service)",
-        Execution_Unit_a(statement_set=Seq_Statement_Set_a(input_tokens=None,
+        Execution_Unit_a(statement_set=Seq_Statement_Set_a(input_tokens=[],
               statement=Inst_Assignment_a(lhs=Flow_Output_a(name=N_a(name='s'), exp_type=None), card='M',
                                           rhs=INST_a(components=[N_a(name='Shaft'), Criteria_Selection_a(card='ALL',
                                               criteria=N_a(name='In service'))]),
               X=(0, 23)), block=None), output_token=None)
      ),
     ("x .= Bank(Max close attempts: (v or x) or Average cabin speed > mspeed)",
-        Execution_Unit_a(statement_set=Seq_Statement_Set_a(input_tokens=None,
+        Execution_Unit_a(statement_set=Seq_Statement_Set_a(input_tokens=[],
               statement=Inst_Assignment_a(
                   lhs=Flow_Output_a(name=N_a(name='x'), exp_type=None), card='1',
                   rhs=INST_a(components=[N_a(name='Bank'), Criteria_Selection_a(card='ALL',
@@ -59,7 +59,7 @@ actions = [
               X=(0, 71)), block=None), output_token=None)
     ),
     ("x ..= car.findsome()(color: _red)",
-        Execution_Unit_a(statement_set=Seq_Statement_Set_a(input_tokens=None,
+        Execution_Unit_a(statement_set=Seq_Statement_Set_a(input_tokens=[],
               statement=Inst_Assignment_a(
                   lhs=Flow_Output_a(name=N_a(name='x'), exp_type=None), card='M',
                   rhs=INST_a(components=[Op_a(owner='car', op_name='findsome', supplied_params=[]),

{scrall-0.8.1 → scrall-0.8.6}/tests/test_signals.py

@@ -7,14 +7,14 @@ from scrall.parse.visitor import Execution_Unit_a, Signal_a, Signal_Dest_a, N_a,
 
 actions = [
     ("Change requested -> ME",
-        Execution_Unit_a(statement_set=Seq_Statement_Set_a(input_tokens=None,
+        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)),
            block=None), output_token=None)
      ),
     ("Ready to go -> /R53/Transfer",
-        Execution_Unit_a(statement_set=Seq_Statement_Set_a(input_tokens=None,
+        Execution_Unit_a(statement_set=Seq_Statement_Set_a(input_tokens=[],
            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')])]),

{scrall-0.8.1 → scrall-0.8.6}/tests/test_state_actions.py

@@ -15,7 +15,7 @@ actions = [
     // this case
     Take out of service -> ME
 """,
-    Execution_Unit_a(statement_set=Seq_Statement_Set_a(input_tokens=None,
+    Execution_Unit_a(statement_set=Seq_Statement_Set_a(input_tokens=[],
         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')])]),
@@ -28,7 +28,7 @@ actions = [
         block=None), output_token=None)
     ),
     ("!(/R2/Shaft.In service) ? Take out of service -> ME",
-    Execution_Unit_a(statement_set=Seq_Statement_Set_a(input_tokens=None,
+    Execution_Unit_a(statement_set=Seq_Statement_Set_a(input_tokens=[],
          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')])]),

scrall-0.8.1/src/scrall/__init__.py

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