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

scrall/__init__.py

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

scrall/parse/visitor.py

@@ -74,6 +74,7 @@ Rank_a = namedtuple('Rank_a', "card extent")
 
 
 rank_symbol = {'^+': "greatest", '^-': "least"}
+card_symbol = {'1':'ONE', '*':'ALL'}
 
 table_op = {
     '^': 'INTERSECT',
@@ -926,11 +927,13 @@ class ScrallVisitor(PTNodeVisitor):
         _logger.info(f'  :: {node.value}')
 
         _logger.info(f"  < {children}")
-        card = children.results.get('CARD')[0]
-        attr = children.results.get('name')
-        rankr = children.results.get('RANKR')
-        rankr_parse = rank_symbol[rankr[0]]
-        result = Rank_Selection_a(card=card, rankr=rankr_parse, attr=attr)
+        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
 
@@ -945,7 +948,8 @@ class ScrallVisitor(PTNodeVisitor):
 
         _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')
         if criteria:
             result = Criteria_Selection_a(card=card, criteria=criteria[0])

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

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

@@ -1,14 +1,14 @@
-scrall/__init__.py,sha256=Xa5Ugzgk02aJpYFNzZussKTPoB7_TI6yxPt6r3mRqRM,17
+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=gcecbvpBDsa6scbQv21rJZdsDrwOC83yKR3wtyNhiKs,55393
-scrall-0.8.0.dist-info/licenses/LICENSE,sha256=kL0xVrwl2i3Pk9mQXAVAPANCTaLGGOsoXgvqW7TBs20,1072
-scrall-0.8.0.dist-info/METADATA,sha256=OKiv09J24672gTi7KKxflBiJ72dcm8YmDH0ydXfqid4,7208
-scrall-0.8.0.dist-info/WHEEL,sha256=zaaOINJESkSfm_4HQVc5ssNzHCPXhJm0kEUakpsEHaU,91
-scrall-0.8.0.dist-info/entry_points.txt,sha256=2fHG6VXtqSTEZXadsBe7XCFaLm4t3V1pFuqzgWWjBgA,48
-scrall-0.8.0.dist-info/top_level.txt,sha256=SWvpMyNNJlrMWpSsK5RUL40ivQxQpKPbL86VrvNIUAE,7
-scrall-0.8.0.dist-info/RECORD,,
+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,,