scrall 0.9.0__tar.gz → 0.9.2__tar.gz

{scrall-0.9.0/src/scrall.egg-info → scrall-0.9.2}/PKG-INFO

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

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

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

{scrall-0.9.0 → scrall-0.9.2}/src/scrall/parse/scrall.peg

@@ -1,5 +1,5 @@
 activity = LINEWRAP* execution_unit* EOF
-execution_unit = LINEWRAP* statement_set sequence_token? LINEWRAP+
+execution_unit = LINEWRAP* statement_set sequence_token? (SP+ / LINEWRAP*)
 statement_set = SP* sequenced_statement_set / component_statement_set
 sequenced_statement_set = sequence_token* (block / statement)
 component_statement_set = block / LINEWRAP* statement

{scrall-0.9.0 → scrall-0.9.2}/src/scrall/parse/visitor.py

@@ -635,14 +635,6 @@ class ScrallVisitor(PTNodeVisitor):
         _logger.info(f"  > {result}")
         return result
 
-    # # Asynch service
-    # @classmethod
-    # def visit_asynch_service(cls, node, children):
-    #     """
-    #     name '.' signal_spec ASYNCH ee
-    #     """
-    #     result = Asynch_a(*children)
-
     @classmethod
     def visit_signal_action(cls, node, children):
         """
@@ -847,6 +839,11 @@ class ScrallVisitor(PTNodeVisitor):
         _logger.info(f"  > {result}")
         return result
 
+    @classmethod
+    def visit_owner(cls, node, children):
+        result = ''.join(children)
+        return result
+
     @classmethod
     def visit_supplied_params(cls, node, children):
         """

{scrall-0.9.0 → scrall-0.9.2/src/scrall.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: scrall
-Version: 0.9.0
+Version: 0.9.2
 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.9.0 → scrall-0.9.2}/src/scrall.egg-info/SOURCES.txt

@@ -17,7 +17,10 @@ src/scrall/parse/parser.py
 src/scrall/parse/scrall.peg
 src/scrall/parse/visitor.py
 tests/test_calls.py
+tests/test_decision_wrap.py
+tests/test_decision_wrap_false.py
 tests/test_delete.py
+tests/test_operation.py
 tests/test_ping_actions.py
 tests/test_selection.py
 tests/test_signals.py

scrall-0.9.2/tests/test_decision_wrap.py

@@ -0,0 +1,39 @@
+""" test_decision_wrap.py -- Test line wrapping """
+
+import pytest
+from scrall.parse.parser import ScrallParser
+from scrall.parse.visitor import *
+
+# The expected result is teh same for each input case
+expected_parse = Execution_Unit_a(
+    statement_set=Seq_Statement_Set_a(
+        input_tokens=[],
+        statement=Decision_a(
+            input=N_a(name='choice'),
+            true_result=Comp_Statement_Set_a(
+                statement=None,
+                block=[
+                    Execution_Unit_a(
+                        statement_set=Seq_Statement_Set_a(
+                            input_tokens=[],
+                            statement=New_inst_a(
+                                cname=N_a(name='cat'), attrs=[], rels=None),
+                            block=None
+                        ),
+                        output_token=None
+                    )
+                ]), false_result=None), block=None
+    ), output_token=None
+)
+
+# Different line wrapping of the same content
+@pytest.mark.parametrize("text", [
+    "choice? { *cat }",
+    "choice? {\n*cat }",
+    "choice? {\n    *cat\n}",
+    "choice?\n    { *cat }",
+])
+def test_signal_action(text):
+    parse = ScrallParser.parse_text(scrall_text=text, debug=False)[0]
+    print(parse)
+    assert parse[0] == expected_parse

scrall-0.9.2/tests/test_decision_wrap_false.py

