scrall 0.7.0__py3-none-any.whl → 0.8.1__py3-none-any.whl

scrall/__init__.py

@@ -1 +1 @@
-version = "0.7.0"
+version = "0.8.1"

scrall/parse/scrall.peg

@@ -92,10 +92,11 @@ OUTPUT = '=>>'
 
 // Instance set
 instance_set =  new_instance / ((operation / name / path) (reflexive_selection / selection / operation / path)*)
-selection = '(' SP* select_phrase SP* ')'
-select_phrase = (CARD RANKR? ',' SP* scalar_expr) / CARD / scalar_expr
+selection = '(' SP* (rank_selection / criteria_selection) SP* ')'
+rank_selection = CARD ', ' SP* RANKR name
+criteria_selection = (CARD ', ' SP* scalar_expr) / CARD / scalar_expr
 CARD = '1' / '*'
-RANKR = '<' / '>'
+RANKR = '^+' / '^-'
 IN = '^'
 TRUE = 'TRUE'
 FALSE = 'FALSE'

scrall/parse/visitor.py

@@ -16,7 +16,8 @@ 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 rankr criteria')
+Rank_Selection_a = namedtuple('Rank_Selection_a', 'card rankr attr')
+Criteria_Selection_a = namedtuple('Criteria_Selection_a', 'card 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')
@@ -72,7 +73,8 @@ Migration_a = namedtuple('Migration_a','from_inst to_subclass')
 Rank_a = namedtuple('Rank_a', "card extent")
 
 
-rank_symbol = {'>': "greatest", '<': "least"}
+rank_symbol = {'^+': "greatest", '^-': "least"}
+card_symbol = {'1':'ONE', '*':'ALL'}
 
 table_op = {
     '^': 'INTERSECT',
@@ -441,7 +443,7 @@ class ScrallVisitor(PTNodeVisitor):
             if type(table).__name__ == 'INST_a':
                 last_comp = table.components[-1]
 
-            if last_comp and type(last_comp).__name__ == 'Selection_a':
+            if last_comp and type(last_comp).__name__ == 'Criteria_Selection_a':
                 if s:
                     # We have two selection phrases. The first is terminating the instance set and the second is
                     # picked up as 's' above. We will take the first one and ignore the second,
@@ -916,22 +918,41 @@ class ScrallVisitor(PTNodeVisitor):
         return result
 
     @classmethod
-    def visit_select_phrase(cls, node, children):
+    def visit_rank_selection(cls, node, children):
         """
-        (CARD RANKR? ',' SP* scalar_expr) / CARD / RANKR? scalar_expr
+        CARD ', ' SP* RANKR name
         """
-        _logger.info(f"{node.rule_name} = (CARD ',' SP* scalar_expr) / CARD / scalar_expr")
+        _logger.info(f"{node.rule_name} = CARD ', ' SP* RANKR name")
+        _logger.info(f">> {[k for k in children.results.keys()]}")
+        _logger.info(f'  :: {node.value}')
+
+        _logger.info(f"  < {children}")
+        card_parse = children.results['CARD'][0]
+        card = card_symbol[card_parse]
+        attr_parse = children.results['name'][0]
+        attr = attr_parse.name
+        rankr_parse = children.results['RANKR']
+        rankr = rank_symbol[rankr_parse[0]]
+        result = Rank_Selection_a(card=card, rankr=rankr, attr=attr)
+        _logger.info(f"  > {result}")
+        return result
+
+    @classmethod
+    def visit_criteria_selection(cls, node, children):
+        """
+        (CARD ', ' SP* scalar_expr) / CARD / 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()]}")
         _logger.info(f'  :: {node.value}')
 
         _logger.info(f"  < {children}")
         explicit_card = children.results.get('CARD')
-        card = '*' if not explicit_card else explicit_card[0]
+        card_parse = '*' if not explicit_card else explicit_card[0]
+        card = card_symbol[card_parse]
         criteria = children.results.get('scalar_expr')
-        rankr = children.results.get('RANKR')
-        rankr_parse = rank_symbol[rankr[0]] if rankr else None  # assign greatest or least
         if criteria:
-            result = Selection_a(card=card, rankr=rankr_parse, criteria=criteria[0])
+            result = Criteria_Selection_a(card=card, criteria=criteria[0])
         else:
             result = [card]
         _logger.info(f"  > {result}")

{scrall-0.7.0.dist-info → scrall-0.8.1.dist-info}/METADATA

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

@@ -0,0 +1,14 @@
+scrall/__init__.py,sha256=F8yK0zpmobQYrGifLZrnTOgdche7N90s0ylEBIq-eyI,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=5qaAjASvWVsOjKxXnEh63OrEnNOL9QXdxfME0dwcvgM,7672
+scrall/parse/visitor.py,sha256=hlcabsgc3K5qxntye2tbrDr4BfFeJJSoIDHSe4Nq0rg,55548
+scrall-0.8.1.dist-info/licenses/LICENSE,sha256=kL0xVrwl2i3Pk9mQXAVAPANCTaLGGOsoXgvqW7TBs20,1072
+scrall-0.8.1.dist-info/METADATA,sha256=o_8sWBElYyBIfdRPBqFXjWkj-tODulvYA5eWTng0aTw,7208
+scrall-0.8.1.dist-info/WHEEL,sha256=zaaOINJESkSfm_4HQVc5ssNzHCPXhJm0kEUakpsEHaU,91
+scrall-0.8.1.dist-info/entry_points.txt,sha256=2fHG6VXtqSTEZXadsBe7XCFaLm4t3V1pFuqzgWWjBgA,48
+scrall-0.8.1.dist-info/top_level.txt,sha256=SWvpMyNNJlrMWpSsK5RUL40ivQxQpKPbL86VrvNIUAE,7
+scrall-0.8.1.dist-info/RECORD,,

scrall-0.7.0.dist-info/RECORD

@@ -1,14 +0,0 @@
-scrall/__init__.py,sha256=eMM1qiVgCAbooyX_s4EBP8LMyZO3wVeNG4NHWlR2mYo,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=8faLDiuYy-qQV0OOzCK7YWOP6ohnnqGsdYvzU4o-y84,7605
-scrall/parse/visitor.py,sha256=fWkrbaPzqKTWVeDhpAINaqOG_2KjcWuw1s-Lexr1cwg,54793
-scrall-0.7.0.dist-info/licenses/LICENSE,sha256=kL0xVrwl2i3Pk9mQXAVAPANCTaLGGOsoXgvqW7TBs20,1072
-scrall-0.7.0.dist-info/METADATA,sha256=6KVpHn57q5ljNaA8QBthJjQZCYLB7js2AaTVDCF6eAU,7208
-scrall-0.7.0.dist-info/WHEEL,sha256=zaaOINJESkSfm_4HQVc5ssNzHCPXhJm0kEUakpsEHaU,91
-scrall-0.7.0.dist-info/entry_points.txt,sha256=2fHG6VXtqSTEZXadsBe7XCFaLm4t3V1pFuqzgWWjBgA,48
-scrall-0.7.0.dist-info/top_level.txt,sha256=SWvpMyNNJlrMWpSsK5RUL40ivQxQpKPbL86VrvNIUAE,7
-scrall-0.7.0.dist-info/RECORD,,