zuspec-arl-dm 0.1.0.15657945394rc0__cp39-cp39-manylinux_2_28_x86_64.whl → 0.1.0.15695543496rc0__cp39-cp39-manylinux_2_28_x86_64.whl

zsp_arl_dm/__build_num__.py

@@ -1 +1 @@
-BUILD_NUM=15657945394
+BUILD_NUM=15695543496

zsp_arl_dm/__version__.py

@@ -1,3 +1,3 @@
 BASE="0.1.0"
-SUFFIX=".15657945394rc0"
+SUFFIX=".15695543496rc0"
 VERSION="%s%s" % (BASE, SUFFIX)

zsp_arl_dm/core.pxd

@@ -194,6 +194,8 @@ cdef class DataTypeFunction(vsc.ObjBase):
 
     cpdef getParameters(self)
 
+    cpdef getBody(self)
+
     cpdef getFlags(self)
 
     cpdef bool hasFlags(self, flags)
@@ -338,6 +340,13 @@ cdef class TypeFieldReg(vsc.TypeField):
 cdef class TypeProcStmt(vsc.ObjBase):
     pass
 
+cdef class TypeProcStmtScope(TypeProcStmt):
+    
+    cdef decl.ITypeProcStmtScope *asScope(self)
+
+    @staticmethod
+    cdef TypeProcStmtScope mk(decl.ITypeProcStmtScope *, bool owned=*)
+
 cdef class TypeProcStmtVarDecl(TypeProcStmt):
 
     cpdef str name(self)
@@ -379,6 +388,10 @@ cdef class VisitorBase(vsc.VisitorBase):
 
     cpdef visitTypeFieldReg(self, TypeFieldReg f)
 
+    cpdef visitTypeProcStmt(self, TypeProcStmt t)
+
+    cpdef visitTypeProcStmtScope(self, TypeProcStmtScope t)
+
 cdef class WrapperBuilder(VisitorBase):
     cdef list _obj
 

zsp_arl_dm/decl.pxd

@@ -47,6 +47,7 @@ ctypedef ITypeFieldPool *ITypeFieldPoolP
 ctypedef ITypeFieldReg *ITypeFieldRegP
 ctypedef ITypeProcStmt *ITypeProcStmtP 
 ctypedef ITypeProcStmtDeclScope *ITypeProcStmtDeclScopeP 
+ctypedef ITypeProcStmtScope *ITypeProcStmtScopeP 
 ctypedef ITypeProcStmtVarDecl *ITypeProcStmtVarDeclP 
 
 cdef extern from "zsp/arl/dm/IContext.h" namespace "zsp::arl::dm":
@@ -180,6 +181,10 @@ cdef extern from "zsp/arl/dm/ITypeProcStmtDeclScope.h" namespace "zsp::arl::dm":
         void setAssociatedData(vsc.IAssociatedData *)
         pass
 
+cdef extern from "zsp/arl/dm/ITypeProcStmtScope.h" namespace "zsp::arl::dm":
+    cdef cppclass ITypeProcStmtScope(ITypeProcStmtDeclScope):
+        pass
+
 cdef extern from "zsp/arl/dm/ITypeProcStmtVarDecl.h" namespace "zsp::arl::dm":
     cdef cppclass ITypeProcStmtVarDecl(ITypeProcStmt):
         const cpp_string &name() const
@@ -206,6 +211,7 @@ cdef extern from "zsp/arl/dm/IDataTypeFunction.h" namespace "zsp::arl::dm":
         const cpp_string &name()
         vsc.IDataType *getReturnType() const
         const cpp_vector[IDataTypeFunctionParamDeclP] &getParameters() const
+        ITypeProcStmtScope *getBody() const
         DataTypeFunctionFlags getFlags() const
         bool hasFlags(DataTypeFunctionFlags) const
 

zsp_arl_dm/share/include/zsp/arl/dm/ITypeProcStmtForeach.h

@@ -19,6 +19,7 @@
  *     Author: 
  */
 #pragma once
