scrall 0.9.2__tar.gz → 0.9.4__tar.gz

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

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

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

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

{scrall-0.9.2 → scrall-0.9.4}/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.2 → scrall-0.9.4}/src/scrall/parse/visitor.py

@@ -157,7 +157,7 @@ class ScrallVisitor(PTNodeVisitor):
         _logger.info(f'  :: {node.value}')
 
         _logger.info(f"< {children}")
-        result = [c for c in children if c]
+        result = children[:]
         _logger.info(f"  -> {result}")
         return result
 
@@ -239,7 +239,7 @@ class ScrallVisitor(PTNodeVisitor):
 
         _logger.info(f"  < {children}")
         _logger.info(f"  > pass")
-        return children
+        return children[:]  # Removes the result component
 
     @classmethod
     def visit_statement(cls, node, children):
@@ -333,7 +333,7 @@ class ScrallVisitor(PTNodeVisitor):
 
         _logger.info(f"  < {children}")
         _logger.info("  > pass")
-        return children
+        return children[:]
 
     @classmethod
     def visit_attr_type_def(cls, node, children):
@@ -354,7 +354,7 @@ class ScrallVisitor(PTNodeVisitor):
 
         _logger.info(f"  < {children}")
         _logger.info(f"  > pass")
-        return children
+        return children[:]
 
     @classmethod
     def visit_row(cls, node, children):
@@ -376,7 +376,7 @@ class ScrallVisitor(PTNodeVisitor):
 
         _logger.info(f"  < {children}")
         _logger.info(f"  > pass")
-        return children
+        return children[:]
 
     # Implicit table assignment
     @classmethod
@@ -483,7 +483,7 @@ class ScrallVisitor(PTNodeVisitor):
 
         _logger.info(f"  < {children}")
         _logger.info(f"  > pass")
-        return children
+        return children[:]
 
     @classmethod
     def visit_column_op(cls, node, children):
@@ -592,7 +592,7 @@ class ScrallVisitor(PTNodeVisitor):
         _logger.info(f'  :: {node.value}')
 
         _logger.info(f"  < {children}")
-        result = children
+        result = children[:]
         _logger.info(f"  > {result}")
         return result
 
@@ -781,7 +781,7 @@ class ScrallVisitor(PTNodeVisitor):
         _logger.info(f'  :: {node.value}')
 
         _logger.info(f"  < {children}")
-        result = children
+        result = children[:]
         _logger.info(f"  > {result}")
         return result
 
@@ -853,7 +853,7 @@ class ScrallVisitor(PTNodeVisitor):
         _logger.info(f'  :: {node.value}')
 
         _logger.info(f"  < {children}")
-        result = children if children else []
+        result = children[:]
         _logger.info(f"  > {result}")
         return result
 
@@ -903,7 +903,7 @@ class ScrallVisitor(PTNodeVisitor):
         _logger.info(f'  :: {node.value}')
 
         _logger.info(f"  < {children}")
-        result = Iteration_a(*children)
+        result = Iteration_a(*children)  # TODO: Check this for inclusion of results member
         _logger.info(f"  > {result}")
         return result
 
@@ -944,7 +944,7 @@ class ScrallVisitor(PTNodeVisitor):
                 # Just like above case, but returning an IN_a (parameter name)
                 result = p[0]
             else:
-                result = INST_a(children)
+                result = INST_a(children[:])
         _logger.info(f"  > {result}")
         return result
 
@@ -1012,7 +1012,7 @@ class ScrallVisitor(PTNodeVisitor):
         _logger.info(f'  :: {node.value}')
 
         _logger.info(f"  < {children}")
-        result = New_lineage_a(children)
+        result = New_lineage_a(children[:])
         _logger.info(f"  > {result}")
         return result
 
@@ -1109,7 +1109,7 @@ class ScrallVisitor(PTNodeVisitor):
         _logger.info(f'  :: {node.value}')
 
         _logger.info(f"  < {children}")
-        result = Scalar_Call_a(children)
+        result = Scalar_Call_a(children[:])
         _logger.info(f"  > {result}")
         return result
 
@@ -1146,7 +1146,7 @@ class ScrallVisitor(PTNodeVisitor):
         _logger.info(f'  :: {node.value}')
 
         _logger.info(f"  < {children}")
-        result = children
+        result = children[:]
         _logger.info(f"  > {result}")
         return result
 
