scrall 0.8.6__tar.gz → 0.8.8__tar.gz

{scrall-0.8.6/src/scrall.egg-info → scrall-0.8.8}/PKG-INFO

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

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

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

{scrall-0.8.6 → scrall-0.8.8}/src/scrall/parse/scrall.peg

@@ -91,7 +91,7 @@ output_flow = OUTPUT SP+ scalar_expr
 OUTPUT = '=>>'
 
 // Instance set
-instance_set =  new_instance / ((operation / name / path) (reflexive_selection / selection / operation / path)*)
+instance_set =  new_instance / ((operation / input_param / name / path) (reflexive_selection / selection / operation / path)*)
 selection = '(' SP* (rank_selection / criteria_selection) SP* ')'
 rank_selection = CARD ', ' SP* RANKR name
 criteria_selection = (CARD ', ' SP* scalar_expr) / CARD / scalar_expr

{scrall-0.8.6 → scrall-0.8.8}/src/scrall/parse/visitor.py

@@ -916,7 +916,7 @@ class ScrallVisitor(PTNodeVisitor):
         by any sequence of selection, operation, and paths. The parser won't find two paths in sequence since
         any encounter path will be fully consumed
         """
-        _logger.info("instance_set = new_instance / ((operation / prefix_name / path) (reflexive_selection / "
+        _logger.info("instance_set = new_instance / ((operation / input_param / name / path) (reflexive_selection / "
                      "selection / operation / path)*)")
         _logger.info(f">> {[k for k in children.results.keys()]}")
         _logger.info(f'  :: {node.value}')
@@ -925,7 +925,12 @@ class ScrallVisitor(PTNodeVisitor):
         if len(children) == 1 and isinstance(children[0], N_a):
             result = children[0]
         else:
-            result = INST_a(children)
+            p = children.results.get('input_param')
+            if p:
+                # Just like above case, but returning an IN_a (parameter name)
+                result = p[0]
+            else:
+                result = INST_a(children)
         _logger.info(f"  > {result}")
         return result
 
@@ -1008,7 +1013,7 @@ class ScrallVisitor(PTNodeVisitor):
         _logger.info(f"  < {children}")
         a = children.results.get('attr_init')
         r = children.results.get('to_ref')
-        result = New_inst_a(cname=children[0], attrs=a[0] if a else [], rels=None if not r else r[0])
+        result = New_inst_a(cname=children[0], attrs=a[0] if a else [], rels=None if not r else r)
         _logger.info(f"  > {result}")
         return result
 

{scrall-0.8.6 → scrall-0.8.8/src/scrall.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: scrall
-Version: 0.8.6
+Version: 0.8.8
 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.8.6/src/scrall/__init__.py

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