scrall 0.10.0__py3-none-any.whl → 0.10.2__py3-none-any.whl

scrall/__init__.py

@@ -1 +1 @@
-version = "0.10.0"
+version = "0.10.2"

scrall/parse/scrall.peg

@@ -118,7 +118,7 @@ delete = '!*' SP* instance_set (',' SP+ instance_set)* // supports multi-delete
 // Scalar assignment
 scalar_assignment = scalar_output_set SP* SCALAR_ASSIGN SP* scalar_expr projection? (',' SP* scalar_expr projection?)*
 scalar_output_set = qualified_name / flow_output (',' SP+ flow_output)*
-qualified_name = name '.' name
+qualified_name = (name / instance_set) '.' name
 flow_output = name (TYPE_ASSIGN name)?
 projection = '.' (name / '(' ( (ALL / (name (',' SP+ name)*) )? ')')) // TODO: Why is empty () ok in projection?
 ALL = '*'

scrall/parse/visitor.py

@@ -42,7 +42,7 @@ BOOL_a = namedtuple('BOOL_a', 'op operands')
 Scalar_Assignment_a = namedtuple('Scalar_Assignment_a', 'lhs rhs')
 Table_Assignment_a = namedtuple('Table_Assignment_a', 'type assign_tuple lhs rhs X')
 Scalar_RHS_a = namedtuple('Scalar_RHS_a', 'expr attrs')
-Qualified_Name_a = namedtuple('Qualified_Name_a', 'cname aname')
+Qualified_Name_a = namedtuple('Qualified_Name_a', 'iset cname aname')
 Flow_Output_a = namedtuple('Flow_Output_a', 'name exp_type')
 PATH_a = namedtuple('PATH_a', 'hops')
 INST_a = namedtuple('INST_a', 'components')
@@ -677,7 +677,8 @@ class ScrallVisitor(PTNodeVisitor):
         _logger.info(f'  :: {node.value}')
 
         _logger.info(f"  < {children}")
-        params = children.results.get('supplied_params', [])
+        params = children.results.get('supplied_params')
+        params = params[0] if params else []
         result = {'name': children[0].name, 'params': params}
         _logger.info(f"  > {result}")
         return result
@@ -1138,10 +1139,21 @@ class ScrallVisitor(PTNodeVisitor):
     @classmethod
     def visit_qualified_name(cls, node, children):
         """
+        (name / instance_set) '.' name
         """
         _logger.info("qualified_name = name '.' name")
         _logger.info(f'  :: {node.value}')
-        return Qualified_Name_a(cname=children[0].name, aname=children[1].name)
+        iset = children.results.get('instance_set')
+        names = children.results.get('name')
+        if iset:
+            # iset takes the place of cname
+            # iset.attribute -- /R4/Door.Lock request
+            aname = names[0].name
+            cname = None
+        else:
+            # class.attribute -- Door.Lock request
+            cname, aname = names[0].name, names[1].name
+        return Qualified_Name_a(iset=iset, cname=cname, aname=aname)
 
     @classmethod
     def visit_scalar_output_set(cls, node, children):

{scrall-0.10.0.dist-info → scrall-0.10.2.dist-info}/METADATA

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

@@ -0,0 +1,14 @@
+scrall/__init__.py,sha256=nvNgUDh4xb3OXHk2ZZlmcntg1VS76lYDKcSjWJ4f1_k,18
+scrall/__main__.py,sha256=H5szTQUuBTrnCngyUv3EFj5eQyPY4j0NKf1q8DgK6E8,2187
+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=07rAbmwCsA4NrS_HDPdSQ1oQkY3D0c7kEgOuYCyjU34,7864
+scrall/parse/visitor.py,sha256=cfHbTkkXvgQLpeXhO8ymlgjDq1tsj_kpZcZ-ik2wClY,58112
+scrall-0.10.2.dist-info/licenses/LICENSE,sha256=kL0xVrwl2i3Pk9mQXAVAPANCTaLGGOsoXgvqW7TBs20,1072
+scrall-0.10.2.dist-info/METADATA,sha256=Op309rKrd12Gc9dQJ_CNNyKQ3NU1w5WgaZsnXhnwysE,7209
+scrall-0.10.2.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+scrall-0.10.2.dist-info/entry_points.txt,sha256=2fHG6VXtqSTEZXadsBe7XCFaLm4t3V1pFuqzgWWjBgA,48
+scrall-0.10.2.dist-info/top_level.txt,sha256=SWvpMyNNJlrMWpSsK5RUL40ivQxQpKPbL86VrvNIUAE,7
+scrall-0.10.2.dist-info/RECORD,,

scrall-0.10.0.dist-info/RECORD

@@ -1,14 +0,0 @@
-scrall/__init__.py,sha256=5J3gAl0dpgRaHiwx6Notssoxh6Q25dQPNlaGoI4QtzM,18
-scrall/__main__.py,sha256=H5szTQUuBTrnCngyUv3EFj5eQyPY4j0NKf1q8DgK6E8,2187
-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=0vVYqFdDM_nbrc55IB4o1dfJQpQaIcv7hr8wHsi9C6I,7847
-scrall/parse/visitor.py,sha256=1gOMCIltGjgW3JH-Uw_vV2qeQQlfgVGHpX7bG3eOI3s,57646
-scrall-0.10.0.dist-info/licenses/LICENSE,sha256=kL0xVrwl2i3Pk9mQXAVAPANCTaLGGOsoXgvqW7TBs20,1072
-scrall-0.10.0.dist-info/METADATA,sha256=Rsf1YzWsUK65yOXZBVM8oy53c-in7GatHGv1yu1guIA,7209
-scrall-0.10.0.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-scrall-0.10.0.dist-info/entry_points.txt,sha256=2fHG6VXtqSTEZXadsBe7XCFaLm4t3V1pFuqzgWWjBgA,48
-scrall-0.10.0.dist-info/top_level.txt,sha256=SWvpMyNNJlrMWpSsK5RUL40ivQxQpKPbL86VrvNIUAE,7
-scrall-0.10.0.dist-info/RECORD,,