scrall 0.8.1__tar.gz → 0.8.2__tar.gz

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

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

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

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

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

@@ -68,6 +68,7 @@ def main():
         fpath = Path(args.file)
         d = args.debug
         result = ScrallParser.parse_file(file_input=fpath, debug=d)
+        pass
 
     # logger.info("No problemo")  # We didn't die on an exception, basically
     print("\nNo problemo")

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

@@ -43,9 +43,9 @@ rename_attr = RENAME SP* name
 RENAME = '>>'
 
 // Decision action
-decision = scalar_expr SP* true_result false_result? // Control flow version of an if-then
-true_result = DECISION_OP SP* component_statement_set
-false_result = (LINEWRAP* / SP*) FALSE_RESULT_OP SP* component_statement_set // Else
+decision = scalar_expr true_result false_result?
+true_result = DECISION_OP LINEWRAP? SP? component_statement_set
+false_result = SP FALSE_RESULT_OP LINEWRAP? SP? component_statement_set // Else
 FALSE_RESULT_OP = ':'
 
 // Switch action
@@ -58,11 +58,11 @@ enum_value = '_' name // Scalar switch has enum value cases
 DECISION_OP = '?'
 
 // Signal action
-signal_action = signal_spec SP+ (signal_dest / ee_dest)
-signal = signal_spec SP+ (signal_dest / ee_dest)
+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)?
-ee_dest = ASYNCH SP* name
+signal_dest = SIGNAL_OP LINEWRAP? SP? instance_set assigner_partition? (SP+ delay)?
+ee_dest = ASYNCH LINEWRAP? SP? name
 delay = DELAY_OP SP* scalar_expr
 assigner_partition = '|' instance_set
 DELAY_OP = '@'
@@ -110,16 +110,16 @@ attr_init = '(' SP* (attr_value_init (',' SP+ attr_value_init)* SP*)? ')' // all
 attr_value_init = (name SP? ':' SP+ scalar_expr )*
 update_ref = (instance_set SP+)? to_ref // relate or unrelated to me or explicit instance_set
 to_ref = '&' rnum SP+ instance_set (',' SP+ instance_set)? // non-associative or associative reference
-delete = '!*' SP* instance_set (',' SP+ instance_set) // supports multi-delete transaction
+delete = '!*' SP* instance_set (',' SP+ instance_set)* // supports multi-delete transaction
 
 // Scalar call
 //scalar_call = scalar_expr
 
 // math and boolean operator precedence
-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_assignment = scalar_output_set SP* SCALAR_ASSIGN SP* scalar_expr projection? (',' SP* scalar_expr projection?)*
+scalar_output_set = flow_output (',' SP+ flow_output)*
 flow_output = name (TYPE_ASSIGN name)?
-projection = '.' (name / '(' ( (ALL / (name (',' SP+ name)*) )? ')'))
+projection = '.' (name / '(' ( (ALL / (name (',' SP+ name)*) )? ')')) // TODO: Why is empty () ok in projection?
 ALL = '*'
 
 scalar_expr = SP* scalar_logical_or SP*

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

@@ -645,23 +645,34 @@ class ScrallVisitor(PTNodeVisitor):
     def visit_signal_action(cls, node, children):
         """
         """
-        _logger.info("signal = signal_spec (signal_dest / ee_dest)")
+        _logger.info("signal_action = signal_spec SP+ (signal_dest / ee_dest / SIGNAL_OP)")
         _logger.info(f'  :: {node.value}')
 
         _logger.info(f"  < {children}")
         sdest = children.results.get('signal_dest')
-        if sdest:
+        eedest = children.results.get('ee_dest')
+        if not sdest and not eedest:
+            # Dest should be supplied by false result in decision
+            result = Signal_a(
+                event=children[0]['name'],
+                supplied_params=children[0]['params'],
+                dest=None
+            )
+        elif sdest:
+            # Signal instance set or assigner destination
             result = Signal_a(
                 event=children[0]['name'],
                 supplied_params=children[0]['params'],
                 dest=children[1]
             )
         else:
+            # Otherwise it must be an EE destination
             result = EE_Signal_a(
                 event=children[0]['name'],
                 supplied_params=children[0]['params'],
                 ee=children[1]
             )
+
         _logger.info(f"  > {result}")
         return result
 
@@ -694,7 +705,7 @@ class ScrallVisitor(PTNodeVisitor):
     def visit_signal_dest(cls, node, children):
         """
         """
-        _logger.info("signal_dest = SIGNAL_OP instance_set assigner_partition? delay?")
+        _logger.info("signal_action = signal_spec SP+ (signal_dest / ee_dest / SIGNAL_OP / ASYNCH)")
         _logger.info(f'  :: {node.value}')
 
         _logger.info(f"  < {children}")
@@ -703,7 +714,7 @@ class ScrallVisitor(PTNodeVisitor):
         ap = None if not ap else ap[0]
         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_partition=N_a(ap), delay=delay)
         _logger.info(f"  > {result}")
         return result
 

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

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

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