scrall 0.6.1__tar.gz → 0.7.0__tar.gz

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

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

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

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

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

@@ -75,7 +75,7 @@ INST_ASSIGN = '.=' / '..='
 
 // Synchronous call action (method or ee operation)
 call = instance_set op_chain? // Post-parse verify that last element is an operation, otherwise invalid call
-operation = ORDER? owner? '.' name supplied_params
+operation = owner? '.' name supplied_params
 owner = name
 supplied_params = '(' SP* (param (',' SP+ param)*)? SP* ')'
 param = (name SP* ':' SP*)? scalar_expr // Comma above keeps scalar_expr from grabbing next param
@@ -91,11 +91,11 @@ output_flow = OUTPUT SP+ scalar_expr
 OUTPUT = '=>>'
 
 // Instance set
-instance_set =  new_instance / ((operation / prefix_name / path) (reflexive_selection / selection / operation / path)*)
+instance_set =  new_instance / ((operation / name / path) (reflexive_selection / selection / operation / path)*)
 selection = '(' SP* select_phrase SP* ')'
-select_phrase = (CARD ',' SP* scalar_expr) / CARD / scalar_expr
+select_phrase = (CARD RANKR? ',' SP* scalar_expr) / CARD / scalar_expr
 CARD = '1' / '*'
-ORDER = '^+' / '^-'
+RANKR = '<' / '>'
 IN = '^'
 TRUE = 'TRUE'
 FALSE = 'FALSE'
@@ -136,7 +136,6 @@ scalar_chain = (ITS op_chain) / ((scalar_source / instance_set projection?) op_c
 scalar_source = type_selector / input_param
 op_chain = ('.' (scalar_op / name))*
 value = TRUE / FALSE / enum_value
-prefix_name = ORDER? name
 scalar_op = name supplied_params
 
 // name of type and name of value selected

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

@@ -10,13 +10,13 @@ _logger = logging.getLogger(__name__)
 # and return in the visit result.
 Supplied_Parameter_a = namedtuple('Supplied_Parameter_a', 'pname sval')
 """Parameter name and flow name pair for a set of supplied parameters"""
-Op_a = namedtuple('Op_a', 'owner op_name supplied_params order')
+Op_a = namedtuple('Op_a', 'owner op_name supplied_params')
 Scalar_op_a = namedtuple('Scalar_op_a', 'name supplied_params')
 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 criteria')
+Selection_a = namedtuple('Selection_a', 'card rankr 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')
@@ -69,9 +69,10 @@ Table_Def_a= namedtuple('Table_Def_a', 'name header')
 Rename_a = namedtuple('Rename_a', 'from_name to_name')
 Iteration_a = namedtuple('Iteration_a', 'order statement_set')
 Migration_a = namedtuple('Migration_a','from_inst to_subclass')
+Rank_a = namedtuple('Rank_a', "card extent")
 
 
-symbol = {'^+': 'ascending', '^-': 'descending'}
+rank_symbol = {'>': "greatest", '<': "least"}
 
 table_op = {
     '^': 'INTERSECT',
@@ -792,6 +793,8 @@ class ScrallVisitor(PTNodeVisitor):
     @classmethod
     def visit_operation(cls, node, children):
         """
+        owner? '.' name supplied_params
+
         The results of an operation can be ordered ascending, descending
         The operation is invoked on the owner which may or may not be explicitly named
         If the owner is implicit, it could be 'ME' (the executing instance) or an operation on a type
@@ -799,18 +802,16 @@ class ScrallVisitor(PTNodeVisitor):
 
         Name is the name of the operation
         """
-        _logger.info("operation = ORDER? owner? '.' name supplied_params")
+        _logger.info("operation = owner? '.' name supplied_params")
         _logger.info(f'  :: {node.value}')
 
         _logger.info(f"  < {children}")
         owner = children.results.get('owner')
-        o = children.results.get('ORDER')
         p = children.results.get('supplied_params')
         result = Op_a(
             owner='implicit' if not owner else owner[0],
             op_name=children.results['name'][0].name,
-            supplied_params=[] if not p else p[0],
-            order=None if not o else symbol[o[0]]
+            supplied_params=[] if not p else p[0]
         )
         _logger.info(f"  > {result}")
         return result
@@ -914,21 +915,10 @@ class ScrallVisitor(PTNodeVisitor):
         _logger.info(f"  > {result}")
         return result
 
-    @classmethod
-    def visit_selection(cls, node, children):
-        """
-        """
-        _logger.info("selection = '(' select_phrase ')'")
-        _logger.info(f'  :: {node.value}')
-
-        _logger.info(f"  < {children}")
-        result = Selection_a(card=children[0][0], criteria=None if len(children[0]) < 2 else children[0][1])
-        _logger.info(f"  > {result}")
-        return result
-
     @classmethod
     def visit_select_phrase(cls, node, children):
         """
+        (CARD RANKR? ',' SP* scalar_expr) / CARD / RANKR? 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()]}")
@@ -938,8 +928,10 @@ class ScrallVisitor(PTNodeVisitor):
         explicit_card = children.results.get('CARD')
         card = '*' if not explicit_card else explicit_card[0]
         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 = [card, criteria[0]]
+            result = Selection_a(card=card, rankr=rankr_parse, criteria=criteria[0])
         else:
             result = [card]
         _logger.info(f"  > {result}")
@@ -1423,23 +1415,6 @@ class ScrallVisitor(PTNodeVisitor):
         _logger.info(f"  > {result}")
         return result
 
-    @classmethod
-    def visit_prefix_name(cls, node, children):
-        """
-        """
-        _logger.info("prefix_name = ORDER? name")
-        _logger.info(f'  :: {node.value}')
-
-        _logger.info(f"  < {children}")
-        n = children.results['name'][0]
-        o = children.results.get('ORDER')
-        if o:
-            result = Order_name_a(order=symbol[o[0]], name=n)
-        else:
-            result = n
-        _logger.info(f"  > {result}")
-        return result
-
     @classmethod
     def visit_scalar_op(cls, node, children):
         """

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

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

@@ -5,7 +5,7 @@ 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, \
     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, Order_name_a
+    Sequence_Token_a, Case_a, Switch_a, Enum_a, Output_Flow_a, INST_PROJ_a, Comp_Statement_Set_a
 
 actions = [
     ("{\n    a = b\n    c = d\n}<1>",
@@ -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='*', criteria=N_a(name='Stop requested')),
+                            selection=Selection_a(card='*', rankr=None, 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",
@@ -56,7 +56,7 @@ actions = [
         Execution_Unit_a(statement_set=Seq_Statement_Set_a(input_tokens=None,
             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'))], order=None)]
+                                           Supplied_Parameter_a(pname='Shaft', sval=N_a(name='Shaft'))])]
                                          ), op_chain=None),
             block=None), output_token=None)
     ),
