zuspec-dataclasses 0.0.1.6364580335__py2.py3-none-any.whl → 0.0.1.6365096825__py2.py3-none-any.whl

zsp_dataclasses/impl/generators/zsp_data_model_cpp_gen.py

@@ -23,7 +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 ..context import DataTypeAction, DataTypeComponent, DataTypeFunction, TypeExec, TypeExprMethodCallStatic, TypeProcStmtExpr
+from ..context import DataTypeAction, DataTypeComponent, DataTypeFunction, TypeExec, TypeExprMethodCallStatic, TypeProcStmtExpr, TypeProcStmtScope
 from ..pyctxt.visitor_base import VisitorBase
 
 class ZspDataModelCppGen(VscDataModelCppGen,VisitorBase):
@@ -56,7 +56,7 @@ class ZspDataModelCppGen(VscDataModelCppGen,VisitorBase):
                     self._ctxt,
                     f.name()))
                 if len(f.getImportSpecs()) > 0:
-                    self.println("%s_t->addImportSpec(" % self._ctxt)
+                    self.println("%s_t->addImportSpec(" % (self.leaf_name(f.name())))
                     self.inc_indent()
                     self.println("%s->mkDataTypeFunctionImport(\"%s\", false, false)" % (
                         self._ctxt,
@@ -134,6 +134,7 @@ class ZspDataModelCppGen(VscDataModelCppGen,VisitorBase):
                 self._emit_type_mode += 1
                 i.getReturnType().accept(self)
                 self._emit_type_mode -= 1
+            self.println("false") # own_rtype
             self.dec_indent()
             self.println(");")
             self.println("%s->addDataTypeFunction(%s_t);" % (self._ctxt, i.name()))
@@ -154,18 +155,15 @@ class ZspDataModelCppGen(VscDataModelCppGen,VisitorBase):
             ctxt_api.ExecKindT.PreSolve : "zsp::arl::dm::ExecKindT::PreSolve",
             ctxt_api.ExecKindT.PostSolve : "zsp::arl::dm::ExecKindT::PostSolve",
         }
-        self.println("%s_t->addExec(%s->mkTypeExec(" % (
+        self.println("%s_t->addExec(%s->mkTypeExecProc(" % (
             self.leaf_name(self._type_s[-1].name()),
             self._ctxt
         ))
         self.inc_indent()
         self.println("%s," % exec_kind_m[i.getKind()])
-        self.println("%s->mkTypeProcStmtScope({" % self._ctxt)
         self.inc_indent()
         i.getBody().accept(self)
         self.dec_indent()
-        self.println("})")
-        self.dec_indent()
         self.println("));")
 
     def visitTypeExprBin(self, i : 'TypeExprBin'):
@@ -183,9 +181,10 @@ class ZspDataModelCppGen(VscDataModelCppGen,VisitorBase):
             i.getTarget().name()))
         self.println("{")
         self.inc_indent()
-        self.push_comma()
-        for p in i.getParameters():
+        for ii,p in enumerate(i.getParameters()):
+            self.push_comma(ii+1 < len(i.getParameters()))
             p.accept(self)
+            self.pop_comma()
         self.dec_indent()
         self.println("}")
         self.dec_indent()
@@ -249,11 +248,23 @@ class ZspDataModelCppGen(VscDataModelCppGen,VisitorBase):
 
     def visitTypeProcStmtExpr(self, i: TypeProcStmtExpr):
         self.println("%s->mkTypeProcStmtExpr(" % self._ctxt)
+        self.inc_indent()
         self.push_comma(False)
         i.getExpr().accept(self)
         self.pop_comma()
+        self.dec_indent()
         self.println(")%s" % self.comma())
 
+    def visitTypeProcStmtScope(self, i: TypeProcStmtScope):
+        self.println("%s->mkTypeProcStmtScope({" % self._ctxt)
+        self.inc_indent()
+        for ii,s in enumerate(i.getStatements()):
+            self.push_comma(ii+1 < len(i.getStatements()))
+            s.accept(self)
+            self.pop_comma()
+        self.dec_indent()
+        self.println("})%s" % self.comma())
+
 
     
 

{zuspec_dataclasses-0.0.1.6364580335.dist-info → zuspec_dataclasses-0.0.1.6365096825.dist-info}/METADATA

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

@@ -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=ZcDYoNLiEscpPgqsrrRBH8OKpmuVY0REYWIq9cC_F4M,9337
+zsp_dataclasses/impl/generators/zsp_data_model_cpp_gen.py,sha256=BzHQeT3x0SbqeIipb2zE4K5Fhyvt8sJAewV3SiCswKg,9819
 zsp_dataclasses/impl/pyctxt/context.py,sha256=KWcgCABeDSRre5de6HHpmuqUmpb6vzLppz2DZPGQD60,5223
 zsp_dataclasses/impl/pyctxt/data_type_action.py,sha256=v5DR7eFqov0_iPMhLE30meuqMM98YQ0VcMV7_P1FPas,1622
 zsp_dataclasses/impl/pyctxt/data_type_activity_replicate.py,sha256=RE3uNEAjs-FeeThN-KClneFCXWAfTuefaA0Fhlui_38,1298
@@ -104,8 +104,8 @@ zsp_dataclasses/impl/pyctxt/visitor_base.py,sha256=G5DiaYlfULVmOyRLnIV4m1Gb70FeX
 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.6364580335.dist-info/LICENSE,sha256=xx0jnfkXJvxRnG63LTGOxlggYnIysveWIZ6H3PNdCrQ,11357
-zuspec_dataclasses-0.0.1.6364580335.dist-info/METADATA,sha256=VmIQSY88MnuI25I3CzfePA2iyHVZIq1MIONMK1KRMbE,499
-zuspec_dataclasses-0.0.1.6364580335.dist-info/WHEEL,sha256=iYlv5fX357PQyRT2o6tw1bN-YcKFFHKqB_LwHO5wP-g,110
-zuspec_dataclasses-0.0.1.6364580335.dist-info/top_level.txt,sha256=BHigRYcGvNv_xCJUUv5OXgSPSoczsH3Tle0gABks4l0,16
-zuspec_dataclasses-0.0.1.6364580335.dist-info/RECORD,,
+zuspec_dataclasses-0.0.1.6365096825.dist-info/LICENSE,sha256=xx0jnfkXJvxRnG63LTGOxlggYnIysveWIZ6H3PNdCrQ,11357
+zuspec_dataclasses-0.0.1.6365096825.dist-info/METADATA,sha256=aJ8acCMq9O6_hcZ4SwO7_ZNlCRj0vQ8dQ9l6TfgfvgI,499
+zuspec_dataclasses-0.0.1.6365096825.dist-info/WHEEL,sha256=iYlv5fX357PQyRT2o6tw1bN-YcKFFHKqB_LwHO5wP-g,110
+zuspec_dataclasses-0.0.1.6365096825.dist-info/top_level.txt,sha256=BHigRYcGvNv_xCJUUv5OXgSPSoczsH3Tle0gABks4l0,16
+zuspec_dataclasses-0.0.1.6365096825.dist-info/RECORD,,