scrall 0.6.1__py3-none-any.whl → 0.6.2__py3-none-any.whl

scrall/__init__.py

@@ -1 +1 @@
-version = "0.6.1"
+version = "0.6.2"

scrall/parse/scrall.peg

@@ -75,7 +75,7 @@ INST_ASSIGN = '.=' / '..='
 
 // Synchronous call action (method or ee operation)
 call = instance_set op_chain? // Post-parse verify that last element is an operation, otherwise invalid call
-operation = ORDER? owner? '.' name supplied_params
+operation = owner? '.' name supplied_params
 owner = name
 supplied_params = '(' SP* (param (',' SP+ param)*)? SP* ')'
 param = (name SP* ':' SP*)? scalar_expr // Comma above keeps scalar_expr from grabbing next param
@@ -91,9 +91,9 @@ output_flow = OUTPUT SP+ scalar_expr
 OUTPUT = '=>>'
 
 // Instance set
-instance_set =  new_instance / ((operation / prefix_name / path) (reflexive_selection / selection / operation / path)*)
+instance_set =  new_instance / ((operation / name / path) (reflexive_selection / selection / operation / path)*)
 selection = '(' SP* select_phrase SP* ')'
-select_phrase = (CARD ',' SP* scalar_expr) / CARD / scalar_expr
+select_phrase = (CARD ',' SP* ORDER? scalar_expr) / CARD / ORDER? scalar_expr
 CARD = '1' / '*'
 ORDER = '^+' / '^-'
 IN = '^'
