scrall 0.8.2__tar.gz → 0.8.3__tar.gz

{scrall-0.8.2/src/scrall.egg-info → scrall-0.8.3}/PKG-INFO

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

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

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

{scrall-0.8.2 → scrall-0.8.3}/src/scrall/__main__.py

@@ -63,6 +63,7 @@ def main():
         text = args.expr + '\n'
         d = args.debug
         result = ScrallParser.parse_text(scrall_text=text, debug=d)
+        pass
 
     if args.file:
         fpath = Path(args.file)

{scrall-0.8.2 → scrall-0.8.3}/src/scrall/parse/scrall.peg

@@ -73,7 +73,7 @@ ASYNCH = '=>'
 inst_assignment = flow_output SP+ INST_ASSIGN SP+ instance_set
 INST_ASSIGN = '.=' / '..='
 
-// Synchronous call action (method or ee operation)
+// 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
 operation = owner? '.' name supplied_params
 owner = name
@@ -115,9 +115,10 @@ delete = '!*' SP* instance_set (',' SP+ instance_set)* // supports multi-delete
 // Scalar call
 //scalar_call = scalar_expr
 
-// math and boolean operator precedence
+// Scalar assignment
 scalar_assignment = scalar_output_set SP* SCALAR_ASSIGN SP* scalar_expr projection? (',' SP* scalar_expr projection?)*
-scalar_output_set = flow_output (',' SP+ flow_output)*
+scalar_output_set = qualified_name / flow_output (',' SP+ flow_output)*
+qualified_name = name '.' name
 flow_output = name (TYPE_ASSIGN name)?
 projection = '.' (name / '(' ( (ALL / (name (',' SP+ name)*) )? ')')) // TODO: Why is empty () ok in projection?
 ALL = '*'

{scrall-0.8.2 → scrall-0.8.3}/src/scrall/parse/visitor.py

@@ -41,6 +41,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')
 Flow_Output_a = namedtuple('Flow_Output_a', 'name exp_type')
 PATH_a = namedtuple('PATH_a', 'hops')
 INST_a = namedtuple('INST_a', 'components')
@@ -1093,7 +1094,7 @@ class ScrallVisitor(PTNodeVisitor):
         _logger.info(f"  > {result}")
         return result
 
-    # Math and boolean operator precedence
+    # Scalar Assigment
     @classmethod
     def visit_scalar_assignment(cls, node, children):
         """
@@ -1110,11 +1111,19 @@ class ScrallVisitor(PTNodeVisitor):
         _logger.info(f"  > {result}")
         return result
 
+    @classmethod
+    def visit_qualified_name(cls, node, children):
+        """
+        """
+        _logger.info("qualified_name = name '.' name")
+        _logger.info(f'  :: {node.value}')
+        return Qualified_Name_a(cname=children[0].name, aname=children[1].name)
+
     @classmethod
     def visit_scalar_output_set(cls, node, children):
         """
         """
-        _logger.info("scalar_output_set = flow_output (',' flow_output)*")
+        _logger.info("scalar_output_set = qualified_name / flow_output (',' SP+ flow_output)*")
         _logger.info(f'  :: {node.value}')
 
         _logger.info(f"  < {children}")

{scrall-0.8.2 → scrall-0.8.3/src/scrall.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: scrall
-Version: 0.8.2
+Version: 0.8.3
 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.8.2/src/scrall/__init__.py

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