scrall 0.5.0__tar.gz → 0.6.1__tar.gz

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

@@ -1,6 +1,6 @@
-Metadata-Version: 2.1
+Metadata-Version: 2.4
 Name: scrall
-Version: 0.5.0
+Version: 0.6.1
 Summary: Starr's Concise Relational Action Language - For Shlaer-Mellor Executable UML
 Author-email: Leon Starr <leon_starr@modelint.com>
 License: MIT License
@@ -42,6 +42,7 @@ Requires-Dist: twine; extra == "build"
 Provides-Extra: dev
 Requires-Dist: bump2version; extra == "dev"
 Requires-Dist: pytest; extra == "dev"
+Dynamic: license-file
 
 # Scrall Action Language
 Scrall = Starr's Concise Relational Action Language

{scrall-0.5.0 → scrall-0.6.1}/pyproject.toml

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

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

{scrall-0.5.0 → scrall-0.6.1}/src/scrall/__main__.py

@@ -4,11 +4,14 @@ __main__.py
 Scrall Parser
 """
 
+# System
 import logging
 import logging.config
 import sys
 import argparse
 from pathlib import Path
+
+# Scrall
 from scrall import version
 from scrall.parse.parser import ScrallParser
 
@@ -66,7 +69,7 @@ def main():
         d = args.debug
         result = ScrallParser.parse_file(file_input=fpath, debug=d)
 
-    logger.info("No problemo")  # We didn't die on an exception, basically
+    # logger.info("No problemo")  # We didn't die on an exception, basically
     print("\nNo problemo")
 
 

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

@@ -1,12 +1,10 @@
 activity = LINEWRAP* execution_unit* EOF
-execution_unit = LINEWRAP* (output_flow / (statement_set sequence_token?)) EOL+
-output_flow = OUTPUT SP+ scalar_expr
-OUTPUT = '=>>'
+execution_unit = LINEWRAP* statement_set sequence_token? LINEWRAP+
 statement_set = SP* sequenced_statement_set / component_statement_set
 sequenced_statement_set = sequence_token* (block / statement)
 component_statement_set = block / LINEWRAP* statement
 block = SP* '{' execution_unit* '}'
-statement = table_assignment / new_lineage / new_instance / update_ref / delete / migration / scalar_assignment / signal_action / switch / decision / inst_assignment / call / iteration
+statement = table_assignment / new_lineage / new_instance / update_ref / delete / migration / scalar_assignment / signal_action / switch / decision / inst_assignment / call / iteration / output_flow
 
 // Explicit sequence using control flow inputs and outputs
 sequence_token = SP* '<' token_name '>' SP* // Named control flow
@@ -47,7 +45,7 @@ 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 = SP* FALSE_RESULT_OP SP* component_statement_set // Else
+false_result = (LINEWRAP* / SP*) FALSE_RESULT_OP SP* component_statement_set // Else
 FALSE_RESULT_OP = ':'
 
 // Switch action
@@ -60,9 +58,8 @@ enum_value = '_' name // Scalar switch has enum value cases
 DECISION_OP = '?'
 
 // Signal action
-signal_action = signal_choice / signal
+signal_action = signal_spec SP+ (signal_dest / ee_dest)
 signal = signal_spec SP+ (signal_dest / ee_dest)
-signal_choice = scalar_expr SP* DECISION_OP (LINEWRAP? / SP+) signal_spec SP* SIGNAL_OP SP* '|' SP+ signal_spec SP* signal_dest
 signal_spec = name supplied_params?
 signal_dest = SIGNAL_OP (LINEWRAP / SP+) instance_set assigner_partition? (SP+ delay)?
 ee_dest = ASYNCH SP* name
@@ -89,6 +86,10 @@ migration = instance_set? SP* '>>' SP* new_inst_init
 // Iteration
 iteration = '<<' SP* instance_set SP* '>>' SP* component_statement_set
 
+// Output flow action
+output_flow = OUTPUT SP+ scalar_expr
+OUTPUT = '=>>'
+
 // Instance set
 instance_set =  new_instance / ((operation / prefix_name / path) (reflexive_selection / selection / operation / path)*)
 selection = '(' SP* select_phrase SP* ')'
@@ -108,13 +109,13 @@ 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
+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?
+scalar_assignment = scalar_output_set SP* SCALAR_ASSIGN SP* (scalar_expr projection?) (',' SP* scalar_expr projection?)*
 scalar_output_set = flow_output (',' SP* flow_output)*
 flow_output = name (TYPE_ASSIGN name)?
 projection = '.' (name / '(' ( (ALL / (name (',' SP+ name)*) )? ')'))
@@ -139,7 +140,7 @@ prefix_name = ORDER? name
 scalar_op = name supplied_params
 
 // name of type and name of value selected
-type_selector = name '[' SP* (name SP*)? ']'
+type_selector = name '[' SP* selected_value? SP* ']'
 
 reflexive_selection = HIPPITY_HOP scalar_expr (SP* '|' COMPARE '|')?
 HIPPITY_HOP = FAR_HOP / NEAR_HOP
@@ -147,9 +148,9 @@ NEAR_HOP = '/~/'
 FAR_HOP = '/~|'
 
 SCALAR_ASSIGN = '='
-OR = 'or' / 'OR'
-AND = 'and' / 'AND' / ';' // ; shorthand for anding attr comparisons in a selection phrase
-NOT = '!' / 'not' / 'NOT'
+OR = 'OR'
+AND = 'AND' / ';' // ; shorthand for anding attr comparisons in a selection phrase
+NOT = '!' / 'NOT'
 EQUAL = '==' / '!=' / ':'
 COMPARE = '>=' / '>' / '<=' / '<'
 UNARY_MINUS = "-"
@@ -165,6 +166,7 @@ path = hop+ // path to some instance set
 hop = '/' (rnum / name) // just a sequence of rels and phrase or class names
 
 // Names
+selected_value = r'[^[\]\s]+' // any non-whitespace character except square brackets
 name = first_word (NAME_GLUE word)* // One word or a sequence of delimited words (name used for most model elements)
 NAME_GLUE = r'[ _]' // delmits words within a name
 rnum = r'O?R[1-9][0-9]*' // Relationship number (name used for relationships)

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

@@ -29,7 +29,7 @@ Execution_Unit_a = namedtuple('Execution_Unit_a', 'statement_set output_token')
 Seq_Statement_Set_a = namedtuple('Seq_Statement_Set_a', 'input_tokens statement block')
 Comp_Statement_Set_a = namedtuple('Comp_Statement_Set_a', 'statement block')
 Decision_a = namedtuple('Decision_a', 'input true_result false_result')
-Delete_Action_a = namedtuple('Delete_Action_a', 'instance_set')
+Delete_Action_a = namedtuple('Delete_Action_a', 'instance_sets')
 Case_a = namedtuple('Case_a', 'enums comp_statement_set')
 Switch_a = namedtuple('Switch_a', 'input_flow cases')
 MATH_a = namedtuple('MATH_a', 'op operands')
@@ -166,14 +166,11 @@ class ScrallVisitor(PTNodeVisitor):
 
         Every execution unit is terminated by a new line.
         """