@@ -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='*',
+                rhs=INST_a(components=[N_a(name='shaft aslevs'), Selection_a(card='*', rankr=None,
                              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='*', criteria=BOOL_a(op='AND', operands=[
+                 Selection_a(card='*', rankr=None, 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.6.1 → scrall-0.7.0}/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'), Selection_a(card='*',
+               rhs=INST_a(components=[N_a(name='Shaft'), Selection_a(card='*', rankr=None,
                           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='*',
+               rhs=INST_a(components=[N_a(name='Cabin'), Selection_a(card='*', rankr=None,
                   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='*',
+               rhs=INST_a(components=[N_a(name='Cabin'), Selection_a(card='*', rankr=None,
                        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='*',
+                 rhs=INST_a(components=[N_a(name='Shaft'), Selection_a(card='*', rankr=None,
                         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='*',
+                                          rhs=INST_a(components=[N_a(name='Shaft'), Selection_a(card='*', rankr=None,
                                               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='*',
+                  rhs=INST_a(components=[N_a(name='Bank'), Selection_a(card='*', rankr=None,
                       criteria=BOOL_a(op='OR', operands=[
                           BOOL_a(op='==', operands=[
                               N_a(name='Max close attempts'),
@@ -62,8 +62,8 @@ 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='M',
-                  rhs=INST_a(components=[Op_a(owner='car', op_name='findsome', supplied_params=[], order=None),
-                                         Selection_a(card='*', criteria=BOOL_a(op='==',
+                  rhs=INST_a(components=[Op_a(owner='car', op_name='findsome', supplied_params=[]),
+                                         Selection_a(card='*', rankr=None, 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.6.1/src/scrall/__init__.py

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