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

scrall/__init__.py

@@ -1 +1 @@
-version = "0.9.4"
+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

@@ -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

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

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

@@ -1,14 +0,0 @@
-scrall/__init__.py,sha256=YRu5YIisR0uOx2dm0XZ4Wy0wzV_0bDGjIWFNyF8Q2Fg,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=799D58lXJpFSkBDp8xJwrlIOlL6Hm6N0fB0EqLszTqQ,57439
-scrall-0.9.4.dist-info/licenses/LICENSE,sha256=kL0xVrwl2i3Pk9mQXAVAPANCTaLGGOsoXgvqW7TBs20,1072
-scrall-0.9.4.dist-info/METADATA,sha256=PiEq8JeWJSBD9rCsCnoH7Y48ZinakdmqU3nnsHuCgQ8,7208
-scrall-0.9.4.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-scrall-0.9.4.dist-info/entry_points.txt,sha256=2fHG6VXtqSTEZXadsBe7XCFaLm4t3V1pFuqzgWWjBgA,48
-scrall-0.9.4.dist-info/top_level.txt,sha256=SWvpMyNNJlrMWpSsK5RUL40ivQxQpKPbL86VrvNIUAE,7
-scrall-0.9.4.dist-info/RECORD,,