@@ -1428,7 +1428,7 @@ class ScrallVisitor(PTNodeVisitor):
             return result
             # TODO: include opchain if supplied
 
-        result = children
+        result = children[:]
         _logger.info(f"  > {result}")
         return result
 
@@ -1459,7 +1459,7 @@ class ScrallVisitor(PTNodeVisitor):
         _logger.info(f'  :: {node.value}')
 
         _logger.info(f"  < {children}")
-        result = Op_chain_a(children)
+        result = Op_chain_a(children[:])
         _logger.info(f"  > {result}")
         return result
 
@@ -1568,7 +1568,7 @@ class ScrallVisitor(PTNodeVisitor):
         _logger.info(f'  :: {node.value}')
 
         _logger.info(f"  < {children}")
-        result = PATH_a(children)
+        result = PATH_a(children[:])
         _logger.info(f"  > {result}")
         return result
 

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

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

@@ -17,6 +17,7 @@ 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

scrall-0.9.4/tests/test_calls.py

@@ -0,0 +1,64 @@
+""" test_calls.py - Test method calls and calls to an external service """
+
+import pytest
+from scrall.parse.parser import ScrallParser
+from scrall.parse.visitor import *
+
+actions = [
+    ("~.Goto floor( Dest floor: ^new dest )",
+     Execution_Unit_a(
+         statement_set=Seq_Statement_Set_a(
+             input_tokens=[],
+             statement=Call_a(
+                 call=None,
+                 op_chain=Op_chain_a(
+                     components=[
+                         Scalar_op_a(
+                             name=N_a(name='Goto floor'),
+                             supplied_params=[
+                                 Supplied_Parameter_a(
+                                     pname='Dest floor',
+                                     sval=IN_a(name='new dest')
+                                 )
+                             ]
+                         )
+                     ]
+                 )
+             ), block=None),
+         output_token=None)
+     ),
+    (".Ping( dir: Travel direction.opposite )",
+    Execution_Unit_a(
+        statement_set=Seq_Statement_Set_a(
+            input_tokens=[],
+            statement=Call_a(
+                call=INST_a(
+                    components=[
+                        Op_a(
+                            owner='implicit',
+                            op_name='Ping',
+                            supplied_params=[
+                                Supplied_Parameter_a(
+                                    pname='dir',
+                                    sval=INST_PROJ_a(
+                                        iset=N_a(name='Travel direction'),
+                                        projection=Projection_a(
+                                            expand=None, attrs=[N_a(name='opposite')]
+                                        )
+                                    )
+                                )
+                            ]
+                        )
+                    ]
+                ),
+                op_chain=None),
+            block=None),
+        output_token=None)
+     ),
+]
+
+@pytest.mark.parametrize("text, expected", actions)
+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.4/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.2 → scrall-0.9.4}/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.2 → scrall-0.9.4}/tests/test_operation.py

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

scrall-0.9.2/src/scrall/__init__.py

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

scrall-0.9.2/tests/test_calls.py

@@ -1,39 +0,0 @@
-""" test_calls.py - Test method calls and calls to an external service """
-
-import pytest
-from scrall.parse.parser import ScrallParser
-from scrall.parse.visitor import (
-    Execution_Unit_a, Seq_Statement_Set_a, Call_a, Op_chain_a, Scalar_op_a,
-    Supplied_Parameter_a, N_a, IN_a,
-)
-
-actions = [
-    ("~.Goto floor( Dest floor: ^new dest )",
-     Execution_Unit_a(
-         statement_set=Seq_Statement_Set_a(
-             input_tokens=[],
-             statement=Call_a(
-                 call=None,
-                 op_chain=Op_chain_a(
-                     components=[
-                         Scalar_op_a(
-                             name=N_a(name='Goto floor'),
-                             supplied_params=[
-                                 Supplied_Parameter_a(
-                                     pname='Dest floor',
-                                     sval=IN_a(name='new dest')
-                                 )
-                             ]
-                         )
-                     ]
-                 )
-             ), block=None),
-         output_token=None)
-     ),
-]
-
-@pytest.mark.parametrize("text, expected", actions)
-def test_signal_action(text, expected):
-    parse = ScrallParser.parse_text(scrall_text=text, debug=False)[0]
-    print(parse)
-    assert parse[0] == expected