scrall 0.7.0__tar.gz → 0.8.1__tar.gz

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

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

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

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

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

@@ -92,10 +92,11 @@ OUTPUT = '=>>'
 
 // Instance set
 instance_set =  new_instance / ((operation / name / path) (reflexive_selection / selection / operation / path)*)
-selection = '(' SP* select_phrase SP* ')'
-select_phrase = (CARD RANKR? ',' SP* scalar_expr) / CARD / scalar_expr
+selection = '(' SP* (rank_selection / criteria_selection) SP* ')'
+rank_selection = CARD ', ' SP* RANKR name
+criteria_selection = (CARD ', ' SP* scalar_expr) / CARD / scalar_expr
 CARD = '1' / '*'
-RANKR = '<' / '>'
+RANKR = '^+' / '^-'
 IN = '^'
 TRUE = 'TRUE'
 FALSE = 'FALSE'

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

@@ -16,7 +16,8 @@ Call_a = namedtuple('Call_a', 'call op_chain')
 Scalar_Call_a = namedtuple('Scalar_Call_a', 'call')
 """The subject of a call could be an instance set (method) or an external entity (ee operation)"""
 Attr_Access_a = namedtuple('Attr_Access_a', 'cname its attr')
-Selection_a = namedtuple('Selection_a', 'card rankr criteria')
+Rank_Selection_a = namedtuple('Rank_Selection_a', 'card rankr attr')
+Criteria_Selection_a = namedtuple('Criteria_Selection_a', 'card criteria')
 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')
@@ -72,7 +73,8 @@ Migration_a = namedtuple('Migration_a','from_inst to_subclass')
 Rank_a = namedtuple('Rank_a', "card extent")
 
 
