scrall 0.10.0__tar.gz → 0.10.2__tar.gz

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

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

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

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

{scrall-0.10.0 → scrall-0.10.2}/src/scrall/parse/scrall.peg

@@ -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.10.0 → scrall-0.10.2}/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')
@@ -677,7 +677,8 @@ class ScrallVisitor(PTNodeVisitor):
         _logger.info(f'  :: {node.value}')
 
         _logger.info(f"  < {children}")
-        params = children.results.get('supplied_params', [])
+        params = children.results.get('supplied_params')
+        params = params[0] if params else []
         result = {'name': children[0].name, 'params': params}
         _logger.info(f"  > {result}")
         return result
@@ -1138,10 +1139,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.10.0 → scrall-0.10.2/src/scrall.egg-info}/PKG-INFO

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

@@ -49,7 +49,7 @@ actions = [
              input_tokens=[],
              statement=Signal_a(
                  event='Try redirect', supplied_params=[
-                     [Supplied_Parameter_a(pname='new dest', sval=IN_a(name='new dest'))]],
+                     Supplied_Parameter_a(pname='new dest', sval=IN_a(name='new dest'))],
                  dest=Signal_Dest_a(
                      target_iset=INST_a(
                          components=[PATH_a(hops=[R_a(rnum='R53'), N_a(name='Cabin')])]),

{scrall-0.10.0 → scrall-0.10.2}/tests/test_signals.py

@@ -24,7 +24,7 @@ actions = [
              statement=External_Signal_a(
                  event='Goto floor',
                  supplied_params=[
-                     [Supplied_Parameter_a(pname='Dest floor', sval=N_a(name='my level'))]
+                     Supplied_Parameter_a(pname='Dest floor', sval=N_a(name='my level'))
                  ]), block=None),
          output_token=None)
      ),

scrall-0.10.0/src/scrall/__init__.py

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