scrall 0.2.14__py3-none-any.whl → 0.2.16__py3-none-any.whl

scrall/__init__.py

@@ -1 +1 @@
-version = "0.2.14"
+version = "0.2.16"

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/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.dist-info → scrall-0.2.16.dist-info}/METADATA

@@ -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.16.dist-info/RECORD

@@ -0,0 +1,14 @@
+scrall/__init__.py,sha256=P2TYzpyotIK6-bM28IawZ5pVYMrjUYFYZYhrlvsETK0,18
+scrall/__main__.py,sha256=8SqHhDqR9TXWo1dxGSFfcyEYUiRfXFHLwA5czKvzSa4,2027
+scrall/exceptions.py,sha256=QU4mKLs7_ddGIznhh2HUpjb_PdPlxWZMMY_g0ELenSs,1764
+scrall/log.conf,sha256=YfI9CXa3cPV3aTnEBcx4zyAyWrMK-sSS3agScma4n4I,827
+scrall/parse/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
+scrall/parse/parser.py,sha256=k4SeWMtNzAUtwU_e15frvSL1D5G3RBU_jmLegZbIBnY,5221
+scrall/parse/scrall.peg,sha256=svAItMAuGMa6edZ0hKY2eEr375UZ2jTyXh8c3bK8ynw,7335
+scrall/parse/visitor.py,sha256=DUPRg73wLYVJwREb-uhPlNvA3qRwC4RkMTig4ZLz3w0,34781
+scrall-0.2.16.dist-info/LICENSE,sha256=kL0xVrwl2i3Pk9mQXAVAPANCTaLGGOsoXgvqW7TBs20,1072
+scrall-0.2.16.dist-info/METADATA,sha256=YZiWJvIj7ZO_5k9uwqZwKp8tnSetcNyFS7amzCBW72o,7192
+scrall-0.2.16.dist-info/WHEEL,sha256=AtBG6SXL3KF_v0NxLf0ehyVOh0cold-JbJYXNGorC6Q,92
+scrall-0.2.16.dist-info/entry_points.txt,sha256=2fHG6VXtqSTEZXadsBe7XCFaLm4t3V1pFuqzgWWjBgA,48
+scrall-0.2.16.dist-info/top_level.txt,sha256=SWvpMyNNJlrMWpSsK5RUL40ivQxQpKPbL86VrvNIUAE,7
+scrall-0.2.16.dist-info/RECORD,,

scrall-0.2.14.dist-info/RECORD

@@ -1,14 +0,0 @@
-scrall/__init__.py,sha256=m3fpgP2mRcMyBYfbEq6eJe5Zjyq6pHEIVqIeCnJ7So4,18
-scrall/__main__.py,sha256=8SqHhDqR9TXWo1dxGSFfcyEYUiRfXFHLwA5czKvzSa4,2027
-scrall/exceptions.py,sha256=QU4mKLs7_ddGIznhh2HUpjb_PdPlxWZMMY_g0ELenSs,1764
-scrall/log.conf,sha256=YfI9CXa3cPV3aTnEBcx4zyAyWrMK-sSS3agScma4n4I,827
-scrall/parse/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-scrall/parse/parser.py,sha256=xl9zKuR52V18DzS_y_6dLwvnGmsmdJIUPPP-uiBGtXs,5024
-scrall/parse/scrall.peg,sha256=svAItMAuGMa6edZ0hKY2eEr375UZ2jTyXh8c3bK8ynw,7335
-scrall/parse/visitor.py,sha256=ic7UJpf5FqyIRickWRpG0i364Op0fd93jfHT2eqVB8o,34729
-scrall-0.2.14.dist-info/LICENSE,sha256=kL0xVrwl2i3Pk9mQXAVAPANCTaLGGOsoXgvqW7TBs20,1072
-scrall-0.2.14.dist-info/METADATA,sha256=mti7f9hn1gnhrC1hmk1lmYq6g6vT6Ue3wIruAAG2yOo,7192
-scrall-0.2.14.dist-info/WHEEL,sha256=AtBG6SXL3KF_v0NxLf0ehyVOh0cold-JbJYXNGorC6Q,92
-scrall-0.2.14.dist-info/entry_points.txt,sha256=2fHG6VXtqSTEZXadsBe7XCFaLm4t3V1pFuqzgWWjBgA,48
-scrall-0.2.14.dist-info/top_level.txt,sha256=SWvpMyNNJlrMWpSsK5RUL40ivQxQpKPbL86VrvNIUAE,7
-scrall-0.2.14.dist-info/RECORD,,