scrall 0.8.6__py3-none-any.whl → 0.8.8__py3-none-any.whl

scrall/__init__.py

@@ -1 +1 @@
-version = "0.8.6"
+version = "0.8.8"

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

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

@@ -0,0 +1,14 @@
+scrall/__init__.py,sha256=qHYh1pZe2XCAYi_96cwEgzxFda1VHX07ZOaysPqfgXk,17
+scrall/__main__.py,sha256=H5szTQUuBTrnCngyUv3EFj5eQyPY4j0NKf1q8DgK6E8,2187
+scrall/exceptions.py,sha256=QU4mKLs7_ddGIznhh2HUpjb_PdPlxWZMMY_g0ELenSs,1764
+scrall/log.conf,sha256=tERYKbCp9TgdAVTby6A7gUpnjurJKcX1tyAzG3ATORI,933
+scrall/parse/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
+scrall/parse/parser.py,sha256=k4SeWMtNzAUtwU_e15frvSL1D5G3RBU_jmLegZbIBnY,5221
+scrall/parse/scrall.peg,sha256=8qyy3W2aZhHION8DLNpYMX6jxpExmUDqpDWjhstvstk,7801
+scrall/parse/visitor.py,sha256=qEYhFuwqelS0vy9xAADojGXsOfPBdHjVoAAjV_eZbWc,56589
+scrall-0.8.8.dist-info/licenses/LICENSE,sha256=kL0xVrwl2i3Pk9mQXAVAPANCTaLGGOsoXgvqW7TBs20,1072
+scrall-0.8.8.dist-info/METADATA,sha256=IFx4qA4EKydnTloU2kd61SYdIJZYTeg0-eDukxbGABQ,7208
+scrall-0.8.8.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+scrall-0.8.8.dist-info/entry_points.txt,sha256=2fHG6VXtqSTEZXadsBe7XCFaLm4t3V1pFuqzgWWjBgA,48
+scrall-0.8.8.dist-info/top_level.txt,sha256=SWvpMyNNJlrMWpSsK5RUL40ivQxQpKPbL86VrvNIUAE,7
+scrall-0.8.8.dist-info/RECORD,,

scrall-0.8.6.dist-info/RECORD

@@ -1,14 +0,0 @@
-scrall/__init__.py,sha256=30YCGZ_PyUCGLazcflKR5pn72yUVkhTqyEK9tw1AmAA,17
-scrall/__main__.py,sha256=H5szTQUuBTrnCngyUv3EFj5eQyPY4j0NKf1q8DgK6E8,2187
-scrall/exceptions.py,sha256=QU4mKLs7_ddGIznhh2HUpjb_PdPlxWZMMY_g0ELenSs,1764
-scrall/log.conf,sha256=tERYKbCp9TgdAVTby6A7gUpnjurJKcX1tyAzG3ATORI,933
-scrall/parse/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-scrall/parse/parser.py,sha256=k4SeWMtNzAUtwU_e15frvSL1D5G3RBU_jmLegZbIBnY,5221
-scrall/parse/scrall.peg,sha256=5sZnsxNcu09eqwOZIH1gAoX3M0rlZAqZKbgCbYcc4Yc,7787
-scrall/parse/visitor.py,sha256=NRof5JPEWGCtUys2vChWQsA-P3Lo3SUVTlUCJFNeXQs,56384
-scrall-0.8.6.dist-info/licenses/LICENSE,sha256=kL0xVrwl2i3Pk9mQXAVAPANCTaLGGOsoXgvqW7TBs20,1072
-scrall-0.8.6.dist-info/METADATA,sha256=CNfRwjUVSVydsE6MnSxfNBKIWUoQNgpojM6j7ueeB8Y,7208
-scrall-0.8.6.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-scrall-0.8.6.dist-info/entry_points.txt,sha256=2fHG6VXtqSTEZXadsBe7XCFaLm4t3V1pFuqzgWWjBgA,48
-scrall-0.8.6.dist-info/top_level.txt,sha256=SWvpMyNNJlrMWpSsK5RUL40ivQxQpKPbL86VrvNIUAE,7
-scrall-0.8.6.dist-info/RECORD,,