scrall 0.2.14__tar.gz → 0.2.16__tar.gz

{scrall-0.2.14/src/scrall.egg-info → scrall-0.2.16}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: scrall
-Version: 0.2.14
+Version: 0.2.16
 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.2.14 → scrall-0.2.16}/pyproject.toml

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

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

{scrall-0.2.14 → scrall-0.2.16}/src/scrall/parse/parser.py

@@ -1,7 +1,7 @@
 """ parser.py """
 
 from scrall.exceptions import ScrallGrammarFileOpen, ScrallParseError, ScrallInputFileEmpty, ScrallInputFileOpen
-from scrall.parse.visitor import ScrallVisitor
+from scrall.parse.visitor import ScrallVisitor, Execution_Unit_a, Output_Flow_a
 from arpeggio import visit_parse_tree, NoMatch
 from arpeggio.cleanpeg import ParserPEG
 import os  # For issuing system commands to generate diagnostic files
@@ -44,7 +44,7 @@ class ScrallParser:
     pg_model_pdf = diagnostics_path / "peggrammar_parser_model.pdf"
 
     @classmethod
-    def parse_file(cls, file_input: Path, debug=False) -> List:
+    def parse_file(cls, file_input: Path, debug=False) -> (List[Execution_Unit_a | Output_Flow_a], str):
         """
         Read and save the file contents and options and then call the parser
 
@@ -74,7 +74,7 @@ class ScrallParser:
         return cls.parse()
 
     @classmethod
-    def parse_text(cls, scrall_text: str, debug=False) -> List:
+    def parse_text(cls, scrall_text: str, debug=False) -> (List[Execution_Unit_a | Output_Flow_a], str):
         """
         Save options and call the parser
 
@@ -90,11 +90,11 @@ class ScrallParser:
         return cls.parse()
 
     @classmethod
-    def parse(cls) -> List:
+    def parse(cls) -> (List[Execution_Unit_a | Output_Flow_a], str):
         """
         Parse a Scrall activity
 
-        :return: A list of parsed Scrall statements
+        :return: A list of parsed execution units and the input scrall text
         """
         # Read the grammar file
         try:
@@ -130,4 +130,4 @@ class ScrallParser:
             # Comment this part out if you want to retain the dot files
             cls.parse_tree_dot.unlink(True)
 
-        return result
+        return result, cls.scrall_text

{scrall-0.2.14 → scrall-0.2.16}/src/scrall/parse/visitor.py

@@ -17,7 +17,7 @@ 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')
-Inst_Assignment_a = namedtuple('Inst_Assignment_a', 'lhs card rhs')
+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')
 """Signal sent to trigger event at destination with optional supplied parameters"""
@@ -538,7 +538,8 @@ class ScrallVisitor(PTNodeVisitor):
         return Inst_Assignment_a(
             lhs=children.results['flow_output'][0],
             card='1' if children.results['INST_ASSIGN'][0] == '.=' else 'M',
-            rhs=children.results['instance_set'][0]
+            rhs=children.results['instance_set'][0],
+            X=(node.position, node.position_end)
         )
 
 

{scrall-0.2.14 → scrall-0.2.16/src/scrall.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: scrall
-Version: 0.2.14
+Version: 0.2.16
 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.2.14 → scrall-0.2.16}/tests/test_ping_actions.py

@@ -39,7 +39,8 @@ actions = [
                                            R_a(rnum='R28'),
                                            N_a(name='Shaft Level'),
                                            R_a(rnum='R3'),
-                                           N_a(name='Accessible Shaft Level')])])))
+                                           N_a(name='Accessible Shaft Level')])]),
+                          X=(0, 62)))
      ),
     ("requested stops ..= shaft aslevs( Stop requested: avalue )\n",
      Execution_Unit_a(input_tokens=None, output_tokens=None,
@@ -50,7 +51,8 @@ actions = [
                                                              criteria=BOOL_a(op=['=='],
                                                                              operands=[
                                                                                  N_a(name='Stop requested'),
-                                                                                 N_a(name='avalue')]))])))
+                                                                                 N_a(name='avalue')]))]),
+                          X=(0, 58)))
      ),
 ]
 
