scrall 0.4.0__tar.gz → 0.4.1__tar.gz

{scrall-0.4.0/src/scrall.egg-info → scrall-0.4.1}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: scrall
-Version: 0.4.0
+Version: 0.4.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.4.0 → scrall-0.4.1}/pyproject.toml

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

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

{scrall-0.4.0 → scrall-0.4.1}/src/scrall/parse/visitor.py

@@ -1228,8 +1228,8 @@ class ScrallVisitor(PTNodeVisitor):
             result = children[0]
         else:
             # Convert ':' to '==' if found
-            eq_map = ['==' if e in ('==',':') else '!=' for e in children.results['EQUAL']]
-            result = BOOL_a(eq_map, children.results['comparison'])
+            eq_op = '==' if children.results['EQUAL'][0] == ':' else children.results['EQUAL'][0]
+            result = BOOL_a(eq_op, children.results['comparison'])
 
         if children[0] != result:
             _logger.info(f"{node.rule_name} = comparison (EQUAL comparison)*")

{scrall-0.4.0 → scrall-0.4.1/src/scrall.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: scrall
-Version: 0.4.0
+Version: 0.4.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.4.0 → scrall-0.4.1}/tests/test_ping_actions.py

@@ -81,14 +81,14 @@ actions = [
             statement=Inst_Assignment_a(
                 lhs=Flow_Output_a(name=N_a(name='requested stops'), exp_type=None), card='M',
                 rhs=INST_a(components=[N_a(name='shaft aslevs'), Selection_a(card='*',
-                             criteria=BOOL_a(op=['=='], operands=[N_a(name='Stop requested'), N_a(name='avalue')]))]),
+                             criteria=BOOL_a(op='==', operands=[N_a(name='Stop requested'), N_a(name='avalue')]))]),
             X=(0, 58)), block=None), output_token=None)
      ),
     ("=>> Accessible Shaft Level( Floor: nearest dest.Floor; Shaft )",
         Output_Flow_a(output=
             INST_a(components=[N_a(name='Accessible Shaft Level'),
                  Selection_a(card='*', criteria=BOOL_a(op='AND', operands=[
-                                                     BOOL_a(op=['=='], operands=[
+                                                     BOOL_a(op='==', operands=[
                                                          N_a(name='Floor'),
                                                          INST_PROJ_a(iset=N_a(name='nearest dest'), projection=
                                                              Projection_a(expand=None, attrs=[N_a(name='Floor')]))]),

{scrall-0.4.0 → scrall-0.4.1}/tests/test_selection.py

@@ -36,7 +36,7 @@ actions = [
              statement=Inst_Assignment_a(
                  lhs=Flow_Output_a(name=N_a(name='s'), exp_type=None), card='M',
                  rhs=INST_a(components=[N_a(name='Shaft'), Selection_a(card='*',
-                        criteria=BOOL_a(op=['=='], operands=[N_a(name='In service'), 'true']))]),
+                        criteria=BOOL_a(op='==', operands=[N_a(name='In service'), 'true']))]),
              X=(0, 29)), block=None), output_token=None)
      ),
     ("s ..= Shaft(In service)",
@@ -52,7 +52,7 @@ actions = [
                   lhs=Flow_Output_a(name=N_a(name='x'), exp_type=None), card='1',
                   rhs=INST_a(components=[N_a(name='Bank'), Selection_a(card='*',
                       criteria=BOOL_a(op='OR', operands=[
-                          BOOL_a(op=['=='], operands=[
+                          BOOL_a(op='==', operands=[
                               N_a(name='Max close attempts'),
                               BOOL_a(op='OR', operands=[N_a(name='v'), N_a(name='x')])]),
                           BOOL_a(op='>', operands=[N_a(name='Average cabin speed'), N_a(name='mspeed')])]))]),
@@ -63,7 +63,7 @@ actions = [
               statement=Inst_Assignment_a(
                   lhs=Flow_Output_a(name=N_a(name='x'), exp_type=None), card='M',
                   rhs=INST_a(components=[Op_a(owner='car', op_name='findsome', supplied_params=[], order=None),
-                                         Selection_a(card='*', criteria=BOOL_a(op=['=='],
+                                         Selection_a(card='*', criteria=BOOL_a(op='==',
                                              operands=[N_a(name='color'), Enum_a(value=N_a(name='red'))]))]),
               X=(0, 33)), block=None), output_token=None)
      ),

scrall-0.4.0/src/scrall/__init__.py

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