scrall 0.9.3__py3-none-any.whl → 0.10.0__py3-none-any.whl

scrall/__init__.py

@@ -1 +1 @@
-version = "0.9.3"
+version = "0.10.0"

scrall/parse/scrall.peg

@@ -74,9 +74,9 @@ inst_assignment = flow_output SP+ INST_ASSIGN SP+ instance_set
 INST_ASSIGN = '.=' / '..='
 
 // Synchronous call action (method or ee operation or type operation)
-call = ('~' / instance_set) op_chain? // Post-parse verify that last element is an operation, otherwise invalid call
+call = instance_set op_chain? // Post-parse verify that last element is an operation, otherwise invalid call
 operation = owner? '.' name supplied_params
-owner = name
+owner = '~' / name
 supplied_params = '(' SP* (param (',' SP+ param)*)? SP* ')'
 param = (name SP* ':' SP*)? scalar_expr // Comma above keeps scalar_expr from grabbing next param
 

scrall/parse/visitor.py

@@ -157,7 +157,7 @@ class ScrallVisitor(PTNodeVisitor):
         _logger.info(f'  :: {node.value}')
 
         _logger.info(f"< {children}")
-        result = [c for c in children if c]
+        result = children[:]
         _logger.info(f"  -> {result}")
         return result
 
@@ -239,7 +239,7 @@ class ScrallVisitor(PTNodeVisitor):
 
         _logger.info(f"  < {children}")
         _logger.info(f"  > pass")
-        return children
+        return children[:]  # Removes the result component
 
     @classmethod
     def visit_statement(cls, node, children):
@@ -333,7 +333,7 @@ class ScrallVisitor(PTNodeVisitor):
 
         _logger.info(f"  < {children}")
         _logger.info("  > pass")
-        return children
+        return children[:]
 
     @classmethod
     def visit_attr_type_def(cls, node, children):
@@ -354,7 +354,7 @@ class ScrallVisitor(PTNodeVisitor):
 
         _logger.info(f"  < {children}")
         _logger.info(f"  > pass")
-        return children
+        return children[:]
 
     @classmethod
     def visit_row(cls, node, children):
@@ -376,7 +376,7 @@ class ScrallVisitor(PTNodeVisitor):
 
         _logger.info(f"  < {children}")
         _logger.info(f"  > pass")
-        return children
+        return children[:]
 
     # Implicit table assignment
     @classmethod
@@ -483,7 +483,7 @@ class ScrallVisitor(PTNodeVisitor):
 
         _logger.info(f"  < {children}")
         _logger.info(f"  > pass")
-        return children
+        return children[:]
 
     @classmethod
     def visit_column_op(cls, node, children):
@@ -592,7 +592,7 @@ class ScrallVisitor(PTNodeVisitor):
         _logger.info(f'  :: {node.value}')
 
         _logger.info(f"  < {children}")
-        result = children
+        result = children[:]
         _logger.info(f"  > {result}")
         return result
 
@@ -781,7 +781,7 @@ class ScrallVisitor(PTNodeVisitor):
         _logger.info(f'  :: {node.value}')
 
         _logger.info(f"  < {children}")
-        result = children
+        result = children[:]
         _logger.info(f"  > {result}")
         return result
 
@@ -832,7 +832,7 @@ class ScrallVisitor(PTNodeVisitor):
         owner = children.results.get('owner')
         p = children.results.get('supplied_params')
         result = Op_a(
-            owner='implicit' if not owner else owner[0],
+            owner='_implicit' if not owner else owner[0],
             op_name=children.results['name'][0].name,
             supplied_params=[] if not p else p[0]
         )
@@ -841,7 +841,12 @@ class ScrallVisitor(PTNodeVisitor):
 
     @classmethod
     def visit_owner(cls, node, children):
-        result = ''.join(children)
+        """
+        '~' / name
+        """
+        name = children.results.get('name')
+        # This is either ~ signifying an external service or a single instance flow (instance set)
+        result = name[0].name if name else '_external'
         return result
 
     @classmethod
@@ -853,7 +858,7 @@ class ScrallVisitor(PTNodeVisitor):
         _logger.info(f'  :: {node.value}')
 
         _logger.info(f"  < {children}")
-        result = children if children else []
+        result = children[:]
         _logger.info(f"  > {result}")
         return result
 
@@ -903,7 +908,7 @@ class ScrallVisitor(PTNodeVisitor):
         _logger.info(f'  :: {node.value}')
 
         _logger.info(f"  < {children}")
-        result = Iteration_a(*children)
+        result = Iteration_a(*children)  # TODO: Check this for inclusion of results member
         _logger.info(f"  > {result}")
         return result
 
@@ -944,7 +949,7 @@ class ScrallVisitor(PTNodeVisitor):
                 # Just like above case, but returning an IN_a (parameter name)
                 result = p[0]
             else:
