scrall 0.6.0__tar.gz → 0.6.2__tar.gz

{scrall-0.6.0/src/scrall.egg-info → scrall-0.6.2}/PKG-INFO

@@ -1,6 +1,6 @@
-Metadata-Version: 2.1
+Metadata-Version: 2.4
 Name: scrall
-Version: 0.6.0
+Version: 0.6.2
 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.6.0 → scrall-0.6.2}/pyproject.toml

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

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

{scrall-0.6.0 → scrall-0.6.2}/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.6.0 → scrall-0.6.2}/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,9 +91,9 @@ 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 ',' SP* ORDER? scalar_expr) / CARD / ORDER? scalar_expr
 CARD = '1' / '*'
 ORDER = '^+' / '^-'
 IN = '^'
@@ -109,7 +109,7 @@ 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
@@ -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.0 → scrall-0.6.2}/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 order 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')
@@ -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')
@@ -792,6 +792,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
@@ -804,13 +806,12 @@ class ScrallVisitor(PTNodeVisitor):
 
         _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]
+            # order=None if not o else symbol[o[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 ',' SP* ORDER? scalar_expr) / CARD / ORDER? 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')
+        o = children.results.get('ORDER')
+        o = symbol[o[0]] if o else None
         if criteria:
-            result = [card, criteria[0]]
+            result = Selection_a(card=card, criteria=criteria[0], order=o)
         else:
             result = [card]
         _logger.info(f"  > {result}")
@@ -1045,13 +1037,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
 
@@ -1422,22 +1415,22 @@ 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_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.0 → scrall-0.6.2/src/scrall.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
-Metadata-Version: 2.1
+Metadata-Version: 2.4
 Name: scrall
-Version: 0.6.0
+Version: 0.6.2
 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.6.0 → scrall-0.6.2}/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.2/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.6.0/src/scrall/__init__.py

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