scrall 0.2.15__tar.gz → 0.2.16__tar.gz

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

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

@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "scrall"
-version = "0.2.15"
+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.15 → 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.15 → scrall-0.2.16/src/scrall.egg-info}/PKG-INFO

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

@@ -61,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.15 → scrall-0.2.16}/tests/test_selection.py

@@ -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.15 → 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.15/src/scrall/__init__.py

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