scrall 0.8.7__py3-none-any.whl → 0.8.8__py3-none-any.whl

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Potentially problematic release.

This version of scrall might be problematic. Click here for more details.

Files changed (10) hide show
  1. scrall/__init__.py +1 -1
  2. scrall/parse/scrall.peg +1 -1
  3. scrall/parse/visitor.py +7 -2
  4. {scrall-0.8.7.dist-info → scrall-0.8.8.dist-info}/METADATA +1 -1
  5. scrall-0.8.8.dist-info/RECORD +14 -0
  6. scrall-0.8.7.dist-info/RECORD +0 -14
  7. {scrall-0.8.7.dist-info → scrall-0.8.8.dist-info}/WHEEL +0 -0
  8. {scrall-0.8.7.dist-info → scrall-0.8.8.dist-info}/entry_points.txt +0 -0
  9. {scrall-0.8.7.dist-info → scrall-0.8.8.dist-info}/licenses/LICENSE +0 -0
  10. {scrall-0.8.7.dist-info → scrall-0.8.8.dist-info}/top_level.txt +0 -0
scrall/__init__.py CHANGED
@@ -1 +1 @@
1
- version = "0.8.7"
1
+ version = "0.8.8"
scrall/parse/scrall.peg CHANGED
@@ -91,7 +91,7 @@ output_flow = OUTPUT SP+ scalar_expr
91
91
  OUTPUT = '=>>'
92
92
 
93
93
  // Instance set
94
- instance_set = new_instance / ((operation / name / path) (reflexive_selection / selection / operation / path)*)
94
+ instance_set = new_instance / ((operation / input_param / name / path) (reflexive_selection / selection / operation / path)*)
95
95
  selection = '(' SP* (rank_selection / criteria_selection) SP* ')'
96
96
  rank_selection = CARD ', ' SP* RANKR name
97
97
  criteria_selection = (CARD ', ' SP* scalar_expr) / CARD / scalar_expr
scrall/parse/visitor.py CHANGED
@@ -916,7 +916,7 @@ class ScrallVisitor(PTNodeVisitor):
916
916
  by any sequence of selection, operation, and paths. The parser won't find two paths in sequence since
917
917
  any encounter path will be fully consumed
