scrall 0.11.0__py3-none-any.whl → 0.12.1__py3-none-any.whl

scrall/__init__.py

@@ -1 +1 @@
-version = "0.11.0"
+version = "0.12.1"

scrall/parse/scrall.peg

@@ -52,7 +52,7 @@ FALSE_RESULT_OP = ':'
 switch = switch_input DECISION_OP SP* case_block // Boolean expr triggers case_block
 switch_input = rnum / scalar_expr
 case_block = '{' LINEWRAP* case+ LINEWRAP*'}'
-case = LINEWRAP* trigger_set? ':' LINEWRAP* component_statement_set
+case = LINEWRAP* trigger_set? ':' (SP+ / LINEWRAP*) component_statement_set
 trigger_set = enum_value (',' SP+ enum_value)* SP*
 enum_value = '_' name // Scalar switch has enum value cases
 DECISION_OP = '?'

scrall/parse/visitor.py

@@ -46,7 +46,7 @@ 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')
-INST_PROJ_a = namedtuple('INST_PROJ_a', 'iset projection')
+INST_PROJ_a = namedtuple('INST_PROJ_a', 'iset projection op_chain')
 TEXPR_a = namedtuple('TEXPR_a', 'table hexpr selection projection')
 R_a = namedtuple('R_a', 'rnum')
 IN_a = namedtuple('IN_a', 'name')
@@ -1455,10 +1455,11 @@ class ScrallVisitor(PTNodeVisitor):
         iset = children.results.get('instance_set')
         if iset:
             p = children.results.get('projection')
-            result = INST_PROJ_a(iset=iset[0], projection=None if not p else p[0])
+            o = children.results.get('op_chain')
+            op_chain = None if not o else o[0]
+            result = INST_PROJ_a(iset=iset[0], projection=None if not p else p[0], op_chain=op_chain)
             _logger.info(f"  > {result}")
             return result
-            # TODO: include opchain if supplied
 
         result = children[:]
         _logger.info(f"  > {result}")

{scrall-0.11.0.dist-info → scrall-0.12.1.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: scrall
-Version: 0.11.0
+Version: 0.12.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.12.1.dist-info/RECORD

@@ -0,0 +1,14 @@
+scrall/__init__.py,sha256=46AO7FUUt7ALSxbUOIm_4PrXWE0XYSOLT3oJtb3rBAY,18
+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=s0eRBLkqmxx5c5kgVfS9o6hGORdnmcCQ4t11xPWNEo8,7912
+scrall/parse/visitor.py,sha256=Tn_WCFw9_aS3slJXWhWouYuC4EekeXruHx9kUpr81_E,58591
+scrall-0.12.1.dist-info/licenses/LICENSE,sha256=kL0xVrwl2i3Pk9mQXAVAPANCTaLGGOsoXgvqW7TBs20,1072
+scrall-0.12.1.dist-info/METADATA,sha256=mT-SUQuQoTcRYtUbWc1D8xNnMkoHFIR25T8Z6SmMc4k,7209
+scrall-0.12.1.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+scrall-0.12.1.dist-info/entry_points.txt,sha256=2fHG6VXtqSTEZXadsBe7XCFaLm4t3V1pFuqzgWWjBgA,48
+scrall-0.12.1.dist-info/top_level.txt,sha256=SWvpMyNNJlrMWpSsK5RUL40ivQxQpKPbL86VrvNIUAE,7
+scrall-0.12.1.dist-info/RECORD,,

scrall-0.11.0.dist-info/RECORD

@@ -1,14 +0,0 @@
-scrall/__init__.py,sha256=Zlq30UhOiC7zQJvZcBhTgE3ZcYH1hpT6kjFn1fJiOL4,18
-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=KT2jTK1wTYn6afcXXaKvFgghtbwzQ7wntNPA3cGwSPY,7904
-scrall/parse/visitor.py,sha256=wC9qIADxep_24NM90eFyMvCmKLUoitdfqff7HHNjDvM,58515
-scrall-0.11.0.dist-info/licenses/LICENSE,sha256=kL0xVrwl2i3Pk9mQXAVAPANCTaLGGOsoXgvqW7TBs20,1072
-scrall-0.11.0.dist-info/METADATA,sha256=YctIFwtG6wxzB94LUPNoYmgNpXHc1RbOyi3pW-N_2IA,7209
-scrall-0.11.0.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-scrall-0.11.0.dist-info/entry_points.txt,sha256=2fHG6VXtqSTEZXadsBe7XCFaLm4t3V1pFuqzgWWjBgA,48
-scrall-0.11.0.dist-info/top_level.txt,sha256=SWvpMyNNJlrMWpSsK5RUL40ivQxQpKPbL86VrvNIUAE,7
-scrall-0.11.0.dist-info/RECORD,,