scrall 0.8.7__py3-none-any.whl → 0.8.9__py3-none-any.whl

scrall/__init__.py

@@ -1 +1 @@
-version = "0.8.7"
+version = "0.8.9"

scrall/parse/scrall.peg

@@ -61,10 +61,11 @@ DECISION_OP = '?'
 signal_action = signal_spec SP+ (signal_dest / ee_dest / SIGNAL_OP / ASYNCH)
 // SIGNAL_OP only destination means: copy dest from false result of decision action
 signal_spec = name supplied_params?
-signal_dest = SIGNAL_OP LINEWRAP? SP? instance_set assigner_partition? (SP+ delay)?
+signal_dest = SIGNAL_OP LINEWRAP? SP? (assigner / instance_set) (SP+ delay)?
+assigner = rnum assigner_partition?
 ee_dest = ASYNCH LINEWRAP? SP? name
 delay = DELAY_OP SP* scalar_expr
-assigner_partition = '|' instance_set
+assigner_partition = '( ' instance_set ' )'
 DELAY_OP = '@'
 SIGNAL_OP = '->'
 ASYNCH = '=>'
@@ -91,7 +92,7 @@ output_flow = OUTPUT SP+ scalar_expr
 OUTPUT = '=>>'
 
 // Instance set
-instance_set =  new_instance / ((operation / name / path) (reflexive_selection / selection / operation / path)*)
+instance_set =  new_instance / ((operation / input_param / name / path) (reflexive_selection / selection / operation / path)*)
 selection = '(' SP* (rank_selection / criteria_selection) SP* ')'
 rank_selection = CARD ', ' SP* RANKR name
 criteria_selection = (CARD ', ' SP* scalar_expr) / CARD / scalar_expr

scrall/parse/visitor.py

@@ -22,8 +22,9 @@ Inst_Assignment_a = namedtuple('Inst_Assignment_a', 'lhs card rhs X')
 EE_Signal_a = namedtuple('EE_Signal_a', 'event supplied_params ee')
 Signal_a = namedtuple('Signal_a', 'event supplied_params dest')
 """Signal sent to trigger event at destination with optional supplied parameters"""
-Signal_Action_a = namedtuple('Signal_Action_a', 'event supplied_params dest delay assigner_partition')
-Signal_Dest_a = namedtuple('Signal_Dest_a', 'target_iset assigner_partition delay')
+Signal_Action_a = namedtuple('Signal_Action_a', 'event supplied_params dest delay')
+Signal_Dest_a = namedtuple('Signal_Dest_a', 'target_iset assigner_dest delay')
+Assigner_Dest_a = namedtuple('Assigner_Dest_a', 'rnum partition')
 Signal_Choice_a = namedtuple('Signal_Choice_a', 'decision true_signal false_signal')
 Sequence_Token_a = namedtuple('Sequence_Token_a', 'name')
 Execution_Unit_a = namedtuple('Execution_Unit_a', 'statement_set output_token')
@@ -706,16 +707,32 @@ class ScrallVisitor(PTNodeVisitor):
     def visit_signal_dest(cls, node, children):
         """
         """
-        _logger.info("signal_action = signal_spec SP+ (signal_dest / ee_dest / SIGNAL_OP / ASYNCH)")
+        _logger.info("signal_dest = SIGNAL_OP LINEWRAP? SP? (assigner / instance_set) (SP+ delay)?")
         _logger.info(f'  :: {node.value}')
 
         _logger.info(f"  < {children}")
-        iset = children[0]
-        ap = children.results.get('assigner_partition')
-        ap = None if not ap else ap[0]
+        iset = children.results.get('instance_set')
+        iset = iset[0] if iset else None
+        assigner = children.results.get('assigner')
+        assigner = assigner[0] if assigner else None
         delay = children.results.get('delay')
         delay = 0 if not delay else delay[0]
-        result = Signal_Dest_a(target_iset=iset, assigner_partition=N_a(ap), delay=delay)
+        result = Signal_Dest_a(target_iset=iset, assigner_dest=assigner, delay=delay)
+        _logger.info(f"  > {result}")
+        return result
+
+    @classmethod
+    def visit_assigner(cls, node, children):
+        """
+        An instance set that partitions an assigner
+        """
+        _logger.info("assigner = rnum assigner_partition?")
+        _logger.info(f'  :: {node.value}')
+
+        _logger.info(f"  < {children}")
+        rnum = children.results.get('rnum')
+        ap = children.results.get('assigner_partition')
+        result = Assigner_Dest_a(rnum=rnum[0], partition=ap[0] if ap else None)
         _logger.info(f"  > {result}")
         return result
 