@@ -0,0 +1,47 @@
+""" test_decision_wrap_false.py -- Test line wrapping with true false decision cases """
+
+import pytest
+from scrall.parse.parser import ScrallParser
+from scrall.parse.visitor import *
+
+# The expected result is teh same for each input case
+expected_parse = Execution_Unit_a(
+    statement_set=Seq_Statement_Set_a(
+        input_tokens=[],
+        statement=Decision_a(
+            input=N_a(name='choice'),
+            true_result=Comp_Statement_Set_a(
+                statement=None,
+                block=[
+                    Execution_Unit_a(
+                        statement_set=Seq_Statement_Set_a(
+                            input_tokens=[],
+                            statement=New_inst_a(
+                                cname=N_a(name='cat'), attrs=[], rels=None),
+                            block=None), output_token=None
+                    )
+                ]),
+            false_result=Comp_Statement_Set_a(
+                statement=None,
+                block=[
+                    Execution_Unit_a(
+                        statement_set=Seq_Statement_Set_a(
+                            input_tokens=[],
+                            statement=New_inst_a(
+                                cname=N_a(name='dog'), attrs=[], rels=None),
+                            block=None), output_token=None
+                    )
+                ])
+        ), block=None), output_token=None)
+
+# Different line wrapping of the same content
+@pytest.mark.parametrize("text", [
+    "choice? { *cat } : { *dog }",
+    "choice? { *cat } : {\n        *dog\n    }",
+    "choice? { *cat } : {\n    *dog }",
+    "choice? { *cat } :\n    {\n        *dog\n    }",
+])
+def test_signal_action(text):
+    parse = ScrallParser.parse_text(scrall_text=text, debug=False)[0]
+    print(parse)
+    assert parse[0] == expected_parse

scrall-0.9.2/tests/test_operation.py

@@ -0,0 +1,30 @@
+""" test_operation.py - Test the invocation of an operation"""
+
+import pytest
+from scrall.parse.parser import ScrallParser
+from scrall.parse.visitor import *
+
+actions = [
+    ("dest aslev .= cabin in shaft.Ping both ways()",
+        Execution_Unit_a(statement_set=Seq_Statement_Set_a(
+            input_tokens=[],
+            statement=Inst_Assignment_a(
+                lhs=Flow_Output_a(name=N_a(name='dest aslev'), exp_type=None), card='1',
+                rhs=INST_a(
+                    components=[
+                        Op_a(
+                            owner='cabin in shaft',
+                            op_name='Ping both ways',
+                            supplied_params=[])]
+                ), X=(0, 45)
+            ),
+            block=None), output_token=None)
+     ),
+]
+
+
+@pytest.mark.parametrize("text, expected", actions)
+def test_ping_action(text, expected):
+    parse = ScrallParser.parse_text(scrall_text=text, debug=False)[0]
+    print(parse)
+    assert parse[0] == expected

{scrall-0.9.0 → scrall-0.9.2}/tests/test_signals.py

@@ -2,8 +2,8 @@
 
 import pytest
 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, \
-    Seq_Statement_Set_a, Supplied_Parameter_a, External_Signal_a
+from scrall.parse.visitor import (Execution_Unit_a, Signal_a, Signal_Dest_a, N_a, INST_a, PATH_a, R_a,
+    Seq_Statement_Set_a, Supplied_Parameter_a, External_Signal_a, Decision_a, Comp_Statement_Set_a)
 
 actions = [
     ("Time to close ->* me",
@@ -53,6 +53,26 @@ actions = [
                 block=None),
             output_token=None)
      ),
+    ("destination aslev?\n"
+     "    Transfer created -> : No destination -> me",
+     Execution_Unit_a(
+         statement_set=Seq_Statement_Set_a(
+             input_tokens=[],
+             statement=Decision_a(
+                 input=N_a(name='destination aslev'),
+                 true_result=Comp_Statement_Set_a(
+                     statement=Signal_a(
+                         event='Transfer created',
+                         supplied_params=[], dest=None), block=None),
+                 false_result=Comp_Statement_Set_a(
+                     statement=Signal_a(
+                         event='No destination',
+                         supplied_params=[],
+                         dest=Signal_Dest_a(
+                             target_iset=N_a(name='me'), assigner_dest=None, delay=0, cancel=False
+                         )), block=None
+                 )), block=None), output_token=None)
+     ),
 ]
 
 

scrall-0.9.0/src/scrall/__init__.py

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