@@ -59,4 +61,4 @@ actions = [
 def test_signal_action(text, expected):
     parse = ScrallParser.parse_text(scrall_text=text, debug=False)[0]
     print(parse)
-    assert parse == expected
+    assert parse[0] == expected

{scrall-0.2.14 → scrall-0.2.16}/tests/test_selection.py

@@ -9,29 +9,29 @@ actions = [
     ("s ..= Shaft(Inservice; Cleared)", Execution_Unit_a(input_tokens=None, output_tokens=None,
         action_group=Inst_Assignment_a(lhs=Flow_Output_a(name=N_a(name='s'), exp_type=None), card='M',
            rhs=INST_a(components=[N_a(name='Shaft'), Selection_a(card='*',
-                 criteria=BOOL_a(op='AND', operands=[N_a(name='Inservice'), N_a(name='Cleared')]))])))
+                 criteria=BOOL_a(op='AND', operands=[N_a(name='Inservice'), N_a(name='Cleared')]))]), X=(0,31)))
      ),
     ("c ..= Cabin(Speed > slowest + buffer)", Execution_Unit_a(input_tokens=None, output_tokens=None,
         action_group=Inst_Assignment_a(lhs=Flow_Output_a(name=N_a(name='c'), exp_type=None), card='M',
             rhs=INST_a(components=[N_a(name='Cabin'), Selection_a(card='*',
                 criteria=BOOL_a(op='>', operands=[N_a(name='Speed'),
                                                   MATH_a(op='+', operands=[
-                                                      N_a(name='slowest'), N_a(name='buffer')])]))])))
+                                                      N_a(name='slowest'), N_a(name='buffer')])]))]), X=(0,37)))
     ),
     ("c ..= Cabin(Speed > slowest)", Execution_Unit_a(input_tokens=None, output_tokens=None,
         action_group=Inst_Assignment_a(lhs=Flow_Output_a(name=N_a(name='c'), exp_type=None), card='M',
             rhs=INST_a(components=[N_a(name='Cabin'), Selection_a(card='*',
-                criteria=BOOL_a(op='>', operands=[N_a(name='Speed'), N_a(name='slowest')]))])))
+                criteria=BOOL_a(op='>', operands=[N_a(name='Speed'), N_a(name='slowest')]))]), X=(0,28)))
      ),
     ("s ..= Shaft(In service: True)", Execution_Unit_a(input_tokens=None, output_tokens=None,
         action_group=Inst_Assignment_a(lhs=Flow_Output_a(name=N_a(name='s'), exp_type=None), card='M',
             rhs=INST_a(components=[N_a(name='Shaft'), Selection_a(card='*',
-               criteria=BOOL_a(op=['=='], operands=[N_a(name='In service'), 'true']))])))
+               criteria=BOOL_a(op=['=='], operands=[N_a(name='In service'), 'true']))]), X=(0,29)))
      ),
     ("s ..= Shaft(In service)", Execution_Unit_a(input_tokens=None, output_tokens=None,
         action_group=Inst_Assignment_a(lhs=Flow_Output_a(name=N_a(name='s'), exp_type=None), card='M',
             rhs=INST_a(components=[N_a(name='Shaft'), Selection_a(card='*',
-               criteria=N_a(name='In service'))])))
+               criteria=N_a(name='In service'))]), X=(0,23)))
      ),
     ("x .= Bank(Max close attempts: (v or x) or Average cabin speed > mspeed)",
      Execution_Unit_a(input_tokens=None, output_tokens=None,
@@ -44,7 +44,7 @@ actions = [
                                                   BOOL_a(op='OR', operands=[N_a(name='v'), N_a(name='x')])]),
                                                                    BOOL_a(op='>', operands=[
                                                                        N_a(name='Average cabin speed'),
-                                                                       N_a(name='mspeed')])]))])))
+                                                                       N_a(name='mspeed')])]))]), X=(0,71)))
      ),
     ("x ..= car.findsome()(color: _red)",
      Execution_Unit_a(input_tokens=None, output_tokens=None,
@@ -54,7 +54,7 @@ actions = [
                                                               order=None),
                                                          Selection_a(card='*', criteria=BOOL_a(op=['=='], operands=[
                                                                  N_a(name='color'), Enum_a(value=N_a(name='red'))]))])
-                                                     ))
+                                                     , X=(0,33)))
      ),
 ]
 
@@ -63,4 +63,4 @@ actions = [
 def test_signal_action(text, expected):
     parse = ScrallParser.parse_text(scrall_text=text + '\n', debug=False)[0]
     print(parse)
-    assert parse == expected
+    assert parse[0] == expected

{scrall-0.2.14 → scrall-0.2.16}/tests/test_signals.py

@@ -24,4 +24,4 @@ actions = [
 def test_signal_action(text, expected):
     parse = ScrallParser.parse_text(scrall_text=text, debug=False)[0]
     print(parse)
-    assert parse == expected
+    assert parse[0] == expected

scrall-0.2.14/src/scrall/__init__.py

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