zuspec-dataclasses 0.0.1.6433827600__py2.py3-none-any.whl → 0.0.1.6449654181__py2.py3-none-any.whl

zsp_dataclasses/impl/generators/collect_type_deps.py

@@ -0,0 +1,65 @@
+#****************************************************************************
+#* collect_type_deps.py
+#*
+#* Copyright 2022 Matthew Ballance and Contributors
+#*
+#* Licensed under the Apache License, Version 2.0 (the "License"); you may 
+#* not use this file except in compliance with the License.  
+#* You may obtain a copy of the License at:
+#*
+#*   http://www.apache.org/licenses/LICENSE-2.0
+#*
+#* Unless required by applicable law or agreed to in writing, software 
+#* distributed under the License is distributed on an "AS IS" BASIS, 
+#* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.  
+#* See the License for the specific language governing permissions and 
+#* limitations under the License.
+#*
+#* Created on:
+#*     Author: 
+#*
+#****************************************************************************
+from vsc_dataclasses.impl.generators.collect_struct_deps import CollectStructDeps
+from zsp_dataclasses.impl.context import DataTypeAction, DataTypeComponent
+from ..pyctxt.visitor_base import VisitorBase
+
+class CollectTypeDeps(VisitorBase,CollectStructDeps):
+
+    def __init__(self):
+        CollectStructDeps.__init__(self, None)
+
+    def collect(self, root_comp, root_action):
+        self._init()
+        self.addType(root_action)
+        self.push_scope(root_action)
+        self.addRef(root_comp)
+        self.pop_scope()
+        root_comp.accept(self)
+        root_action.accept(self)
+        
+        return self._sort_deps()
+
+    def visitDataTypeAction(self, i: DataTypeAction):
+        if self.in_field():
+            self.addRef(i)
+        else:
+            self.addType(i)
+
+        self.push_scope(i)
+        for f in i.getFields():
+            f.accept(self)
+        # TODO: Activities
+        self.pop_scope()
+
+    def visitDataTypeComponent(self, i: DataTypeComponent):
+        if self.in_field():
+            self.addRef(i)
+        else:
+            self.addType(i)
+
+        self.push_scope(i)
+        for f in i.getFields():
+            f.accept(self)
+        self.pop_scope()
+
+    

zsp_dataclasses/impl/generators/zsp_data_model_cpp_gen.py

@@ -23,6 +23,7 @@
 import zsp_dataclasses.impl.context as ctxt_api
 from vsc_dataclasses.impl.generators.vsc_data_model_cpp_gen import VscDataModelCppGen
 from vsc_dataclasses.impl.pyctxt.data_type_struct import DataTypeStruct
+from .collect_type_deps import CollectTypeDeps
 from ..context import DataTypeAction, DataTypeComponent, DataTypeFunction, TypeExec, TypeExprMethodCallContext, TypeExprMethodCallStatic, TypeFieldReg, TypeFieldRegGroup, TypeProcStmtExpr, TypeProcStmtIfElse, TypeProcStmtScope
 from ..context import DataTypeFunctionFlags
 from ..pyctxt.visitor_base import VisitorBase
@@ -90,12 +91,18 @@ class ZspDataModelCppGen(VscDataModelCppGen,VisitorBase):
                 self.dec_indent()
                 self.println("}")
 
+        types = CollectTypeDeps().collect(root_comp, root_action)
+
+        print("types: %s" % str(types))
+        for t in types:
+            t.accept(self)
+
         # Should result in RootComp and RootAction type handles
-        self.println("{")
-        self.inc_indent()
-        root_comp.accept(self)
-        self.dec_indent()
-        self.println("}")
+        # self.println("{")
+        # self.inc_indent()
+        # root_comp.accept(self)
+        # self.dec_indent()
+        # self.println("}")
         self.println("")
         self.println("zsp::arl::dm::IDataTypeComponent *%s_t = %s->findDataTypeComponent(\"%s\");" % (
             self.leaf_name(root_comp.name()),
@@ -116,10 +123,15 @@ class ZspDataModelCppGen(VscDataModelCppGen,VisitorBase):
                 self._ctxt,
                 i.name()))
         else:
+            self.println("{")
+            self.inc_indent()
             self.println("zsp::arl::dm::IDataTypeComponent *%s_t = %s->mkDataTypeComponent(\"%s\");" % (
                 self.leaf_name(i.name()),
                 self._ctxt,
                 i.name()))
+            self.println("%s->addDataTypeComponent(%s_t);" % (
+                self._ctxt, 
+                self.leaf_name(i.name())))
 
             self._type_s.append(i)
             for f in i.getFields():
@@ -131,9 +143,8 @@ class ZspDataModelCppGen(VscDataModelCppGen,VisitorBase):
                 a.accept(self)
             self._type_s.pop()
 
-            self.println("%s->addDataTypeComponent(%s_t);" % (
-                self._ctxt, 
-                self.leaf_name(i.name())))
+            self.dec_indent()
+            self.println("}")
             
     def visitDataTypeFunction(self, i: DataTypeFunction):
         if self._define_func:
