scrall 0.8.2__py3-none-any.whl → 0.8.3__py3-none-any.whl

scrall/__init__.py

@@ -1 +1 @@
-version = "0.8.2"
+version = "0.8.3"

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/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/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.dist-info → scrall-0.8.3.dist-info}/METADATA

@@ -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.3.dist-info/RECORD

@@ -0,0 +1,14 @@
+scrall/__init__.py,sha256=3xQqmgm1_x3VKzwKdyUiOqUGw60OWRvETUtuN3YWiwY,17
+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=5sZnsxNcu09eqwOZIH1gAoX3M0rlZAqZKbgCbYcc4Yc,7787
+scrall/parse/visitor.py,sha256=qNgto3fZytyQQHHJ9KE2iqFkQ3ZDmxHzCapKi8z7p3Y,56354
+scrall-0.8.3.dist-info/licenses/LICENSE,sha256=kL0xVrwl2i3Pk9mQXAVAPANCTaLGGOsoXgvqW7TBs20,1072
+scrall-0.8.3.dist-info/METADATA,sha256=wfJm_30juIvSXwBlFr3cywipBQKs7sZ1yE3AYfdW0to,7208
+scrall-0.8.3.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+scrall-0.8.3.dist-info/entry_points.txt,sha256=2fHG6VXtqSTEZXadsBe7XCFaLm4t3V1pFuqzgWWjBgA,48
+scrall-0.8.3.dist-info/top_level.txt,sha256=SWvpMyNNJlrMWpSsK5RUL40ivQxQpKPbL86VrvNIUAE,7
+scrall-0.8.3.dist-info/RECORD,,

scrall-0.8.2.dist-info/RECORD

@@ -1,14 +0,0 @@
-scrall/__init__.py,sha256=Q21Bq3gbsUqGg_u-008RR-6e_IdwSouIWV3rtR8UkDY,17
-scrall/__main__.py,sha256=hmDQBhfK3XMAPoAbzO0yVy42eqQkTC0y4hMp6xvc7CI,2174
-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=Dwuram4HrlwwXJuSYsD2GWcHjnoWNoyhxwcSUVeBNNU,7740
-scrall/parse/visitor.py,sha256=jmwAiwPgZSKGoGqygdegJIawoei9vTOKYf7vg7-9Gdk,56017
-scrall-0.8.2.dist-info/licenses/LICENSE,sha256=kL0xVrwl2i3Pk9mQXAVAPANCTaLGGOsoXgvqW7TBs20,1072
-scrall-0.8.2.dist-info/METADATA,sha256=4TZ4PU2hN3MxR9nIF4okmxX4hE9cr9UFQxC-jh2v3rQ,7208
-scrall-0.8.2.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-scrall-0.8.2.dist-info/entry_points.txt,sha256=2fHG6VXtqSTEZXadsBe7XCFaLm4t3V1pFuqzgWWjBgA,48
-scrall-0.8.2.dist-info/top_level.txt,sha256=SWvpMyNNJlrMWpSsK5RUL40ivQxQpKPbL86VrvNIUAE,7
-scrall-0.8.2.dist-info/RECORD,,