-        _logger.info('execution_unit = LINEWRAP* (output_flow / (statement_set sequence_token?)) EOL+')
+        _logger.info('LINEWRAP* statement_set sequence_token? LINEWRAP+')
         _logger.info(f'  :: {node.value}')
         _logger.info(f">> {[k for k in children.results.keys()]}")
 
         _logger.info(f"  < {children}")
-        oflow = getresult('output_flow', children)
-        if oflow:
-            return Output_Flow_a(oflow[0])
         output_token = getresult('sequence_token', children)
         st_set = getresult('statement_set', children)
         result = Execution_Unit_a(output_token=output_token, statement_set=st_set)
@@ -641,21 +638,8 @@ class ScrallVisitor(PTNodeVisitor):
     #     """
     #     result = Asynch_a(*children)
 
-    # Signal action
     @classmethod
     def visit_signal_action(cls, node, children):
-        """
-        """
-        _logger.info("signal_action = signal_choice / signal")
-        _logger.info(f'  :: {node.value}')
-
-        _logger.info(f"  < {children}")
-        result = children[0]
-        _logger.info(f"  > {result}")
-        return result
-
-    @classmethod
-    def visit_signal(cls, node, children):
         """
         """
         _logger.info("signal = signal_spec (signal_dest / ee_dest)")
@@ -678,35 +662,6 @@ class ScrallVisitor(PTNodeVisitor):
         _logger.info(f"  > {result}")
         return result
 