@@ -153,7 +164,7 @@ class ZspDataModelCppGen(VscDataModelCppGen,VisitorBase):
                 i.getReturnType().accept(self)
                 self._emit_type_mode -= 1
                 self.write(",\n")
-            self.println("false") # own_rtype
+            self.println("false,") # own_rtype
 
             # TODO: Flags
             flags = "zsp::arl::dm::DataTypeFunctionFlags::NoFlags"
@@ -248,8 +259,26 @@ class ZspDataModelCppGen(VscDataModelCppGen,VisitorBase):
         self.println("TODO: hit generic TypeField (%s)" % str(i))
 
     def visitTypeFieldRegGroup(self, i: TypeFieldRegGroup):
-        print("visitTypeFieldRegGroup")
-        return super().visitTypeFieldRegGroup(i)
+        self.println("{")
+        self.inc_indent()
+        self.println("zsp::arl::dm::ITypeFieldRegGroup *%s_f = %s->mkTypeFieldRegGroup(" % (
+            self.leaf_name(i.name()),
+            self._ctxt))
+        self.inc_indent()
+        self.println("\"%s\"," % i.name())
+        self.write(self.ind())
+        self._emit_type_mode += 1
+        i.getDataType().accept(self)
+        self._emit_type_mode -= 1
+        self.write(",\n")
+        self.println("false);")
+        self.dec_indent()
+#        self.println("%s_f->setOffset(%d);" % (self.leaf_name(i.name()), i.getOffset()))
+        self.println("%s_t->addField(%s_f);" % (
+            self.leaf_name(self._type_s[-1].name()),
+            self.leaf_name(i.name())))
+        self.dec_indent()
+        self.println("}")
 
     def visitTypeFieldRef(self, i : 'TypeFieldRef'):
         if i.name() != "comp":
@@ -258,7 +287,7 @@ class ZspDataModelCppGen(VscDataModelCppGen,VisitorBase):
     def visitTypeFieldReg(self, i: TypeFieldReg):
         self.println("{")
         self.inc_indent()
-        self.println("zsp::arl::dm::TypeFieldReg *%s_f = %s->mkTypeFieldReg(" % (
+        self.println("zsp::arl::dm::ITypeFieldReg *%s_f = %s->mkTypeFieldReg(" % (
             self.leaf_name(i.name()),
             self._ctxt))
         self.inc_indent()
@@ -301,6 +330,10 @@ class ZspDataModelCppGen(VscDataModelCppGen,VisitorBase):
                 self.leaf_name(i.name()),
                 self._ctxt,
                 i.name()))
+            self.println("%s->addDataTypeAction(%s_t);" % (
+                self._ctxt,
+                self.leaf_name(i.name())
+            ))
             self._type_s.append(i)
             for f in i.getFields():
                 if f.name() != "comp":
@@ -312,16 +345,14 @@ class ZspDataModelCppGen(VscDataModelCppGen,VisitorBase):
                 e.accept(self)
                 pass
             self._type_s.pop()
-            self.println("%s_t->setComponentType(%s_t);" % (
+            self.println("%s_t->setComponentType(%s->findDataTypeComponent(\"%s\"));" % (
                 self.leaf_name(i.name()),
-                self.leaf_name(self._type_s[-1].name())))
-            self.println("%s_t->addActionType(%s_t);" % (
-                self.leaf_name(self._type_s[-1].name()),
-                self.leaf_name(i.name())))
-            self.println("%s->addDataTypeAction(%s_t);" % (
                 self._ctxt,
-                self.leaf_name(i.name())
-            ))
+                self.leaf_name(i.getComponentType().name())))
+            self.println("%s->findDataTypeComponent(\"%s\")->addActionType(%s_t);" % (
+                self._ctxt,
+                self.leaf_name(i.getComponentType().name()),
+                self.leaf_name(i.name())))
             self.dec_indent()
             self.println("}")
 

zsp_dataclasses/impl/pyctxt/type_field_reg_group.py

@@ -36,5 +36,5 @@ class TypeFieldRegGroup(ctxt_api.TypeFieldRegGroup, TypeField):
         return self._offset
 
     def accept(self, v):
-        v.visitTypeFieldReg(self)
+        v.visitTypeFieldRegGroup(self)
 

{zuspec_dataclasses-0.0.1.6433827600.dist-info → zuspec_dataclasses-0.0.1.6449654181.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: zuspec-dataclasses
-Version: 0.0.1.6433827600
+Version: 0.0.1.6449654181
 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.6433827600.dist-info → zuspec_dataclasses-0.0.1.6449654181.dist-info}/RECORD

@@ -94,7 +94,8 @@ zsp_dataclasses/impl/typeinfo_pure_component.py,sha256=5I8OIiL0tgRYkwlb2M8VfnPVg
 zsp_dataclasses/impl/typeinfo_reg_group.py,sha256=2kNSSPaxQnfxoxrHszBqUQ9vl1wtBBFfeOk7Q7hwCN8,1319
 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=MpEgve4digS_PAdJi0n-L70a9aE0ujPLtQK6Z1604-8,13464
