scrall 0.10.2__tar.gz → 0.11.0__tar.gz

{scrall-0.10.2/src/scrall.egg-info → scrall-0.11.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: scrall
-Version: 0.10.2
+Version: 0.11.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.2 → scrall-0.11.0}/pyproject.toml

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

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

{scrall-0.10.2 → scrall-0.11.0}/src/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-0.10.2 → scrall-0.11.0}/src/scrall/parse/visitor.py

@@ -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):
         """

{scrall-0.10.2 → scrall-0.11.0/src/scrall.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: scrall
-Version: 0.10.2
+Version: 0.11.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.2 → scrall-0.11.0}/tests/test_decision_wrap.py

@@ -17,7 +17,7 @@ expected_parse = Execution_Unit_a(
                         statement_set=Seq_Statement_Set_a(
                             input_tokens=[],
                             statement=New_inst_a(
-                                cname=N_a(name='cat'), attrs=[], rels=None),
+                                cname=N_a(name='cat'), attrs=[], rels=None, state=None),
                             block=None
                         ),
                         output_token=None

{scrall-0.10.2 → scrall-0.11.0}/tests/test_decision_wrap_false.py

@@ -17,7 +17,7 @@ expected_parse = Execution_Unit_a(
                         statement_set=Seq_Statement_Set_a(
                             input_tokens=[],
                             statement=New_inst_a(
-                                cname=N_a(name='cat'), attrs=[], rels=None),
+                                cname=N_a(name='cat'), attrs=[], rels=None, state=None),
                             block=None), output_token=None
                     )
                 ]),
@@ -28,7 +28,7 @@ expected_parse = Execution_Unit_a(
                         statement_set=Seq_Statement_Set_a(
                             input_tokens=[],
                             statement=New_inst_a(
-                                cname=N_a(name='dog'), attrs=[], rels=None),
+                                cname=N_a(name='dog'), attrs=[], rels=None, state=None),
                             block=None), output_token=None
                     )
                 ])

scrall-0.10.2/src/scrall/__init__.py

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