scrall 0.3.5__tar.gz → 0.4.1__tar.gz

{scrall-0.3.5/src/scrall.egg-info → scrall-0.4.1}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: scrall
-Version: 0.3.5
+Version: 0.4.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.3.5 → scrall-0.4.1}/pyproject.toml

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

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

{scrall-0.3.5 → scrall-0.4.1}/src/scrall/parse/scrall.peg

@@ -16,8 +16,10 @@ token_name = r'[A-Za-z0-9_]+' // No spaces in token names, often single digit: <
 table_assignment = explicit_table_assignment / implicit_table_assignment
 
 // Explicit table assignment
-explicit_table_assignment = table_def SP+ TABLE_ASSIGN SP+ table_value
+explicit_table_assignment = table_def SP+ relation_assign_op SP+ table_value
+relation_assign_op = TABLE_ASSIGN / TUPLE_ASSIGN
 TABLE_ASSIGN = '#='
+TUPLE_ASSIGN = '||='
 table_def = name '[' SP* (attr_type_set SP*)? ']'
 attr_type_set = attr_type_def (',' SP* attr_type_def)*
 attr_type_def = name '::' name
@@ -26,7 +28,7 @@ row = '{' SP* attr_value_set? SP* '}'
 attr_value_set = scalar_expr (',' SP* scalar_expr)*
 
 // Implicit table assignment
-implicit_table_assignment = name SP+ TABLE_ASSIGN SP+ table_expr
+implicit_table_assignment = name SP+ relation_assign_op SP+ table_expr
 table_expr = SP* table_operation SP*
 table_operation = table_term (SP* TOP SP* table_term)*
 table_term = (instance_set / "(" SP* table_expr SP* ")") header_expr? selection? projection?

{scrall-0.3.5 → scrall-0.4.1}/src/scrall/parse/visitor.py

@@ -38,7 +38,7 @@ UNARY_a = namedtuple('UNARY_a', 'op operand')
 BOOL_a = namedtuple('BOOL_a', 'op operands')
 """Boolean operation returns true or false"""
 Scalar_Assignment_a = namedtuple('Scalar_Assignment_a', 'lhs rhs')
-Table_Assignment_a = namedtuple('Table_Assignment_a', 'type lhs rhs X')
+Table_Assignment_a = namedtuple('Table_Assignment_a', 'type assign_tuple lhs rhs X')
 Scalar_RHS_a = namedtuple('Scalar_RHS_a', 'expr attrs')
 Flow_Output_a = namedtuple('Flow_Output_a', 'name exp_type')
 PATH_a = namedtuple('PATH_a', 'hops')
@@ -302,12 +302,13 @@ class ScrallVisitor(PTNodeVisitor):
     @classmethod
     def visit_explicit_table_assignment(cls, node, children):
 
-        _logger.info("explicit_table_assignment = table_def TABLE_ASSIGN table_value")
+        _logger.info("explicit_table_assignment = table_def relation_assign_op table_value")
         _logger.info(f'  :: {node.value}')
 
         _logger.info(f"  < {children}")
-        result = Table_Assignment_a(type='explicit', lhs=children[0], rhs=children[1],
-                                  X=(node.position, node.position_end))
+        atuple = True if children.results['relation_assign_op'][0] == '||=' else False
+        result = Table_Assignment_a(assign_tuple=atuple, type='explicit', lhs=children.results['table_def'][0],
+                                    rhs=children.results['table_value'][0], X=(node.position, node.position_end))
         _logger.info(f"  > {result}")
         return result
 
@@ -379,12 +380,13 @@ class ScrallVisitor(PTNodeVisitor):
     @classmethod
     def visit_implicit_table_assignment(cls, node, children):
 
-        _logger.info("implicit_table_assignment = name TABLE_ASSIGN table_expr")
+        _logger.info("implicit_table_assignment = name relation_assign_op table_expr")
         _logger.info(f'  :: {node.value}')
 
         _logger.info(f"  < {children}")
-        result = Table_Assignment_a(type='implicit', lhs=children[0].name, rhs=children[1],
-                                  X=(node.position, node.position_end))
+        atuple = True if children.results['relation_assign_op'][0] == '||=' else False
+        result = Table_Assignment_a(assign_tuple=atuple, type='implicit', lhs=children[0].name,
+                                    rhs=children.results['table_expr'][0], X=(node.position, node.position_end))
         _logger.info(f"  > {result}")
         return result
 
@@ -1226,8 +1228,8 @@ class ScrallVisitor(PTNodeVisitor):
             result = children[0]
         else:
             # Convert ':' to '==' if found
-            eq_map = ['==' if e in ('==',':') else '!=' for e in children.results['EQUAL']]
-            result = BOOL_a(eq_map, children.results['comparison'])
+            eq_op = '==' if children.results['EQUAL'][0] == ':' else children.results['EQUAL'][0]
+            result = BOOL_a(eq_op, children.results['comparison'])
 
         if children[0] != result:
             _logger.info(f"{node.rule_name} = comparison (EQUAL comparison)*")

{scrall-0.3.5 → scrall-0.4.1/src/scrall.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: scrall
-Version: 0.3.5
+Version: 0.4.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.3.5 → scrall-0.4.1}/tests/test_ping_actions.py

@@ -37,7 +37,7 @@ actions = [
 
     ("stop here floors #= shaft aslevs( Stop requested ).Floor",
         Execution_Unit_a(statement_set=Seq_Statement_Set_a(input_tokens=None,
-            statement=Table_Assignment_a(type='implicit',
+            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')),
@@ -81,14 +81,14 @@ actions = [
             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='*',
-                             criteria=BOOL_a(op=['=='], operands=[N_a(name='Stop requested'), N_a(name='avalue')]))]),
+                             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 )",
         Output_Flow_a(output=
             INST_a(components=[N_a(name='Accessible Shaft Level'),
                  Selection_a(card='*', criteria=BOOL_a(op='AND', operands=[
-                                                     BOOL_a(op=['=='], 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.3.5 → scrall-0.4.1}/tests/test_selection.py

@@ -36,7 +36,7 @@ actions = [
              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='*',
-                        criteria=BOOL_a(op=['=='], operands=[N_a(name='In service'), 'true']))]),
+                        criteria=BOOL_a(op='==', operands=[N_a(name='In service'), 'true']))]),
              X=(0, 29)), block=None), output_token=None)
      ),
     ("s ..= Shaft(In service)",
@@ -52,7 +52,7 @@ actions = [
                   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='*',
                       criteria=BOOL_a(op='OR', operands=[
-                          BOOL_a(op=['=='], operands=[
+                          BOOL_a(op='==', operands=[
                               N_a(name='Max close attempts'),
                               BOOL_a(op='OR', operands=[N_a(name='v'), N_a(name='x')])]),
                           BOOL_a(op='>', operands=[N_a(name='Average cabin speed'), N_a(name='mspeed')])]))]),
@@ -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=[], order=None),
-                                         Selection_a(card='*', criteria=BOOL_a(op=['=='],
+                                         Selection_a(card='*', 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.3.5/src/scrall/__init__.py

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