@@ -724,7 +741,7 @@ class ScrallVisitor(PTNodeVisitor):
         """
         An instance set that partitions an assigner
         """
-        _logger.info("assigner_partition = '(' instance_set ')'")
+        _logger.info("assigner_partition = '( ' instance_set ' )'")
         _logger.info(f'  :: {node.value}')
 
         _logger.info(f"  < {children}")
@@ -916,7 +933,7 @@ class ScrallVisitor(PTNodeVisitor):
         by any sequence of selection, operation, and paths. The parser won't find two paths in sequence since
         any encounter path will be fully consumed
         """
-        _logger.info("instance_set = new_instance / ((operation / prefix_name / path) (reflexive_selection / "
+        _logger.info("instance_set = new_instance / ((operation / input_param / name / path) (reflexive_selection / "
                      "selection / operation / path)*)")
         _logger.info(f">> {[k for k in children.results.keys()]}")
         _logger.info(f'  :: {node.value}')
@@ -925,7 +942,12 @@ class ScrallVisitor(PTNodeVisitor):
         if len(children) == 1 and isinstance(children[0], N_a):
             result = children[0]
         else:
-            result = INST_a(children)
+            p = children.results.get('input_param')
+            if p:
+                # Just like above case, but returning an IN_a (parameter name)
+                result = p[0]
+            else:
+                result = INST_a(children)
         _logger.info(f"  > {result}")
         return result
 

{scrall-0.8.7.dist-info → scrall-0.8.9.dist-info}/METADATA

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

@@ -0,0 +1,14 @@
+scrall/__init__.py,sha256=2l8zNYYLY80JtW1elN49pPxbG8Jx7EQy0n3sAYKRqbw,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=Oe7E61fUBH0pvvuYJXHUeYMHn2mGouXmqQurKGMAFCg,7836
+scrall/parse/visitor.py,sha256=gbK0l8TWUOWIQRY2Pk3f1mYhqInUKZ3TlfB4LL-vaOo,57228
+scrall-0.8.9.dist-info/licenses/LICENSE,sha256=kL0xVrwl2i3Pk9mQXAVAPANCTaLGGOsoXgvqW7TBs20,1072
+scrall-0.8.9.dist-info/METADATA,sha256=11YfNZFbNJgrAMiOiFHImV_PemWKmJOGaShjDdNSKHk,7208
+scrall-0.8.9.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+scrall-0.8.9.dist-info/entry_points.txt,sha256=2fHG6VXtqSTEZXadsBe7XCFaLm4t3V1pFuqzgWWjBgA,48
+scrall-0.8.9.dist-info/top_level.txt,sha256=SWvpMyNNJlrMWpSsK5RUL40ivQxQpKPbL86VrvNIUAE,7
+scrall-0.8.9.dist-info/RECORD,,

scrall-0.8.7.dist-info/RECORD

@@ -1,14 +0,0 @@
-scrall/__init__.py,sha256=Ci6PjXpA6dMGYr_yysZyYqKPPelOlKghe4xjCwvDkfo,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=xQ30TZTSHS3h0wHEqjknUmBWBHG6rGFZfUl9QGspoLw,56381
-scrall-0.8.7.dist-info/licenses/LICENSE,sha256=kL0xVrwl2i3Pk9mQXAVAPANCTaLGGOsoXgvqW7TBs20,1072
-scrall-0.8.7.dist-info/METADATA,sha256=sSxzPLwxIvUop4bcne_vZZFliDM6c9qkU-3RCxSPTOA,7208
-scrall-0.8.7.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-scrall-0.8.7.dist-info/entry_points.txt,sha256=2fHG6VXtqSTEZXadsBe7XCFaLm4t3V1pFuqzgWWjBgA,48
-scrall-0.8.7.dist-info/top_level.txt,sha256=SWvpMyNNJlrMWpSsK5RUL40ivQxQpKPbL86VrvNIUAE,7
-scrall-0.8.7.dist-info/RECORD,,