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

scrall/__init__.py

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

scrall/__main__.py

@@ -4,11 +4,14 @@ __main__.py
 Scrall Parser
 """
 
+# System
 import logging
 import logging.config
 import sys
 import argparse
 from pathlib import Path
+
+# Scrall
 from scrall import version
 from scrall.parse.parser import ScrallParser
 
@@ -66,7 +69,7 @@ def main():
         d = args.debug
         result = ScrallParser.parse_file(file_input=fpath, debug=d)
 
-    logger.info("No problemo")  # We didn't die on an exception, basically
+    # logger.info("No problemo")  # We didn't die on an exception, basically
     print("\nNo problemo")
 
 

scrall/parse/scrall.peg

@@ -109,7 +109,7 @@ 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
+delete = '!*' SP* instance_set (',' SP+ instance_set) // supports multi-delete transaction
 
 // Scalar call
 //scalar_call = scalar_expr

scrall/parse/visitor.py

@@ -29,7 +29,7 @@ Execution_Unit_a = namedtuple('Execution_Unit_a', 'statement_set output_token')
 Seq_Statement_Set_a = namedtuple('Seq_Statement_Set_a', 'input_tokens statement block')
 Comp_Statement_Set_a = namedtuple('Comp_Statement_Set_a', 'statement block')
 Decision_a = namedtuple('Decision_a', 'input true_result false_result')
-Delete_Action_a = namedtuple('Delete_Action_a', 'instance_set')
+Delete_Action_a = namedtuple('Delete_Action_a', 'instance_sets')
 Case_a = namedtuple('Case_a', 'enums comp_statement_set')
 Switch_a = namedtuple('Switch_a', 'input_flow cases')
 MATH_a = namedtuple('MATH_a', 'op operands')
@@ -1045,13 +1045,14 @@ class ScrallVisitor(PTNodeVisitor):
     @classmethod
     def visit_delete(cls, node, children):
         """
+        '!*' SP* instance_set (',' SP+ instance_set)
         """
-        _logger.info("delete = '!*' instance_set")
+        _logger.info("delete = '!*' SP* instance_set (',' SP+ instance_set)")
         _logger.info(f'  :: {node.value}')
 
         _logger.info(f"  < {children}")
         iset = children.results.get('instance_set')
-        result = Delete_Action_a(instance_set=iset)
+        result = Delete_Action_a(instance_sets=iset)
         _logger.info(f"  > {result}")
         return result
 

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

@@ -1,6 +1,6 @@
-Metadata-Version: 2.1
+Metadata-Version: 2.4
 Name: scrall
-Version: 0.6.0
+Version: 0.6.1
 Summary: Starr's Concise Relational Action Language - For Shlaer-Mellor Executable UML
 Author-email: Leon Starr <leon_starr@modelint.com>
 License: MIT License
@@ -35,13 +35,14 @@ Requires-Python: >=3.10
 Description-Content-Type: text/markdown
 License-File: LICENSE
 Requires-Dist: Arpeggio
-Requires-Dist: tomli ; python_version < "3.11"
+Requires-Dist: tomli; python_version < "3.11"
 Provides-Extra: build
-Requires-Dist: build ; extra == 'build'
-Requires-Dist: twine ; extra == 'build'
+Requires-Dist: build; extra == "build"
+Requires-Dist: twine; extra == "build"
 Provides-Extra: dev
-Requires-Dist: bump2version ; extra == 'dev'
-Requires-Dist: pytest ; extra == 'dev'
+Requires-Dist: bump2version; extra == "dev"
+Requires-Dist: pytest; extra == "dev"
+Dynamic: license-file
 
 # Scrall Action Language
 Scrall = Starr's Concise Relational Action Language

scrall-0.6.1.dist-info/RECORD

@@ -0,0 +1,14 @@
+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,,

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

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

scrall-0.6.0.dist-info/RECORD

@@ -1,14 +0,0 @@
-scrall/__init__.py,sha256=e0X1-TNwwrfq8ROjDkPhu1Wka4IVHQeCjaR51tzPsko,17
-scrall/__main__.py,sha256=5k_6-Z-BPbW2J1AJ98TWDpKu7r9Hcl7dIukqfEp5E38,2140
-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=GBsDnuUm4vV8gNePaxd83SceLE6kKWKuvBWtBnOkrM0,7580
-scrall/parse/visitor.py,sha256=hiX94kR65Jkf8lwV4HY2SbsXnP0wuTpSeNO5DZMbfIw,55355
-scrall-0.6.0.dist-info/LICENSE,sha256=kL0xVrwl2i3Pk9mQXAVAPANCTaLGGOsoXgvqW7TBs20,1072
-scrall-0.6.0.dist-info/METADATA,sha256=uGpFNtYkoN9GXFWSiINp3-6TNC3IQR5c_SOQkEmUbeo,7191
-scrall-0.6.0.dist-info/WHEEL,sha256=Xo9-1PvkuimrydujYJAjF7pCkriuXBpUPEjma1nZyJ0,92
-scrall-0.6.0.dist-info/entry_points.txt,sha256=2fHG6VXtqSTEZXadsBe7XCFaLm4t3V1pFuqzgWWjBgA,48
-scrall-0.6.0.dist-info/top_level.txt,sha256=SWvpMyNNJlrMWpSsK5RUL40ivQxQpKPbL86VrvNIUAE,7
-scrall-0.6.0.dist-info/RECORD,,