+#include "zsp/arl/dm/ITypeProcStmt.h"
 
 namespace zsp {
 namespace arl {
@@ -27,7 +28,8 @@ namespace dm {
 
 
 
-class ITypeProcStmtForeach {
+class ITypeProcStmtForeach : 
+    public virtual ITypeProcStmt {
 public:
 
     virtual ~ITypeProcStmtForeach() { }

zsp_arl_dm/share/include/zsp/arl/dm/ITypeProcStmtScope.h

@@ -38,7 +38,7 @@ public:
 
     virtual ~ITypeProcStmtScope() { }
 
-    virtual void addStatement(ITypeProcStmt *stmt) = 0;
+    virtual void addStatement(ITypeProcStmt *stmt, bool owned=true) = 0;
 
     virtual void insertStatement(
         int32_t             i,
@@ -50,7 +50,6 @@ public:
 
     virtual const std::vector<ITypeProcStmtUP> &getStatements() const = 0;
 
-
     virtual vsc::dm::IDataTypeStruct *getLocalsT() const = 0;
 
 };

zsp_arl_dm/share/include/zsp/arl/dm/IVisitor.h

@@ -72,6 +72,7 @@ class ITypeFieldPool;
 class ITypeFieldReg;
 class ITypeFieldRegGroup;
 class ITypeFieldRegGroupArr;
+class ITypeProcStmt;
 class ITypeProcStmtAssign;
 class ITypeProcStmtBreak;
 class ITypeProcStmtContinue;
@@ -209,6 +210,8 @@ public:
 
 	virtual void visitTypeFieldRegGroupArr(ITypeFieldRegGroupArr *f) = 0;
 
+	virtual void visitTypeProcStmt(ITypeProcStmt *s) = 0;
+
 	virtual void visitTypeProcStmtAssign(ITypeProcStmtAssign *s) = 0;
 
 	virtual void visitTypeProcStmtBreak(ITypeProcStmtBreak *s) = 0;

zsp_arl_dm/share/include/zsp/arl/dm/impl/VisitorBase.h

@@ -369,28 +369,33 @@ public:
         dynamic_cast<IVisitor *>(m_this)->visitTypeFieldRegGroup(f);
     }
 
+	virtual void visitTypeProcStmt(ITypeProcStmt *s) override { }
+
 	virtual void visitTypeProcStmtAssign(ITypeProcStmtAssign *s) override {
+        visitTypeProcStmt(s);
 		s->getLhs()->accept(m_this);
 		s->getRhs()->accept(m_this);
 	}
 
 	virtual void visitTypeProcStmtBreak(ITypeProcStmtBreak *s) override {
-
+        visitTypeProcStmt(s);
 	}
 
 	virtual void visitTypeProcStmtContinue(ITypeProcStmtContinue *s) override {
-
+        visitTypeProcStmt(s);
 	}
 
 	virtual void visitTypeProcStmtExpr(ITypeProcStmtExpr *s) override {
+        visitTypeProcStmt(s);
         s->getExpr()->accept(m_this);
 	}
 
 	virtual void visitTypeProcStmtForeach(ITypeProcStmtForeach *s) override {
-
+        visitTypeProcStmt(s);
 	}
     
 	virtual void visitTypeProcStmtIfClause(ITypeProcStmtIfClause *s) override {
+        visitTypeProcStmt(s);
         s->getCond()->accept(m_this);
         if (s->getStmt()) {
             s->getStmt()->accept(m_this);
@@ -409,26 +414,31 @@ public:
 	}
 
 	virtual void visitTypeProcStmtMatch(ITypeProcStmtMatch *s) override {
+        visitTypeProcStmt(s);
 		s->getCond()->accept(m_this);
 	}
 
 	virtual void visitTypeProcStmtRepeat(ITypeProcStmtRepeat *s) override {
+        visitTypeProcStmt(s);
 		s->getExpr()->accept(m_this);
 		s->getBody()->accept(m_this);
 	}
 
 	virtual void visitTypeProcStmtRepeatWhile(ITypeProcStmtRepeatWhile *s) override {
+        visitTypeProcStmt(s);
 		s->getExpr()->accept(m_this);
 		s->getBody()->accept(m_this);
 	}
 
 	virtual void visitTypeProcStmtReturn(ITypeProcStmtReturn *s) override {
+        visitTypeProcStmt(s);
 		if (s->getExpr()) {
 			s->getExpr()->accept(m_this);
 		}
 	}
 
 	virtual void visitTypeProcStmtScope(ITypeProcStmtScope *s) override {
+        visitTypeProcStmt(s);
 		for (std::vector<ITypeProcStmtUP>::const_iterator
 			it=s->getStatements().begin();
 			it!=s->getStatements().end(); it++) {
@@ -437,6 +447,7 @@ public:
 	}
 
 	virtual void visitTypeProcStmtVarDecl(ITypeProcStmtVarDecl *s) override {
+        visitTypeProcStmt(s);
 		s->getDataType()->accept(m_this);
 		if (s->getInit()) {
 			s->getInit()->accept(m_this);
@@ -444,11 +455,14 @@ public:
 	}
 
 	virtual void visitTypeProcStmtWhile(ITypeProcStmtWhile *s) override {
+        visitTypeProcStmt(s);
 		s->getCond()->accept(m_this);
 		s->getBody()->accept(m_this);
 	}
 
-	virtual void visitTypeProcStmtYield(ITypeProcStmtYield *s) override { }
+	virtual void visitTypeProcStmtYield(ITypeProcStmtYield *s) override { 
+        visitTypeProcStmt(s);
+    }
 };
 
 }

{zuspec_arl_dm-0.1.0.15657945394rc0.dist-info → zuspec_arl_dm-0.1.0.15695543496rc0.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: zuspec-arl-dm
-Version: 0.1.0.15657945394rc0
+Version: 0.1.0.15695543496rc0
 Summary: Core ARL data model library
 Home-page: https://github.com/zuspec/zuspec-arl-dm
 Author: Matthew Ballance

{zuspec_arl_dm-0.1.0.15657945394rc0.dist-info → zuspec_arl_dm-0.1.0.15695543496rc0.dist-info}/RECORD

@@ -1,10 +1,10 @@
-zsp_arl_dm/__build_num__.py,sha256=LuKAi8Xi9b1ZF-WzpVckNiP7P_qbxcur1mrbQzzofAc,22
+zsp_arl_dm/__build_num__.py,sha256=Amrly5xp8HRhyb7x32fE6uQNVZAiaDEtKBfd_pIEXgQ,22
 zsp_arl_dm/__init__.py,sha256=N33P0a6ikaol69ZRGjkDlHTIT5dT8ZKeTTSe8twYJXo,590
-zsp_arl_dm/__version__.py,sha256=dINxBhDFGCjQyxMZCp1vioko982Vv7EqXR_gAEi5rj0,70
-zsp_arl_dm/core.cpython-39-x86_64-linux-gnu.so,sha256=kQqHCj_0dVuwtFVCSXgId3lT8mLi6OfWYnX5HqExUxI,6002088
-zsp_arl_dm/core.pxd,sha256=5bapjU4Vm12iAN-leiJY3U-JWYwiu3jeq4AHUE-Y330,11775
-zsp_arl_dm/decl.pxd,sha256=DRxwTNKK8JC_2tzrAkhpMU1qyiXSUJwAjRtv8C29esY,13661
-zsp_arl_dm/libzsp-arl-dm.so,sha256=f2aZB7Nk3Hr0AWhGatDmz-ZHGwj25YWv5gZ8WUTkFOo,2835184
+zsp_arl_dm/__version__.py,sha256=0qeZonehMXCGlcLz7SOLKtp5Pt6vI1gt1qdFAVf1NCE,70
+zsp_arl_dm/core.cpython-39-x86_64-linux-gnu.so,sha256=nyi-WNEHzLhkgWkbhaALla5gYXSLYwYCShGOCiGkS_M,6166952
+zsp_arl_dm/core.pxd,sha256=ZwnnpTzGM_U3x0CZlQbwory0NylII4qZHWwm7Z7J1WI,12100
+zsp_arl_dm/decl.pxd,sha256=xALL5wmGBlvJIBpq0E8cS__Sjh-J8zTuDPoRAH8m9Uw,13908
+zsp_arl_dm/libzsp-arl-dm.so,sha256=NW06kJ6AS7rFejFSVPoYVHe61FZDfjGhs8238Ot9Nz8,2843688
 zsp_arl_dm/pkginfo.py,sha256=wbpXOPUuw0u0wvMgHzAEvBv6YHbmvAEaBIM2W3Pa0TI,803
 zsp_arl_dm/py_val_to_val_ref.py,sha256=YR8-VkVNPqzgeoHC6Bp3VMs4JJOx3ehV_uTgyUYEX_8,1451
 zsp_arl_dm/val_ref_to_py_val.py,sha256=55ypBnVrYGblHwH0d0oUN_HgHgBmhgwCHAGjejB6Olg,1766
@@ -113,7 +113,7 @@ zsp_arl_dm/share/include/zsp/arl/dm/ITypeProcStmtBreak.h,sha256=awHF7ZWU-gTVFHlL
 zsp_arl_dm/share/include/zsp/arl/dm/ITypeProcStmtContinue.h,sha256=6STm5tZeIn2VRkCfLcNXTf28qOcwpkXhB3eABD8d-YM,914
 zsp_arl_dm/share/include/zsp/arl/dm/ITypeProcStmtDeclScope.h,sha256=rQnN-uyXwgQTWJ7-NghBg2pI8mF-v2eEl6x1ClKaUgQ,1049
 zsp_arl_dm/share/include/zsp/arl/dm/ITypeProcStmtExpr.h,sha256=_cfdCN2n7d_-dFsMqyjYbWKIJESySPAXUS2cY_8t7Xg,1046
-zsp_arl_dm/share/include/zsp/arl/dm/ITypeProcStmtForeach.h,sha256=eU8zhyLh6Kjds5DweIUd8XmIFNAku3JQIiG0up2CyLA,844
+zsp_arl_dm/share/include/zsp/arl/dm/ITypeProcStmtForeach.h,sha256=jY99ymB6FZv6z938-U4VQ4r_6Bj0lPVXVvdkfYk85Sk,918
 zsp_arl_dm/share/include/zsp/arl/dm/ITypeProcStmtIfClause.h,sha256=1rjJOAKn11v6ufgFohDohYJngoIqIer_jtdZyt6dOwA,1200
 zsp_arl_dm/share/include/zsp/arl/dm/ITypeProcStmtIfElse.h,sha256=AwGL70aHpMgRMmAlaTNc7X9IQ-jh6X0ZPCcUZTogfeQ,1266
 zsp_arl_dm/share/include/zsp/arl/dm/ITypeProcStmtMatch.h,sha256=hOtCXwNdnB1kAfT4g0iSkvzIgy6se64cy0nA0bXewe0,1294
@@ -121,11 +121,11 @@ zsp_arl_dm/share/include/zsp/arl/dm/ITypeProcStmtMatchChoice.h,sha256=2OpjqPwLle
 zsp_arl_dm/share/include/zsp/arl/dm/ITypeProcStmtRepeat.h,sha256=yiDTx_aSQEyxhtrVSIBdnNjIKXwmF-tlr20gIYho_f0,1098
 zsp_arl_dm/share/include/zsp/arl/dm/ITypeProcStmtRepeatWhile.h,sha256=5FDyMfiybUrQne7Y_kwqFJ9iyeIDVYoUGUps1V2q2S8,1057
 zsp_arl_dm/share/include/zsp/arl/dm/ITypeProcStmtReturn.h,sha256=vNMZJOdZwofmnBU4uGoya8GnwG1-sIHvcnxwHl-ZKJ4,1063
-zsp_arl_dm/share/include/zsp/arl/dm/ITypeProcStmtScope.h,sha256=pwDNw4ZXTUFnjGouaKXJzR6Kp0yJq7CN0RtFHQEFy9o,1535
+zsp_arl_dm/share/include/zsp/arl/dm/ITypeProcStmtScope.h,sha256=zRl08wGx9mUuz5x_5E7zwceF9fq0Ub6tkLQfspNZaqk,1551
 zsp_arl_dm/share/include/zsp/arl/dm/ITypeProcStmtVarDecl.h,sha256=sLdeHvyBqDZjKkRbBjR2A4GA3MYF6-g0INw9_VQtEGs,1224
 zsp_arl_dm/share/include/zsp/arl/dm/ITypeProcStmtWhile.h,sha256=L_xxSI4KHDS1PQGO-PU4v_TKpNQC9pyTAYnBk69vbsI,1040
 zsp_arl_dm/share/include/zsp/arl/dm/ITypeProcStmtYield.h,sha256=Gko5uDlXn2gQM_JmYH_WjBVzA_rOyi1dapxcqgEax0Q,969
-zsp_arl_dm/share/include/zsp/arl/dm/IVisitor.h,sha256=a_LkfUy5Mv2ZI8pFa53zClnIp9JcckijBQLqmT-7PJA,7484
+zsp_arl_dm/share/include/zsp/arl/dm/IVisitor.h,sha256=gKb17lW80WW4kd6THU7neWxobrQE1z3AvQXZPK6RybU,7561
 zsp_arl_dm/share/include/zsp/arl/dm/TypeKindE.h,sha256=PMDxML78G8aMOHWAGCuvRyttEnXTi0tbnBkrWiL4n-Q,205
 zsp_arl_dm/share/include/zsp/arl/dm/loader.h,sha256=g4SGemWA6cDKOY_sbxuwWPAm2uBFlHElA5pauW5PUd0,703
 zsp_arl_dm/share/include/zsp/arl/dm/impl/ContextDelegator.h,sha256=T3FMgj97g4LyI8JO-YrHvUtrvpSXVF6b8Isgh8g0INs,17939
@@ -156,11 +156,11 @@ zsp_arl_dm/share/include/zsp/arl/dm/impl/ValRefActivity.h,sha256=riWX684cswA067J
 zsp_arl_dm/share/include/zsp/arl/dm/impl/ValRefActivityScope.h,sha256=mOyew78txm7nja0SRUsEslJHYDOiVdmpTMZz-R9J82U,1204
 zsp_arl_dm/share/include/zsp/arl/dm/impl/ValRefPyObj.h,sha256=hraEVEtMAoGqTDAGeHKYARM3beCN8GZsOZMms0GTpoc,1720
 zsp_arl_dm/share/include/zsp/arl/dm/impl/ValRefRegGroup.h,sha256=-gVj9_XzaMDiiVmyB1md_Zhy0mFtCekZ25tMje44E7Q,770
-zsp_arl_dm/share/include/zsp/arl/dm/impl/VisitorBase.h,sha256=zF1MNmBv9u3OZtknaWYYq9tCtVlKvNfVC8XVGBfAN78,14109
+zsp_arl_dm/share/include/zsp/arl/dm/impl/VisitorBase.h,sha256=zG1J8pk9wDXVAI6jLl32aqDvXM0dfkUvOQmx0KjKjKQ,14595
 zsp_arl_dm/share/include/zsp/arl/dm/impl/VisitorDelegator.h,sha256=MLGa_fpcxMnXXZeJdA08YGXuRjIIbi5iOKQpnR0UZSU,12107
-zuspec_arl_dm-0.1.0.15657945394rc0.dist-info/METADATA,sha256=PQG5IOGgRjk0N_ekzO1bFSh-NO0E8YBrKOj-BhjLfZY,621
-zuspec_arl_dm-0.1.0.15657945394rc0.dist-info/WHEEL,sha256=GgX20VmKcCojXA25QwkMazru5rPDAsLYhjc0VMiPAHQ,111
-zuspec_arl_dm-0.1.0.15657945394rc0.dist-info/entry_points.txt,sha256=jxFRIvxv_Sbzcq2zGTUzfchCU897rff3sf0GhXCORkc,58
-zuspec_arl_dm-0.1.0.15657945394rc0.dist-info/top_level.txt,sha256=7fnHcUBlcctB1OGMIxNO-1JX6Gt6cSIh8j2kNhxaZNY,11
-zuspec_arl_dm-0.1.0.15657945394rc0.dist-info/RECORD,,
-zuspec_arl_dm-0.1.0.15657945394rc0.dist-info/licenses/LICENSE,sha256=xx0jnfkXJvxRnG63LTGOxlggYnIysveWIZ6H3PNdCrQ,11357
+zuspec_arl_dm-0.1.0.15695543496rc0.dist-info/METADATA,sha256=Uo4Mj32FuExdXY3P-VuDRW16qsWBUF1Q8fA93hCn6Nk,621
+zuspec_arl_dm-0.1.0.15695543496rc0.dist-info/WHEEL,sha256=GgX20VmKcCojXA25QwkMazru5rPDAsLYhjc0VMiPAHQ,111
+zuspec_arl_dm-0.1.0.15695543496rc0.dist-info/entry_points.txt,sha256=jxFRIvxv_Sbzcq2zGTUzfchCU897rff3sf0GhXCORkc,58
+zuspec_arl_dm-0.1.0.15695543496rc0.dist-info/top_level.txt,sha256=7fnHcUBlcctB1OGMIxNO-1JX6Gt6cSIh8j2kNhxaZNY,11
+zuspec_arl_dm-0.1.0.15695543496rc0.dist-info/RECORD,,
+zuspec_arl_dm-0.1.0.15695543496rc0.dist-info/licenses/LICENSE,sha256=xx0jnfkXJvxRnG63LTGOxlggYnIysveWIZ6H3PNdCrQ,11357