scrall 0.10.2__py3-none-any.whl → 0.12.0__py3-none-any.whl

scrall/__init__.py

@@ -1 +1 @@
-version = "0.10.2"
+version = "0.12.0"

scrall/parse/scrall.peg

@@ -105,7 +105,8 @@ ITS = 'ITS'
 // Creation, deletion and references
 new_instance = '*' new_inst_init // create an instance of a class as an action
 new_lineage = '*[' SP* new_inst_init (';' SP+ new_inst_init)+ SP* ']' // create all instances of a lineage
-new_inst_init = name attr_init? (SP+ to_ref)* // specify class, attr inits, and any required references
+new_inst_init = name attr_init? (SP+ to_ref)* (SP+ to_state)? // specify class, attr inits, and any required references
+to_state = '>' SP* name
 attr_init = '(' SP* (attr_value_init (',' SP+ attr_value_init)* SP*)? ')' // all attrs to init for a new instance
 attr_value_init = (name SP? ':' SP+ scalar_expr )*
 update_ref = (instance_set SP+)? to_ref // relate or unrelated to me or explicit instance_set

scrall/parse/visitor.py

@@ -46,7 +46,7 @@ Qualified_Name_a = namedtuple('Qualified_Name_a', 'iset cname aname')
 Flow_Output_a = namedtuple('Flow_Output_a', 'name exp_type')
 PATH_a = namedtuple('PATH_a', 'hops')
 INST_a = namedtuple('INST_a', 'components')
-INST_PROJ_a = namedtuple('INST_PROJ_a', 'iset projection')
+INST_PROJ_a = namedtuple('INST_PROJ_a', 'iset projection op_chain')
 TEXPR_a = namedtuple('TEXPR_a', 'table hexpr selection projection')
 R_a = namedtuple('R_a', 'rnum')
 IN_a = namedtuple('IN_a', 'name')
@@ -60,7 +60,7 @@ Type_expr_a = namedtuple('Type_expr_a', 'type selector')
 Attr_value_init_a = namedtuple('Attr_value_init_a', 'attr scalar_expr')
 To_ref_a = namedtuple('To_ref_a', 'rnum iset1 iset2')
 Update_ref_a = namedtuple('Update_ref_a', 'iset to_ref')
-New_inst_a = namedtuple('New_inst_a', 'cname attrs rels')
+New_inst_a = namedtuple('New_inst_a', 'cname attrs rels state')
 New_lineage_a = namedtuple('New_lineage_a', 'inits')
 Output_Flow_a = namedtuple('Output_Flow_a', 'output')
 Projection_a = namedtuple('Projection_a', 'expand attrs')
@@ -1033,10 +1033,25 @@ 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)
+        s = children.results.get('to_state')
+        result = New_inst_a(cname=children[0], attrs=a[0] if a else [], rels=None if not r else r,
+                            state=s[0].name if s else None)
         _logger.info(f"  > {result}")
         return result
 
+    @classmethod
+    def visit_to_state(cls, node, children):
+        """
+        '>' SP* name
+        """
+        _logger.info("to_state = '>' SP* name")
+        _logger.info(f'  :: {node.value}')
+
+        _logger.info(f"  < {children}")
+        result = children[0]
+        return result
+
+
     @classmethod
     def visit_attr_init(cls, node, children):
         """
@@ -1440,10 +1455,11 @@ class ScrallVisitor(PTNodeVisitor):
         iset = children.results.get('instance_set')
         if iset:
             p = children.results.get('projection')
-            result = INST_PROJ_a(iset=iset[0], projection=None if not p else p[0])
+            o = children.results.get('op_chain')
+            op_chain = None if not o else o[0]
+            result = INST_PROJ_a(iset=iset[0], projection=None if not p else p[0], op_chain=op_chain)
             _logger.info(f"  > {result}")
             return result
-            # TODO: include opchain if supplied
 
         result = children[:]
         _logger.info(f"  > {result}")

{scrall-0.10.2.dist-info → scrall-0.12.0.dist-info}/METADATA

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

@@ -0,0 +1,14 @@
+scrall/__init__.py,sha256=2v__VIL9u6ld--pEYwwedXsMCx05XIy6YCD1uio7Tl0,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=KT2jTK1wTYn6afcXXaKvFgghtbwzQ7wntNPA3cGwSPY,7904
+scrall/parse/visitor.py,sha256=Tn_WCFw9_aS3slJXWhWouYuC4EekeXruHx9kUpr81_E,58591
+scrall-0.12.0.dist-info/licenses/LICENSE,sha256=kL0xVrwl2i3Pk9mQXAVAPANCTaLGGOsoXgvqW7TBs20,1072
+scrall-0.12.0.dist-info/METADATA,sha256=gYK0WFhEWX2WbKBkC648Lpi5x5UF3IR_rndXSDW6EII,7209
+scrall-0.12.0.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+scrall-0.12.0.dist-info/entry_points.txt,sha256=2fHG6VXtqSTEZXadsBe7XCFaLm4t3V1pFuqzgWWjBgA,48
+scrall-0.12.0.dist-info/top_level.txt,sha256=SWvpMyNNJlrMWpSsK5RUL40ivQxQpKPbL86VrvNIUAE,7
+scrall-0.12.0.dist-info/RECORD,,

scrall-0.10.2.dist-info/RECORD

@@ -1,14 +0,0 @@
-scrall/__init__.py,sha256=nvNgUDh4xb3OXHk2ZZlmcntg1VS76lYDKcSjWJ4f1_k,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=07rAbmwCsA4NrS_HDPdSQ1oQkY3D0c7kEgOuYCyjU34,7864
-scrall/parse/visitor.py,sha256=cfHbTkkXvgQLpeXhO8ymlgjDq1tsj_kpZcZ-ik2wClY,58112
-scrall-0.10.2.dist-info/licenses/LICENSE,sha256=kL0xVrwl2i3Pk9mQXAVAPANCTaLGGOsoXgvqW7TBs20,1072
-scrall-0.10.2.dist-info/METADATA,sha256=Op309rKrd12Gc9dQJ_CNNyKQ3NU1w5WgaZsnXhnwysE,7209
-scrall-0.10.2.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-scrall-0.10.2.dist-info/entry_points.txt,sha256=2fHG6VXtqSTEZXadsBe7XCFaLm4t3V1pFuqzgWWjBgA,48
-scrall-0.10.2.dist-info/top_level.txt,sha256=SWvpMyNNJlrMWpSsK5RUL40ivQxQpKPbL86VrvNIUAE,7
-scrall-0.10.2.dist-info/RECORD,,