zuspec-dataclasses 0.0.1.6307913476__py2.py3-none-any.whl → 0.0.1.6314474429__py2.py3-none-any.whl

zsp_dataclasses/impl/ctor.py

@@ -6,6 +6,7 @@ Created on Mar 19, 2022
 
 import typeworks
 
+from vsc_dataclasses.impl.ctor import Ctor as VscCtor
 from .type_info import TypeInfo
 from .type_kind_e import TypeKindE
 from .ctor_scope import CtorScope
@@ -228,6 +229,7 @@ class Ctor(object):
 
     @classmethod
     def init(cls, ctxt):
+        VscCtor.init(ctxt)
         cls._inst = Ctor()
         cls._inst._ctxt = ctxt
 

zsp_dataclasses/impl/generators/zsp_data_model_cpp_gen.py

@@ -60,7 +60,7 @@ class ZspDataModelCppGen(VscDataModelCppGen,VisitorBase):
                 self._ctxt,
                 i.name()))
         else:
-            self.println("zsp::arl::dm::IDataTypeComponent %s_t = %s->mkDataTypeComponent(\"%s\");" % (
+            self.println("zsp::arl::dm::IDataTypeComponent *%s_t = %s->mkDataTypeComponent(\"%s\");" % (
                 self.leaf_name(i.name()),
                 self._ctxt,
                 i.name()))
@@ -120,7 +120,7 @@ class ZspDataModelCppGen(VscDataModelCppGen,VisitorBase):
         else:
             self.println("{")
             self.inc_indent()
-            self.println("zsp::arl::dm::IDataTypeAction %s_t = %s->mkDataTypeAction(\"%s\");" % (
+            self.println("zsp::arl::dm::IDataTypeAction *%s_t = %s->mkDataTypeAction(\"%s\");" % (
                 self.leaf_name(i.name()),
                 self._ctxt,
                 i.name()))

zsp_dataclasses/impl/typeinfo_action.py

@@ -64,6 +64,10 @@ class TypeInfoAction(TypeInfo):
         modelinfo_p.addSubfield(field._modelinfo)
 
         return field
+    
+    # def createTypeInst(self):
+    #     obj = super().createTypeInst()
+    #     print("LibObj: %s" % str(obj._modelinfo.libobj))
 
     def elabActivities(self, obj):
         ctor_a = Ctor.inst()

zsp_dataclasses/util/gen_cpp_dt_defs/__main__.py

@@ -74,12 +74,19 @@ def main():
         _globals = globals().copy()
         exec(fragment_m[fn].content, _globals)
 
+        Ctor.inst().elab()
+
         header_path = os.path.join(args.outdir, "%s.h" % fn)
-        root_t = Ctor.inst().ctxt().findDataTypeStruct(fragment_m[fn].root_types[0])
+        root_comp = Ctor.inst().ctxt().findDataTypeComponent(fragment_m[fn].root_comp)
+        if root_comp is None:
+            raise Exception("Failed to find root component %s" % fragment_m[fn].root_comp)
+        root_action = Ctor.inst().ctxt().findDataTypeAction(fragment_m[fn].root_action)
+        if root_action is None:
+            raise Exception("Failed to find root action %s" % fragment_m[fn].root_action)
         gen = ZspDataModelCppGen()
         gen._ctxt = "m_ctxt"
         with open(header_path, "w") as fp:
-            fp.write(gen.generate(root_t))
+            fp.write(gen.generate(root_comp, root_action))
 
         pass
 

{zuspec_dataclasses-0.0.1.6307913476.dist-info → zuspec_dataclasses-0.0.1.6314474429.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: zuspec-dataclasses
-Version: 0.0.1.6307913476
+Version: 0.0.1.6314474429
 Summary: Front-end for capturing Action Relation Level models using dataclasses
 Home-page: https://github.com/zuspec/zuspec-dataclasses
 Author: Matthew Ballance

{zuspec_dataclasses-0.0.1.6307913476.dist-info → zuspec_dataclasses-0.0.1.6314474429.dist-info}/RECORD

@@ -30,7 +30,7 @@ zsp_dataclasses/impl/component_decorator_impl.py,sha256=1IK5-fYw8IYP8t55FYqMnmdz
 zsp_dataclasses/impl/component_impl.py,sha256=_FEaLbmsha1xWySpbMlmf782cX0v2865meFYyx2hSL4,4758
 zsp_dataclasses/impl/constraint_impl.py,sha256=qEbh7cBRjEOULEEpgX8cqSvNuIDfbKYwG2kZovHdIWQ,190
 zsp_dataclasses/impl/context.py,sha256=uoHZQGN6aZGNAxtz-ess9A6TChAzd9iMqrL3z0X8KBk,6559
-zsp_dataclasses/impl/ctor.py,sha256=zwM9WlJQ9jXsP8hvuL5L2XEoXunLnkjHEC-lrNzHTBk,6689
+zsp_dataclasses/impl/ctor.py,sha256=0zcWhlvDXsmJpnnZIXkSKzjPg_xFoZ5-k2HC8nqHuiY,6770
 zsp_dataclasses/impl/ctor_scope.py,sha256=HsWpJqE6eQl0--aWPLm11WEzuFF3CKHc7S_P89PeZX4,956
 zsp_dataclasses/impl/decorator_impl_base.py,sha256=2g9PgX2WKDqdlQW4HhCa_Ayfm9-b9LIbQrJh_T0dOdg,3817
 zsp_dataclasses/impl/do_impl.py,sha256=IGajJ-sAOR9noOdXcb2SrboE0g9YS6MNaWkyPWLLf14,1597
@@ -70,7 +70,7 @@ zsp_dataclasses/impl/struct_decorator_impl.py,sha256=W5IwBKzQok51lxAJnlewAk9dpoL
 zsp_dataclasses/impl/struct_kind_e.py,sha256=gUrxFdT8YnK0NrMSKuHFIPIBHl7Q7y4BGRU1dvYrDo8,216
 zsp_dataclasses/impl/type_info.py,sha256=CHFcynN8crFHQk7p41QxMEDVX7G5tGskVZh-bzfkn5o,7620
 zsp_dataclasses/impl/type_kind_e.py,sha256=3EqUEeQrtmQMGPcXGKnuA1dFDMu46lN40BHQzSsuCLI,330
-zsp_dataclasses/impl/typeinfo_action.py,sha256=Zr2NhOHUVu2cKqdFkuSieQDKcGwxGTl3kjH2fnZs7QY,3897
+zsp_dataclasses/impl/typeinfo_action.py,sha256=66BBe15H4eUW7lTcd6HMtQGCjgikQE4WM8YWJvedv0U,4034
 zsp_dataclasses/impl/typeinfo_claim.py,sha256=TlN200FoSakB-hqpNPY-ZjZq9BeVsXNnawAFtLU26So,1775
 zsp_dataclasses/impl/typeinfo_comp_ref.py,sha256=Y1ek3i2k9Clf3GrINEb6uo_P79PX5jUUPzBAYWwQ3IM,952
 zsp_dataclasses/impl/typeinfo_component.py,sha256=vovYUjjXLdwdsswIzy6k5Qfwo4KP9Uw-Ur6eYwWaEt4,6619
@@ -81,7 +81,7 @@ zsp_dataclasses/impl/typeinfo_flow_obj_ref.py,sha256=NhNwKY2Qp6umQWgPRpAyqLPQsjX
 zsp_dataclasses/impl/typeinfo_pool.py,sha256=-fbPtyoiorI1GwEKxXEn6Birxq4WJCNn_0exAwTAIdw,443
 zsp_dataclasses/impl/typeinfo_struct.py,sha256=JF-1NJGaNxgm6aTEkNHPEx230yMXExnORLlJIHe4KBI,333
 zsp_dataclasses/impl/generators/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-zsp_dataclasses/impl/generators/zsp_data_model_cpp_gen.py,sha256=r2fqYL-2q-YvPEqVHspprXcMBmb4Y6UCDt2N1wuSWPM,4778
+zsp_dataclasses/impl/generators/zsp_data_model_cpp_gen.py,sha256=7tD6Zs52SGf8m59kUx8NUrLrznhltKwiU4tDn22gCg0,4780
 zsp_dataclasses/impl/pyctxt/context.py,sha256=B3EqQth4L086F2GkAsueOnme3tjwINlzb9NGuE2Oo70,2952
 zsp_dataclasses/impl/pyctxt/data_type_action.py,sha256=jMPEA8MKXeVIuDbQaCmnZT4U6kjLIqTLQs8YzULKYzY,1166
 zsp_dataclasses/impl/pyctxt/data_type_activity_replicate.py,sha256=RE3uNEAjs-FeeThN-KClneFCXWAfTuefaA0Fhlui_38,1298
@@ -98,9 +98,9 @@ zsp_dataclasses/impl/pyctxt/type_proc_stmt_var_decl.py,sha256=S72xc5tIRiFOIv68yo
 zsp_dataclasses/impl/pyctxt/visitor_base.py,sha256=2LqVRXJU5_vKoUBHePdb1zSew-T2l2KrMe8osNuApq0,1978
 zsp_dataclasses/util/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 zsp_dataclasses/util/extract_cpp_embedded_dsl.py,sha256=SyMMLumZD6fsubj40hyekYzWyrcoUGTijJH3NmK1ihY,5630
-zsp_dataclasses/util/gen_cpp_dt_defs/__main__.py,sha256=B4H_L55KFxSOxF6gLu5PHMrrc4XYfDTsrrZSRxlaDM0,2934
-zuspec_dataclasses-0.0.1.6307913476.dist-info/LICENSE,sha256=xx0jnfkXJvxRnG63LTGOxlggYnIysveWIZ6H3PNdCrQ,11357
-zuspec_dataclasses-0.0.1.6307913476.dist-info/METADATA,sha256=W0bmYsTJZKtIGKcH0zoW06i17EBGGQfCUIvIcc5Up8M,499
-zuspec_dataclasses-0.0.1.6307913476.dist-info/WHEEL,sha256=iYlv5fX357PQyRT2o6tw1bN-YcKFFHKqB_LwHO5wP-g,110
-zuspec_dataclasses-0.0.1.6307913476.dist-info/top_level.txt,sha256=BHigRYcGvNv_xCJUUv5OXgSPSoczsH3Tle0gABks4l0,16
-zuspec_dataclasses-0.0.1.6307913476.dist-info/RECORD,,
+zsp_dataclasses/util/gen_cpp_dt_defs/__main__.py,sha256=xUbDpPaC9JrRkfDFKDMAVo-CBvqJla6NeJX8vzUGXo8,3311
+zuspec_dataclasses-0.0.1.6314474429.dist-info/LICENSE,sha256=xx0jnfkXJvxRnG63LTGOxlggYnIysveWIZ6H3PNdCrQ,11357
+zuspec_dataclasses-0.0.1.6314474429.dist-info/METADATA,sha256=JmHD3TheN_yM2OfFYcRlyeja437khpL0owfG9ENgFSM,499
+zuspec_dataclasses-0.0.1.6314474429.dist-info/WHEEL,sha256=iYlv5fX357PQyRT2o6tw1bN-YcKFFHKqB_LwHO5wP-g,110
+zuspec_dataclasses-0.0.1.6314474429.dist-info/top_level.txt,sha256=BHigRYcGvNv_xCJUUv5OXgSPSoczsH3Tle0gABks4l0,16
+zuspec_dataclasses-0.0.1.6314474429.dist-info/RECORD,,