@@ -136,7 +136,6 @@ scalar_chain = (ITS op_chain) / ((scalar_source / instance_set projection?) op_c
 scalar_source = type_selector / input_param
 op_chain = ('.' (scalar_op / name))*
 value = TRUE / FALSE / enum_value
-prefix_name = ORDER? name
 scalar_op = name supplied_params
 
 // name of type and name of value selected

scrall/parse/visitor.py

@@ -10,13 +10,13 @@ _logger = logging.getLogger(__name__)
 # and return in the visit result.
 Supplied_Parameter_a = namedtuple('Supplied_Parameter_a', 'pname sval')
 """Parameter name and flow name pair for a set of supplied parameters"""
-Op_a = namedtuple('Op_a', 'owner op_name supplied_params order')
+Op_a = namedtuple('Op_a', 'owner op_name supplied_params')
 Scalar_op_a = namedtuple('Scalar_op_a', 'name supplied_params')
 Call_a = namedtuple('Call_a', 'call op_chain')
 Scalar_Call_a = namedtuple('Scalar_Call_a', 'call')
 """The subject of a call could be an instance set (method) or an external entity (ee operation)"""
 Attr_Access_a = namedtuple('Attr_Access_a', 'cname its attr')
-Selection_a = namedtuple('Selection_a', 'card criteria')
+Selection_a = namedtuple('Selection_a', 'card order criteria')
 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')
@@ -792,6 +792,8 @@ class ScrallVisitor(PTNodeVisitor):
     @classmethod
     def visit_operation(cls, node, children):
         """
+        owner? '.' name supplied_params
+
         The results of an operation can be ordered ascending, descending
         The operation is invoked on the owner which may or may not be explicitly named
         If the owner is implicit, it could be 'ME' (the executing instance) or an operation on a type
@@ -804,13 +806,12 @@ class ScrallVisitor(PTNodeVisitor):
 
         _logger.info(f"  < {children}")
         owner = children.results.get('owner')
-        o = children.results.get('ORDER')
         p = children.results.get('supplied_params')
         result = Op_a(
             owner='implicit' if not owner else owner[0],
             op_name=children.results['name'][0].name,
-            supplied_params=[] if not p else p[0],
-            order=None if not o else symbol[o[0]]
+            supplied_params=[] if not p else p[0]
+            # order=None if not o else symbol[o[0]]
         )
         _logger.info(f"  > {result}")
         return result
@@ -914,21 +915,10 @@ class ScrallVisitor(PTNodeVisitor):
         _logger.info(f"  > {result}")
         return result
 
-    @classmethod
-    def visit_selection(cls, node, children):
-        """
-        """
-        _logger.info("selection = '(' select_phrase ')'")
-        _logger.info(f'  :: {node.value}')
-
-        _logger.info(f"  < {children}")
-        result = Selection_a(card=children[0][0], criteria=None if len(children[0]) < 2 else children[0][1])
-        _logger.info(f"  > {result}")
-        return result
-
     @classmethod
     def visit_select_phrase(cls, node, children):
         """
+        (CARD ',' SP* ORDER? scalar_expr) / CARD / ORDER? scalar_expr
         """
         _logger.info(f"{node.rule_name} = (CARD ',' SP* scalar_expr) / CARD / scalar_expr")
         _logger.info(f">> {[k for k in children.results.keys()]}")
@@ -938,8 +928,10 @@ class ScrallVisitor(PTNodeVisitor):
         explicit_card = children.results.get('CARD')
         card = '*' if not explicit_card else explicit_card[0]
         criteria = children.results.get('scalar_expr')
+        o = children.results.get('ORDER')
+        o = symbol[o[0]] if o else None
         if criteria:
-            result = [card, criteria[0]]
+            result = Selection_a(card=card, criteria=criteria[0], order=o)
         else:
             result = [card]
         _logger.info(f"  > {result}")
@@ -1423,22 +1415,22 @@ class ScrallVisitor(PTNodeVisitor):
         _logger.info(f"  > {result}")
         return result
 
-    @classmethod
-    def visit_prefix_name(cls, node, children):
-        """
-        """
-        _logger.info("prefix_name = ORDER? name")
-        _logger.info(f'  :: {node.value}')
-
-        _logger.info(f"  < {children}")
-        n = children.results['name'][0]
-        o = children.results.get('ORDER')
-        if o:
-            result = Order_name_a(order=symbol[o[0]], name=n)
-        else:
-            result = n
-        _logger.info(f"  > {result}")
-        return result
+    # @classmethod
+    # def visit_prefix_name(cls, node, children):
+    #     """
+    #     """
+    #     _logger.info("prefix_name = ORDER? name")
+    #     _logger.info(f'  :: {node.value}')
+    #
+    #     _logger.info(f"  < {children}")
+    #     n = children.results['name'][0]
+    #     o = children.results.get('ORDER')
+    #     if o:
+    #         result = Order_name_a(order=symbol[o[0]], name=n)
+    #     else:
+    #         result = n
+    #     _logger.info(f"  > {result}")
+    #     return result
 
     @classmethod
     def visit_scalar_op(cls, node, children):

{scrall-0.6.1.dist-info → scrall-0.6.2.dist-info}/METADATA

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

@@ -0,0 +1,14 @@
+scrall/__init__.py,sha256=fmzFeKnpl-IB3zWx_mBF05rLkVLMGL3qWsB1Khp7Bng,17
+scrall/__main__.py,sha256=hyBcYLATx0XghUUnrKQQgDQ8PicczmBnXgBAx92ltB4,2161
+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=AimiudnxiMl1ZPdKA0F5LMigndakwLCBxCqN5ejgcRI,7614
+scrall/parse/visitor.py,sha256=PJCN3zd57Sx9CSnYZvC14fKpHd6mfaiYTwCV6y0pzl0,55259
+scrall-0.6.2.dist-info/licenses/LICENSE,sha256=kL0xVrwl2i3Pk9mQXAVAPANCTaLGGOsoXgvqW7TBs20,1072
+scrall-0.6.2.dist-info/METADATA,sha256=JKGmUA24xItsYmPWNY6XORQ9-DOs6jNiVGrQYA5_7xk,7208
+scrall-0.6.2.dist-info/WHEEL,sha256=zaaOINJESkSfm_4HQVc5ssNzHCPXhJm0kEUakpsEHaU,91
+scrall-0.6.2.dist-info/entry_points.txt,sha256=2fHG6VXtqSTEZXadsBe7XCFaLm4t3V1pFuqzgWWjBgA,48
+scrall-0.6.2.dist-info/top_level.txt,sha256=SWvpMyNNJlrMWpSsK5RUL40ivQxQpKPbL86VrvNIUAE,7
+scrall-0.6.2.dist-info/RECORD,,

{scrall-0.6.1.dist-info → scrall-0.6.2.dist-info}/WHEEL

@@ -1,5 +1,5 @@
 Wheel-Version: 1.0
-Generator: setuptools (79.0.1)
+Generator: setuptools (80.8.0)
 Root-Is-Purelib: true
 Tag: py3-none-any
 

scrall-0.6.1.dist-info/RECORD

@@ -1,14 +0,0 @@
-scrall/__init__.py,sha256=alLEMEr4ac6GYMcaCSbGl0sZCPgwmYRlRBjrToos_uI,17
-scrall/__main__.py,sha256=hyBcYLATx0XghUUnrKQQgDQ8PicczmBnXgBAx92ltB4,2161
-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=5JqwBAta8O7AR6ORBb9ZewTX_wohpF7vgY8yNqLEhuE,7640
-scrall/parse/visitor.py,sha256=gtEJpGG9JYTg4EwQ-S8He_09vYbmD1PerrpArfFWHTg,55437
-scrall-0.6.1.dist-info/licenses/LICENSE,sha256=kL0xVrwl2i3Pk9mQXAVAPANCTaLGGOsoXgvqW7TBs20,1072
-scrall-0.6.1.dist-info/METADATA,sha256=tjo8UlsS2Fi8cyIHQMHvEAxiknXosarToCU_50Tu9wI,7208
-scrall-0.6.1.dist-info/WHEEL,sha256=SmOxYU7pzNKBqASvQJ7DjX3XGUF92lrGhMb3R6_iiqI,91
-scrall-0.6.1.dist-info/entry_points.txt,sha256=2fHG6VXtqSTEZXadsBe7XCFaLm4t3V1pFuqzgWWjBgA,48
-scrall-0.6.1.dist-info/top_level.txt,sha256=SWvpMyNNJlrMWpSsK5RUL40ivQxQpKPbL86VrvNIUAE,7
-scrall-0.6.1.dist-info/RECORD,,