scrall 0.8.0__tar.gz → 0.8.1__tar.gz

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

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

@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "scrall"
-version = "0.8.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.8.0 → scrall-0.8.1}/src/scrall/parse/visitor.py

@@ -74,6 +74,7 @@ Rank_a = namedtuple('Rank_a', "card extent")
 
 
 rank_symbol = {'^+': "greatest", '^-': "least"}
+card_symbol = {'1':'ONE', '*':'ALL'}
 
 table_op = {
     '^': 'INTERSECT',
@@ -926,11 +927,13 @@ class ScrallVisitor(PTNodeVisitor):
         _logger.info(f'  :: {node.value}')
 
         _logger.info(f"  < {children}")
-        card = children.results.get('CARD')[0]
-        attr = children.results.get('name')
-        rankr = children.results.get('RANKR')
-        rankr_parse = rank_symbol[rankr[0]]
-        result = Rank_Selection_a(card=card, rankr=rankr_parse, attr=attr)
+        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
 
@@ -945,7 +948,8 @@ class ScrallVisitor(PTNodeVisitor):
 
         _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')
         if criteria:
             result = Criteria_Selection_a(card=card, criteria=criteria[0])

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

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

@@ -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=Criteria_Selection_a(card='*', 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'), Criteria_Selection_a(card='*',
+                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'),
-                 Criteria_Selection_a(card='*', 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.8.0 → scrall-0.8.1}/tests/test_selection.py

@@ -10,7 +10,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='s'), exp_type=None), card='M',
-               rhs=INST_a(components=[N_a(name='Shaft'), Criteria_Selection_a(card='*',
+               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'), Criteria_Selection_a(card='*',
+               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'), Criteria_Selection_a(card='*',
+               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'), Criteria_Selection_a(card='*',
+                 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'), Criteria_Selection_a(card='*',
+                                          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'), Criteria_Selection_a(card='*',
+                  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=[]),
-                                         Criteria_Selection_a(card='*', 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.8.0/src/scrall/__init__.py

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