+zsp_dataclasses/impl/generators/collect_type_deps.py,sha256=EainOgsxfmBqOVVVj-XI6rkvRckrs1QMT2np90MNtjc,2035
+zsp_dataclasses/impl/generators/zsp_data_model_cpp_gen.py,sha256=0mza3RUPf31RjjIh4KbEgAEW4cAfN0CKZqFs-TWAFuc,14615
 zsp_dataclasses/impl/pyctxt/context.py,sha256=r3cOmGDzntKjg3ryY1oKWLGlp8O6UgbHHeDwBnt2ZMo,6096
 zsp_dataclasses/impl/pyctxt/core_lib_factory.py,sha256=9vpcDdlzVIOSixnSJuMFe6_wWpxeRV0nHnANxI1K5C4,1452
 zsp_dataclasses/impl/pyctxt/data_type_action.py,sha256=v5DR7eFqov0_iPMhLE30meuqMM98YQ0VcMV7_P1FPas,1622
@@ -113,7 +114,7 @@ zsp_dataclasses/impl/pyctxt/type_expr_method_call_context.py,sha256=AjXA6-LpEX6w
 zsp_dataclasses/impl/pyctxt/type_expr_method_call_static.py,sha256=5c9lMjPEGrb0m_G9OMAK_QZL6AytKE4isPmtO4O5KrQ,1365
 zsp_dataclasses/impl/pyctxt/type_field_activity.py,sha256=SFpdm_fOQgE1F3qKTM9gU9ocnG4ZxFmtwkdb0Mi3F_A,1286
 zsp_dataclasses/impl/pyctxt/type_field_reg.py,sha256=miyfFvT_MWdk5P2UCrOeDf7LHo2IUVwj7-84x-XrtEs,1361
-zsp_dataclasses/impl/pyctxt/type_field_reg_group.py,sha256=Vl8rsLKRqP5_Yb6_3CEo8sbwLDK3GypaCt2RzRTQRLY,1379
+zsp_dataclasses/impl/pyctxt/type_field_reg_group.py,sha256=68ngAJ5g6NzyEopDgVu8s6U4Sfc72f-E1M4eeq1NOG8,1384
 zsp_dataclasses/impl/pyctxt/type_proc_stmt_expr.py,sha256=V2UsVyGI9bExvZ2Eqz3wNJ39LMC_3EXICo6JZsenV0c,1115
 zsp_dataclasses/impl/pyctxt/type_proc_stmt_if_else.py,sha256=fdf8DEiweRnkFRqkWY6LfOkO4vBuURFbSMNDfqdABbk,1465
 zsp_dataclasses/impl/pyctxt/type_proc_stmt_scope.py,sha256=TfbqEcHgLOlKn7M99IDnwzTjkhhp0wxcMaca5X57JwY,1355
@@ -122,8 +123,8 @@ zsp_dataclasses/impl/pyctxt/visitor_base.py,sha256=n08-7Y5AOjBeuvZOLiAqvDh78Xsf4
 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=LdfPAEzhMPtW1Ie15A5pmYAlL8DQFj-l7Pbey3EJiJg,3391
-zuspec_dataclasses-0.0.1.6433827600.dist-info/LICENSE,sha256=xx0jnfkXJvxRnG63LTGOxlggYnIysveWIZ6H3PNdCrQ,11357
-zuspec_dataclasses-0.0.1.6433827600.dist-info/METADATA,sha256=zO_eWK3CeO0uiyZRMKSeg_Hwa8po8Z73ffHaVjq0wog,499
-zuspec_dataclasses-0.0.1.6433827600.dist-info/WHEEL,sha256=iYlv5fX357PQyRT2o6tw1bN-YcKFFHKqB_LwHO5wP-g,110
-zuspec_dataclasses-0.0.1.6433827600.dist-info/top_level.txt,sha256=BHigRYcGvNv_xCJUUv5OXgSPSoczsH3Tle0gABks4l0,16
-zuspec_dataclasses-0.0.1.6433827600.dist-info/RECORD,,
+zuspec_dataclasses-0.0.1.6449654181.dist-info/LICENSE,sha256=xx0jnfkXJvxRnG63LTGOxlggYnIysveWIZ6H3PNdCrQ,11357
+zuspec_dataclasses-0.0.1.6449654181.dist-info/METADATA,sha256=6hr6XDnK3DCYq8EFkSEjju691pWZFMp6Uuh6YDvy5JM,499
+zuspec_dataclasses-0.0.1.6449654181.dist-info/WHEEL,sha256=iYlv5fX357PQyRT2o6tw1bN-YcKFFHKqB_LwHO5wP-g,110
+zuspec_dataclasses-0.0.1.6449654181.dist-info/top_level.txt,sha256=BHigRYcGvNv_xCJUUv5OXgSPSoczsH3Tle0gABks4l0,16
+zuspec_dataclasses-0.0.1.6449654181.dist-info/RECORD,,