918
918
  """
919
- _logger.info("instance_set = new_instance / ((operation / prefix_name / path) (reflexive_selection / "
919
+ _logger.info("instance_set = new_instance / ((operation / input_param / name / path) (reflexive_selection / "
920
920
  "selection / operation / path)*)")
921
921
  _logger.info(f">> {[k for k in children.results.keys()]}")
922
922
  _logger.info(f' :: {node.value}')
@@ -925,7 +925,12 @@ class ScrallVisitor(PTNodeVisitor):
925
925
  if len(children) == 1 and isinstance(children[0], N_a):
926
926
  result = children[0]
927
927
  else:
928
- result = INST_a(children)
928
+ p = children.results.get('input_param')
929
+ if p:
930
+ # Just like above case, but returning an IN_a (parameter name)
931
+ result = p[0]
932
+ else:
933
+ result = INST_a(children)
929
934
  _logger.info(f" > {result}")
930
935
  return result
931
936
 
{scrall-0.8.7.dist-info → scrall-0.8.8.dist-info}/METADATA RENAMED
@@ -1,6 +1,6 @@
1
1
  Metadata-Version: 2.4
2
2
  Name: scrall
3
- Version: 0.8.7
3
+ Version: 0.8.8
4
4
  Summary: Starr's Concise Relational Action Language - For Shlaer-Mellor Executable UML
5
5
  Author-email: Leon Starr <leon_starr@modelint.com>
6
6
  License: MIT License
scrall-0.8.8.dist-info/RECORD ADDED
@@ -0,0 +1,14 @@
1
+ scrall/__init__.py,sha256=qHYh1pZe2XCAYi_96cwEgzxFda1VHX07ZOaysPqfgXk,17
2
+ scrall/__main__.py,sha256=H5szTQUuBTrnCngyUv3EFj5eQyPY4j0NKf1q8DgK6E8,2187
3
+ scrall/exceptions.py,sha256=QU4mKLs7_ddGIznhh2HUpjb_PdPlxWZMMY_g0ELenSs,1764
4
+ scrall/log.conf,sha256=tERYKbCp9TgdAVTby6A7gUpnjurJKcX1tyAzG3ATORI,933
5
+ scrall/parse/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
6
+ scrall/parse/parser.py,sha256=k4SeWMtNzAUtwU_e15frvSL1D5G3RBU_jmLegZbIBnY,5221
7
+ scrall/parse/scrall.peg,sha256=8qyy3W2aZhHION8DLNpYMX6jxpExmUDqpDWjhstvstk,7801
8
+ scrall/parse/visitor.py,sha256=qEYhFuwqelS0vy9xAADojGXsOfPBdHjVoAAjV_eZbWc,56589
9
+ scrall-0.8.8.dist-info/licenses/LICENSE,sha256=kL0xVrwl2i3Pk9mQXAVAPANCTaLGGOsoXgvqW7TBs20,1072
10
+ scrall-0.8.8.dist-info/METADATA,sha256=IFx4qA4EKydnTloU2kd61SYdIJZYTeg0-eDukxbGABQ,7208
11
+ scrall-0.8.8.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
12
+ scrall-0.8.8.dist-info/entry_points.txt,sha256=2fHG6VXtqSTEZXadsBe7XCFaLm4t3V1pFuqzgWWjBgA,48
13
+ scrall-0.8.8.dist-info/top_level.txt,sha256=SWvpMyNNJlrMWpSsK5RUL40ivQxQpKPbL86VrvNIUAE,7
14
+ scrall-0.8.8.dist-info/RECORD,,
scrall-0.8.7.dist-info/RECORD DELETED
@@ -1,14 +0,0 @@
1
- scrall/__init__.py,sha256=Ci6PjXpA6dMGYr_yysZyYqKPPelOlKghe4xjCwvDkfo,17
2
- scrall/__main__.py,sha256=H5szTQUuBTrnCngyUv3EFj5eQyPY4j0NKf1q8DgK6E8,2187
3
- scrall/exceptions.py,sha256=QU4mKLs7_ddGIznhh2HUpjb_PdPlxWZMMY_g0ELenSs,1764
4
- scrall/log.conf,sha256=tERYKbCp9TgdAVTby6A7gUpnjurJKcX1tyAzG3ATORI,933
5
- scrall/parse/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
6
- scrall/parse/parser.py,sha256=k4SeWMtNzAUtwU_e15frvSL1D5G3RBU_jmLegZbIBnY,5221
7
- scrall/parse/scrall.peg,sha256=5sZnsxNcu09eqwOZIH1gAoX3M0rlZAqZKbgCbYcc4Yc,7787
8
- scrall/parse/visitor.py,sha256=xQ30TZTSHS3h0wHEqjknUmBWBHG6rGFZfUl9QGspoLw,56381
9
- scrall-0.8.7.dist-info/licenses/LICENSE,sha256=kL0xVrwl2i3Pk9mQXAVAPANCTaLGGOsoXgvqW7TBs20,1072
10
- scrall-0.8.7.dist-info/METADATA,sha256=sSxzPLwxIvUop4bcne_vZZFliDM6c9qkU-3RCxSPTOA,7208
11
- scrall-0.8.7.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
12
- scrall-0.8.7.dist-info/entry_points.txt,sha256=2fHG6VXtqSTEZXadsBe7XCFaLm4t3V1pFuqzgWWjBgA,48
13
- scrall-0.8.7.dist-info/top_level.txt,sha256=SWvpMyNNJlrMWpSsK5RUL40ivQxQpKPbL86VrvNIUAE,7
14
- scrall-0.8.7.dist-info/RECORD,,
{scrall-0.8.7.dist-info → scrall-0.8.8.dist-info}/WHEEL RENAMED
File without changes