-    @classmethod
-    def visit_signal_choice(cls, node, children):
-        """
-        scalar_expr DECISION_OP signal_spec ':' signal_spec signal_dest
-        """
-        _logger.info("signal_choice = ")
-        _logger.info(f'  :: {node.value}')
-
-        _logger.info(f"  < {children}")
-        expr = children[0]
-        # Both signals in a choice always have the same destination and delay
-        true_signal = Signal_a(
-            event=children[1]['name'],
-            supplied_params=children[1]['params'],
-            dest=children[3]
-        )
-        false_signal = Signal_a(
-            event=children[2]['name'],
-            supplied_params=children[2]['params'],
-            dest=children[3]
-        )
-        result = Signal_Choice_a(
-            decision=expr,
-            true_signal=true_signal,
-            false_signal=false_signal,
-        )
-        _logger.info(f"  > {result}")
-        return result
-
     @classmethod
     def visit_signal_spec(cls, node, children):
         """
@@ -888,7 +843,7 @@ class ScrallVisitor(PTNodeVisitor):
         s = s if len(s) > 1 else s[0]
         p = children.results.get('name')
         if not p and not (isinstance(s, N_a) or isinstance(s, IN_a)):
-            _logger.error(f"Paramenter name not supplied with expression value: [{children.results}]")
+            _logger.error(f"Parameter name not supplied with expression value: [{children.results}]")
             raise ScrallMissingParameterName(children.results)
         result = Supplied_Parameter_a(pname=s.name if not p else p[0].name, sval=s)
         _logger.info(f"  > {result}")
@@ -923,6 +878,21 @@ class ScrallVisitor(PTNodeVisitor):
         _logger.info(f"  > {result}")
         return result
 
+    # Output flow
+    def visit_output_flow(cls, node, children):
+        """
+        Final output of a synchronous activity (method, operation)
+        """
+        _logger.info("output_flow = OUTPUT SP+ scalar_expr")
+        _logger.info(f'  :: {node.value}')
+
+        _logger.info(f"  < {children}")
+
+        result = Output_Flow_a(children[0])
+        _logger.info(f"  > {result}")
+        return result
+
+
     # Instance set
     @classmethod
     def visit_instance_set(cls, node, children):
@@ -1075,13 +1045,14 @@ class ScrallVisitor(PTNodeVisitor):
     @classmethod
     def visit_delete(cls, node, children):
         """
+        '!*' SP* instance_set (',' SP+ instance_set)
         """
-        _logger.info("delete = '!*' instance_set")
+        _logger.info("delete = '!*' SP* instance_set (',' SP+ instance_set)")
         _logger.info(f'  :: {node.value}')
 
         _logger.info(f"  < {children}")
         iset = children.results.get('instance_set')
-        result = Delete_Action_a(instance_set=iset)
+        result = Delete_Action_a(instance_sets=iset)
         _logger.info(f"  > {result}")
         return result
 

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

@@ -1,6 +1,6 @@
-Metadata-Version: 2.1
+Metadata-Version: 2.4
 Name: scrall
-Version: 0.5.0
+Version: 0.6.1
 Summary: Starr's Concise Relational Action Language - For Shlaer-Mellor Executable UML
 Author-email: Leon Starr <leon_starr@modelint.com>
 License: MIT License
@@ -42,6 +42,7 @@ Requires-Dist: twine; extra == "build"
 Provides-Extra: dev
 Requires-Dist: bump2version; extra == "dev"
 Requires-Dist: pytest; extra == "dev"
+Dynamic: license-file
 
 # Scrall Action Language
 Scrall = Starr's Concise Relational Action Language

{scrall-0.5.0 → scrall-0.6.1}/src/scrall.egg-info/SOURCES.txt

@@ -16,6 +16,7 @@ src/scrall/parse/__init__.py
 src/scrall/parse/parser.py
 src/scrall/parse/scrall.peg
 src/scrall/parse/visitor.py
+tests/test_delete.py
 tests/test_ping_actions.py
 tests/test_selection.py
 tests/test_signals.py

scrall-0.6.1/tests/test_delete.py

@@ -0,0 +1,22 @@
+# test delete action
+
+import pytest
+from scrall.parse.parser import ScrallParser
+from scrall.parse.visitor import Execution_Unit_a, N_a, INST_a, PATH_a, R_a, Seq_Statement_Set_a, Delete_Action_a
+
+actions = [
+    ("!* siamese, /R1/Cat",
+        Execution_Unit_a(statement_set=Seq_Statement_Set_a(
+            input_tokens=None, 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)
+     ),
+]
+
+
+@pytest.mark.parametrize("text, expected", actions)
+def test_delete_action(text, expected):
+    parse = ScrallParser.parse_text(scrall_text=text, debug=False)[0]
+    print(parse)
+    assert parse[0] == expected

{scrall-0.5.0 → scrall-0.6.1}/tests/test_ping_actions.py

@@ -85,16 +85,15 @@ actions = [
             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'),
+        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=[
-                                                     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')]))]),
-                                                     N_a(name='Shaft')]))]))
+                     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')]))]),
+                                 N_a(name='Shaft')]))]), projection=None)), block=None), output_token=None
+                         )
     ),
-
 ]
 
 

scrall-0.5.0/src/scrall/__init__.py

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