scrall 0.9.1__tar.gz → 0.9.3__tar.gz

{scrall-0.9.1/src/scrall.egg-info → scrall-0.9.3}/PKG-INFO

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

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

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

{scrall-0.9.1 → scrall-0.9.3}/src/scrall/parse/scrall.peg

@@ -44,8 +44,8 @@ RENAME = '>>'
 
 // Decision action
 decision = scalar_expr true_result false_result?
-true_result = DECISION_OP LINEWRAP? SP? component_statement_set
-false_result = SP FALSE_RESULT_OP LINEWRAP? SP? component_statement_set // Else
+true_result = DECISION_OP LINEWRAP? SP? component_statement_set SP*
+false_result = FALSE_RESULT_OP LINEWRAP? SP? component_statement_set // Else
 FALSE_RESULT_OP = ':'
 
 // Switch action

{scrall-0.9.1 → scrall-0.9.3}/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.1 → scrall-0.9.3/src/scrall.egg-info}/PKG-INFO

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

@@ -17,9 +17,11 @@ src/scrall/parse/parser.py
 src/scrall/parse/scrall.peg
 src/scrall/parse/visitor.py
 tests/test_calls.py
+tests/test_decision_scalar_expr.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.1 → scrall-0.9.3}/tests/test_calls.py

@@ -33,7 +33,7 @@ actions = [
 ]
 
 @pytest.mark.parametrize("text, expected", actions)
-def test_signal_action(text, expected):
+def test_call_action(text, expected):
     parse = ScrallParser.parse_text(scrall_text=text, debug=False)[0]
     print(parse)
     assert parse[0] == expected

scrall-0.9.3/tests/test_decision_scalar_expr.py

@@ -0,0 +1,65 @@
+""" test_decision_scalar_expr.py -- Ensure scalar expression works as true result in a decision"""
+
+# This verifies that we don't have a regression on a bug fix where scalar_expr true results were eating the colon
+# and failing the parse
+
+import pytest
+from scrall.parse.parser import ScrallParser
+from scrall.parse.visitor import *
+
+actions = [
+    ("fwd dest? =>> fwd dest : {\n"
+     "    rev dest .= Ping( dir: Travel direction.opposite )\n"
+     "    !rev dest? Travel direction.toggle : =>> rev dest\n"
+     "}",
+        Execution_Unit_a(
+            statement_set=Seq_Statement_Set_a(
+                input_tokens=[],
+                statement=Decision_a(
+                    input=N_a(name='fwd dest'),
+                    true_result=Comp_Statement_Set_a(
+                        statement=Output_Flow_a(output=N_a(name='fwd dest')), block=None),
+                    false_result=Comp_Statement_Set_a(
+                        statement=None, block=[
+                            Execution_Unit_a(
+                                statement_set=Seq_Statement_Set_a(
+                                    input_tokens=[],
+                                    statement=Inst_Assignment_a(
+                                    lhs=Flow_Output_a(name=N_a(name='rev dest'), exp_type=None), card='1',
+                                    rhs=INST_a(components=
+                                        [N_a(name='Ping'),
+                                        Criteria_Selection_a(
+                                        card='ALL',
+                                        criteria=BOOL_a(op='==',
+                                        operands=[N_a(name='dir'),
+                                            INST_PROJ_a(
+                                                iset=N_a(name='Travel direction'),
+                                                projection=Projection_a(
+                                                expand=None,
+                                                attrs=[N_a(name='opposite')]))]))]), X=(31, 81)), block=None),
+                                output_token=None),
+                            Execution_Unit_a(
+                                statement_set=Seq_Statement_Set_a(
+                                    input_tokens=[],
+                                    statement=Decision_a(
+                                        input=BOOL_a(op='NOT', operands=N_a(name='rev dest')),
+                                        true_result=Comp_Statement_Set_a(
+                                            statement=Call_a(
+                                                call=N_a(name='Travel direction'),
+                                                op_chain=Op_chain_a(components=[N_a(name='toggle')])), block=None),
+                                        false_result=Comp_Statement_Set_a(
+                                            statement=Output_Flow_a(
+                                                output=N_a(name='rev dest')), block=None)), block=None),
+                                output_token=None)
+                        ]
+                    )
+                ), block=None
+            ), output_token=None),
+     )
+]
+
+@pytest.mark.parametrize("text, expected", actions)
+def test_decision_scalar_true_result(text, expected):
+    parse = ScrallParser.parse_text(scrall_text=text, debug=False)[0]
+    print(parse)
+    assert parse[0] == expected

{scrall-0.9.1 → scrall-0.9.3}/tests/test_decision_wrap.py

@@ -33,7 +33,7 @@ expected_parse = Execution_Unit_a(
     "choice? {\n    *cat\n}",
     "choice?\n    { *cat }",
 ])
-def test_signal_action(text):
+def test_decision_wrap(text):
     parse = ScrallParser.parse_text(scrall_text=text, debug=False)[0]
     print(parse)
     assert parse[0] == expected_parse

scrall-0.9.3/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_operation(text, expected):
+    parse = ScrallParser.parse_text(scrall_text=text, debug=False)[0]
+    print(parse)
+    assert parse[0] == expected

scrall-0.9.1/src/scrall/__init__.py

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