-                result = INST_a(children)
+                result = INST_a(children[:])
         _logger.info(f"  > {result}")
         return result
 
@@ -1012,7 +1017,7 @@ class ScrallVisitor(PTNodeVisitor):
         _logger.info(f'  :: {node.value}')
 
         _logger.info(f"  < {children}")
-        result = New_lineage_a(children)
+        result = New_lineage_a(children[:])
         _logger.info(f"  > {result}")
         return result
 
@@ -1109,7 +1114,7 @@ class ScrallVisitor(PTNodeVisitor):
         _logger.info(f'  :: {node.value}')
 
         _logger.info(f"  < {children}")
-        result = Scalar_Call_a(children)
+        result = Scalar_Call_a(children[:])
         _logger.info(f"  > {result}")
         return result
 
@@ -1146,7 +1151,7 @@ class ScrallVisitor(PTNodeVisitor):
         _logger.info(f'  :: {node.value}')
 
         _logger.info(f"  < {children}")
-        result = children
+        result = children[:]
         _logger.info(f"  > {result}")
         return result
 
@@ -1428,7 +1433,7 @@ class ScrallVisitor(PTNodeVisitor):
             return result
             # TODO: include opchain if supplied
 
-        result = children
+        result = children[:]
         _logger.info(f"  > {result}")
         return result
 
@@ -1459,7 +1464,7 @@ class ScrallVisitor(PTNodeVisitor):
         _logger.info(f'  :: {node.value}')
 
         _logger.info(f"  < {children}")
-        result = Op_chain_a(children)
+        result = Op_chain_a(children[:])
         _logger.info(f"  > {result}")
         return result
 
@@ -1568,7 +1573,7 @@ class ScrallVisitor(PTNodeVisitor):
         _logger.info(f'  :: {node.value}')
 
         _logger.info(f"  < {children}")
-        result = PATH_a(children)
+        result = PATH_a(children[:])
         _logger.info(f"  > {result}")
         return result
 

{scrall-0.9.3.dist-info → scrall-0.10.0.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: scrall
-Version: 0.9.3
+Version: 0.10.0
 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.10.0.dist-info/RECORD

@@ -0,0 +1,14 @@
+scrall/__init__.py,sha256=5J3gAl0dpgRaHiwx6Notssoxh6Q25dQPNlaGoI4QtzM,18
+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=0vVYqFdDM_nbrc55IB4o1dfJQpQaIcv7hr8wHsi9C6I,7847
+scrall/parse/visitor.py,sha256=1gOMCIltGjgW3JH-Uw_vV2qeQQlfgVGHpX7bG3eOI3s,57646
+scrall-0.10.0.dist-info/licenses/LICENSE,sha256=kL0xVrwl2i3Pk9mQXAVAPANCTaLGGOsoXgvqW7TBs20,1072
+scrall-0.10.0.dist-info/METADATA,sha256=Rsf1YzWsUK65yOXZBVM8oy53c-in7GatHGv1yu1guIA,7209
+scrall-0.10.0.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+scrall-0.10.0.dist-info/entry_points.txt,sha256=2fHG6VXtqSTEZXadsBe7XCFaLm4t3V1pFuqzgWWjBgA,48
+scrall-0.10.0.dist-info/top_level.txt,sha256=SWvpMyNNJlrMWpSsK5RUL40ivQxQpKPbL86VrvNIUAE,7
+scrall-0.10.0.dist-info/RECORD,,

scrall-0.9.3.dist-info/RECORD

@@ -1,14 +0,0 @@
-scrall/__init__.py,sha256=R2eBAQLMzYT-hSL1URsnLLbWL0ueTl9jdRehLHC2vm8,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=nVm5MYrYz5F-KXdyCPpqP8avy7LovPvv7e8JMP_5MBI,7849
-scrall/parse/visitor.py,sha256=BtK3I8tWRuUDTZydeTHnCzw7kdsOCEFDW6Nji5XYcM4,57345
-scrall-0.9.3.dist-info/licenses/LICENSE,sha256=kL0xVrwl2i3Pk9mQXAVAPANCTaLGGOsoXgvqW7TBs20,1072
-scrall-0.9.3.dist-info/METADATA,sha256=KiTMfZfXkYxiv8Z912yLpCt8rlRCxeD2xwMglpiggS8,7208
-scrall-0.9.3.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-scrall-0.9.3.dist-info/entry_points.txt,sha256=2fHG6VXtqSTEZXadsBe7XCFaLm4t3V1pFuqzgWWjBgA,48
-scrall-0.9.3.dist-info/top_level.txt,sha256=SWvpMyNNJlrMWpSsK5RUL40ivQxQpKPbL86VrvNIUAE,7
-scrall-0.9.3.dist-info/RECORD,,