scrall 0.9.4__tar.gz → 0.10.1__tar.gz

{scrall-0.9.4/src/scrall.egg-info → scrall-0.10.1}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: scrall
-Version: 0.9.4
+Version: 0.10.1
 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.9.4 → scrall-0.10.1}/pyproject.toml

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

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

{scrall-0.9.4 → scrall-0.10.1}/src/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
 
@@ -118,7 +118,7 @@ delete = '!*' SP* instance_set (',' SP+ instance_set)* // supports multi-delete
 // Scalar assignment
 scalar_assignment = scalar_output_set SP* SCALAR_ASSIGN SP* scalar_expr projection? (',' SP* scalar_expr projection?)*
 scalar_output_set = qualified_name / flow_output (',' SP+ flow_output)*
-qualified_name = name '.' name
+qualified_name = (name / instance_set) '.' name
 flow_output = name (TYPE_ASSIGN name)?
 projection = '.' (name / '(' ( (ALL / (name (',' SP+ name)*) )? ')')) // TODO: Why is empty () ok in projection?
 ALL = '*'

{scrall-0.9.4 → scrall-0.10.1}/src/scrall/parse/visitor.py

@@ -42,7 +42,7 @@ BOOL_a = namedtuple('BOOL_a', 'op operands')
 Scalar_Assignment_a = namedtuple('Scalar_Assignment_a', 'lhs rhs')
 Table_Assignment_a = namedtuple('Table_Assignment_a', 'type assign_tuple lhs rhs X')
 Scalar_RHS_a = namedtuple('Scalar_RHS_a', 'expr attrs')
-Qualified_Name_a = namedtuple('Qualified_Name_a', 'cname aname')
+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')
@@ -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
@@ -1133,10 +1138,21 @@ class ScrallVisitor(PTNodeVisitor):
     @classmethod
     def visit_qualified_name(cls, node, children):
         """
+        (name / instance_set) '.' name
         """
         _logger.info("qualified_name = name '.' name")
         _logger.info(f'  :: {node.value}')
-        return Qualified_Name_a(cname=children[0].name, aname=children[1].name)
+        iset = children.results.get('instance_set')
+        names = children.results.get('name')
+        if iset:
+            # iset takes the place of cname
+            # iset.attribute -- /R4/Door.Lock request
+            aname = names[0].name
+            cname = None
+        else:
+            # class.attribute -- Door.Lock request
+            cname, aname = names[0].name, names[1].name
+        return Qualified_Name_a(iset=iset, cname=cname, aname=aname)
 
     @classmethod
     def visit_scalar_output_set(cls, node, children):

{scrall-0.9.4 → scrall-0.10.1/src/scrall.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: scrall
-Version: 0.9.4
+Version: 0.10.1
 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.9.4 → scrall-0.10.1}/tests/test_calls.py

@@ -6,27 +6,40 @@ from scrall.parse.visitor import *
 
 actions = [
     ("~.Goto floor( Dest floor: ^new dest )",
-     Execution_Unit_a(
-         statement_set=Seq_Statement_Set_a(
-             input_tokens=[],
-             statement=Call_a(
-                 call=None,
-                 op_chain=Op_chain_a(
-                     components=[
-                         Scalar_op_a(
-                             name=N_a(name='Goto floor'),
+    Execution_Unit_a(
+        statement_set=Seq_Statement_Set_a(
+            input_tokens=[],
+            statement=Call_a(
+                call=INST_a(
+                    components=[
+                        Op_a(owner='_external', op_name='Goto floor',
                              supplied_params=[
                                  Supplied_Parameter_a(
-                                     pname='Dest floor',
-                                     sval=IN_a(name='new dest')
+                                     pname='Dest floor', sval=IN_a(name='new dest')
                                  )
-                             ]
-                         )
-                     ]
-                 )
-             ), block=None),
-         output_token=None)
+                             ])]), op_chain=None), block=None), output_token=None)
      ),
+    #  Execution_Unit_a(
+    #      statement_set=Seq_Statement_Set_a(
+    #          input_tokens=[],
+    #          statement=Call_a(
+    #              call=None,
+    #              op_chain=Op_chain_a(
+    #                  components=[
+    #                      Scalar_op_a(
+    #                          name=N_a(name='Goto floor'),
+    #                          supplied_params=[
+    #                              Supplied_Parameter_a(
+    #                                  pname='Dest floor',
+    #                                  sval=IN_a(name='new dest')
+    #                              )
+    #                          ]
+    #                      )
+    #                  ]
+    #              )
+    #          ), block=None),
+    #      output_token=None)
+    #  ),
     (".Ping( dir: Travel direction.opposite )",
     Execution_Unit_a(
         statement_set=Seq_Statement_Set_a(
@@ -35,7 +48,7 @@ actions = [
                 call=INST_a(
                     components=[
                         Op_a(
-                            owner='implicit',
+                            owner='_implicit',
                             op_name='Ping',
                             supplied_params=[
                                 Supplied_Parameter_a(

scrall-0.9.4/src/scrall/__init__.py

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