-rank_symbol = {'>': "greatest", '<': "least"}
+rank_symbol = {'^+': "greatest", '^-': "least"}
+card_symbol = {'1':'ONE', '*':'ALL'}
 
 table_op = {
     '^': 'INTERSECT',
@@ -441,7 +443,7 @@ class ScrallVisitor(PTNodeVisitor):
             if type(table).__name__ == 'INST_a':
                 last_comp = table.components[-1]
 
-            if last_comp and type(last_comp).__name__ == 'Selection_a':
+            if last_comp and type(last_comp).__name__ == 'Criteria_Selection_a':
                 if s:
                     # We have two selection phrases. The first is terminating the instance set and the second is
                     # picked up as 's' above. We will take the first one and ignore the second,
@@ -916,22 +918,41 @@ class ScrallVisitor(PTNodeVisitor):
         return result
 
     @classmethod
-    def visit_select_phrase(cls, node, children):
+    def visit_rank_selection(cls, node, children):
         """
-        (CARD RANKR? ',' SP* scalar_expr) / CARD / RANKR? scalar_expr
+        CARD ', ' SP* RANKR name
         """
-        _logger.info(f"{node.rule_name} = (CARD ',' SP* scalar_expr) / CARD / scalar_expr")
+        _logger.info(f"{node.rule_name} = CARD ', ' SP* RANKR name")
+        _logger.info(f">> {[k for k in children.results.keys()]}")
+        _logger.info(f'  :: {node.value}')
+
+        _logger.info(f"  < {children}")
+        card_parse = children.results['CARD'][0]
+        card = card_symbol[card_parse]
+        attr_parse = children.results['name'][0]
+        attr = attr_parse.name
+        rankr_parse = children.results['RANKR']
+        rankr = rank_symbol[rankr_parse[0]]
+        result = Rank_Selection_a(card=card, rankr=rankr, attr=attr)
+        _logger.info(f"  > {result}")
+        return result
+
+    @classmethod
+    def visit_criteria_selection(cls, node, children):
+        """
+        (CARD ', ' SP* scalar_expr) / CARD / scalar_expr
+        """
+        _logger.info(f"{node.rule_name} = (CARD ', ' SP* scalar_expr) / CARD / scalar_expr")
         _logger.info(f">> {[k for k in children.results.keys()]}")
         _logger.info(f'  :: {node.value}')
 
         _logger.info(f"  < {children}")
         explicit_card = children.results.get('CARD')
-        card = '*' if not explicit_card else explicit_card[0]
+        card_parse = '*' if not explicit_card else explicit_card[0]
+        card = card_symbol[card_parse]
         criteria = children.results.get('scalar_expr')
-        rankr = children.results.get('RANKR')
-        rankr_parse = rank_symbol[rankr[0]] if rankr else None  # assign greatest or least
         if criteria:
-            result = Selection_a(card=card, rankr=rankr_parse, criteria=criteria[0])
+            result = Criteria_Selection_a(card=card, criteria=criteria[0])
         else:
             result = [card]
         _logger.info(f"  > {result}")

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

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

@@ -3,7 +3,7 @@
 import pytest
 from scrall.parse.parser import ScrallParser
 from scrall.parse.visitor import Execution_Unit_a, Signal_a, Signal_Dest_a, N_a, INST_a, PATH_a, R_a,\
-    Inst_Assignment_a, Flow_Output_a, Selection_a, BOOL_a, Supplied_Parameter_a, Call_a, Op_a, IN_a, \
+    Inst_Assignment_a, Flow_Output_a, Criteria_Selection_a, Rank_Selection_a, BOOL_a, Supplied_Parameter_a, Call_a, Op_a, IN_a, \
     Table_Assignment_a, TEXPR_a, Projection_a, Seq_Statement_Set_a, Scalar_Assignment_a, Scalar_RHS_a, \
     Sequence_Token_a, Case_a, Switch_a, Enum_a, Output_Flow_a, INST_PROJ_a, Comp_Statement_Set_a
 
@@ -40,7 +40,7 @@ actions = [
             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,
-                            selection=Selection_a(card='*', rankr=None, criteria=N_a(name='Stop requested')),
+                            selection=Criteria_Selection_a(card='ALL', criteria=N_a(name='Stop requested')),
                             projection=Projection_a(expand=None, attrs=[N_a(name='Floor')])),
             X=(0, 56)), block=None), output_token=None)),
     ("Try redirect( ^new dest ) -> /R53/Cabin",
@@ -80,14 +80,14 @@ actions = [
         Execution_Unit_a(statement_set=Seq_Statement_Set_a(input_tokens=None,
             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'), Selection_a(card='*', rankr=None,
+                rhs=INST_a(components=[N_a(name='shaft aslevs'), Criteria_Selection_a(card='ALL',
                              criteria=BOOL_a(op='==', operands=[N_a(name='Stop requested'), N_a(name='avalue')]))]),
             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(
             output=INST_PROJ_a(iset=INST_a(components=[N_a(name='Accessible Shaft Level'),
-                 Selection_a(card='*', rankr=None, criteria=BOOL_a(op='AND', operands=[
+                 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')]))]),

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

@@ -3,14 +3,14 @@
 import pytest
 from scrall.parse.parser import ScrallParser
 from scrall.parse.visitor import Execution_Unit_a, Signal_a, Signal_Dest_a, N_a, INST_a, PATH_a, R_a,\
-    Inst_Assignment_a, Flow_Output_a, Selection_a, BOOL_a, Op_a, Enum_a, MATH_a, Seq_Statement_Set_a
+    Inst_Assignment_a, Flow_Output_a, Rank_Selection_a, Criteria_Selection_a, BOOL_a, Op_a, Enum_a, MATH_a, Seq_Statement_Set_a
 
 actions = [
     ("s ..= Shaft(Inservice; Cleared)",
         Execution_Unit_a(statement_set=Seq_Statement_Set_a(input_tokens=None,
            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'), Selection_a(card='*', rankr=None,
+               rhs=INST_a(components=[N_a(name='Shaft'), Criteria_Selection_a(card='ALL',
                           criteria=BOOL_a(op='AND', operands=[N_a(name='Inservice'), N_a(name='Cleared')]))]),
                X=(0, 31)), block=None), output_token=None)
      ),
@@ -18,7 +18,7 @@ actions = [
         Execution_Unit_a(statement_set=Seq_Statement_Set_a(input_tokens=None,
            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'), Selection_a(card='*', rankr=None,
+               rhs=INST_a(components=[N_a(name='Cabin'), Criteria_Selection_a(card='ALL',
                   criteria=BOOL_a(op='>', operands=[N_a(name='Speed'),
                            MATH_a(op='+', operands=[N_a(name='slowest'), N_a(name='buffer')])]))]),
                X=(0, 37)), block=None), output_token=None)
@@ -27,7 +27,7 @@ actions = [
         Execution_Unit_a(statement_set=Seq_Statement_Set_a(input_tokens=None,
            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'), Selection_a(card='*', rankr=None,
+               rhs=INST_a(components=[N_a(name='Cabin'), Criteria_Selection_a(card='ALL',
                        criteria=BOOL_a(op='>', operands=[N_a(name='Speed'), N_a(name='slowest')]))]),
            X=(0, 28)), block=None), output_token=None)
      ),
@@ -35,14 +35,14 @@ actions = [
         Execution_Unit_a(statement_set=Seq_Statement_Set_a(input_tokens=None,
              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'), Selection_a(card='*', rankr=None,
+                 rhs=INST_a(components=[N_a(name='Shaft'), Criteria_Selection_a(card='ALL',
                         criteria=BOOL_a(op='==', operands=[N_a(name='In service'), 'TRUE']))]),
              X=(0, 29)), block=None), output_token=None)
      ),
     ("s ..= Shaft(In service)",
         Execution_Unit_a(statement_set=Seq_Statement_Set_a(input_tokens=None,
               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'), Selection_a(card='*', rankr=None,
+                                          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)
      ),
@@ -50,7 +50,7 @@ actions = [
         Execution_Unit_a(statement_set=Seq_Statement_Set_a(input_tokens=None,
               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'), Selection_a(card='*', rankr=None,
+                  rhs=INST_a(components=[N_a(name='Bank'), Criteria_Selection_a(card='ALL',
                       criteria=BOOL_a(op='OR', operands=[
                           BOOL_a(op='==', operands=[
                               N_a(name='Max close attempts'),
@@ -63,7 +63,7 @@ actions = [
               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=[]),
-                                         Selection_a(card='*', rankr=None, criteria=BOOL_a(op='==',
+                                         Criteria_Selection_a(card='ALL', criteria=BOOL_a(op='==',
                                              operands=[N_a(name='color'), Enum_a(value=N_a(name='red'))]))]),
               X=(0, 33)), block=None), output_token=None)
      ),

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

@@ -3,7 +3,7 @@
 import pytest
 from scrall.parse.parser import ScrallParser
 from scrall.parse.visitor import Execution_Unit_a, Signal_a, Signal_Dest_a, N_a, INST_a, PATH_a, R_a,\
-    Inst_Assignment_a, Flow_Output_a, Selection_a, BOOL_a, Supplied_Parameter_a, Call_a, Op_a, IN_a, \
+    Inst_Assignment_a, Flow_Output_a, Criteria_Selection_a, BOOL_a, Supplied_Parameter_a, Call_a, Op_a, IN_a, \
     Table_Assignment_a, TEXPR_a, Projection_a, Seq_Statement_Set_a, Scalar_Assignment_a, Scalar_RHS_a, \
     Sequence_Token_a, Case_a, Switch_a, Enum_a, Output_Flow_a, INST_PROJ_a, Comp_Statement_Set_a, \
     Decision_a

scrall-0.7.0/src/scrall/__init__.py

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