zuspec-arl-dm 0.1.0.15657945394rc0__cp38-cp38-manylinux_2_34_x86_64.whl → 0.1.0.15695543496rc0__cp38-cp38-manylinux_2_34_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.1
 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,13 +1,19 @@
-zsp_arl_dm/decl.pxd,sha256=DRxwTNKK8JC_2tzrAkhpMU1qyiXSUJwAjRtv8C29esY,13661
+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/METADATA,sha256=6Q_ojWkkaMmJZVDFhQKTn-IY0QkwaTrN06GZtSmPDX0,446
+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/WHEEL,sha256=L3HW8fVbXzdi0Qbq6Dl6IkkMSshhqlUpffoAzAKCWvI,111
+zuspec_arl_dm-0.1.0.15695543496rc0.dist-info/LICENSE,sha256=xx0jnfkXJvxRnG63LTGOxlggYnIysveWIZ6H3PNdCrQ,11357
+zsp_arl_dm/decl.pxd,sha256=xALL5wmGBlvJIBpq0E8cS__Sjh-J8zTuDPoRAH8m9Uw,13908
 zsp_arl_dm/pkginfo.py,sha256=wbpXOPUuw0u0wvMgHzAEvBv6YHbmvAEaBIM2W3Pa0TI,803
-zsp_arl_dm/__build_num__.py,sha256=LuKAi8Xi9b1ZF-WzpVckNiP7P_qbxcur1mrbQzzofAc,22
-zsp_arl_dm/libzsp-arl-dm.so,sha256=8yaZKL1DurwfaSOUaGD7IvgHduqTe1Yn3DJGku3dUrw,2835008
+zsp_arl_dm/__build_num__.py,sha256=Amrly5xp8HRhyb7x32fE6uQNVZAiaDEtKBfd_pIEXgQ,22
+zsp_arl_dm/libzsp-arl-dm.so,sha256=NkkQAEmcvBK_NRWIxRdnz1hhZq1B15o7WXDRoGFA3HI,2839416
 zsp_arl_dm/__init__.py,sha256=N33P0a6ikaol69ZRGjkDlHTIT5dT8ZKeTTSe8twYJXo,590
-zsp_arl_dm/core.cpython-38-x86_64-linux-gnu.so,sha256=V7pRZA4DDm0J57mqvqYJsPtg6MHUGvhCBNPtoDlDiJk,4784360
+zsp_arl_dm/core.cpython-38-x86_64-linux-gnu.so,sha256=2kjYTwi1fel61JAuIurm-P3cBAI813FZ0hGZUQN9WpA,4905872
 zsp_arl_dm/val_ref_to_py_val.py,sha256=55ypBnVrYGblHwH0d0oUN_HgHgBmhgwCHAGjejB6Olg,1766
-zsp_arl_dm/__version__.py,sha256=dINxBhDFGCjQyxMZCp1vioko982Vv7EqXR_gAEi5rj0,70
+zsp_arl_dm/__version__.py,sha256=0qeZonehMXCGlcLz7SOLKtp5Pt6vI1gt1qdFAVf1NCE,70
 zsp_arl_dm/py_val_to_val_ref.py,sha256=YR8-VkVNPqzgeoHC6Bp3VMs4JJOx3ehV_uTgyUYEX_8,1451
-zsp_arl_dm/core.pxd,sha256=5bapjU4Vm12iAN-leiJY3U-JWYwiu3jeq4AHUE-Y330,11775
+zsp_arl_dm/core.pxd,sha256=ZwnnpTzGM_U3x0CZlQbwory0NylII4qZHWwm7Z7J1WI,12100
 zsp_arl_dm/share/include/TypeFieldAddrClaim.cpp,sha256=kipB25pmXCPFUuFJFi3_6TKHlFHrUc-FT6xbit4L_dQ,870
 zsp_arl_dm/share/include/TypeFieldAddrClaim.h,sha256=4p0sY0JGcbrq9tO3tpEAcazK6aq91OUKhbwkK36RLeA,860
 zsp_arl_dm/share/include/zsp/arl/dm/IDataTypeActivityBind.h,sha256=cGZjI10jQl5t3qV1g1oeEzGfj37lLGSgTM0qbBXphVk,1158
@@ -16,7 +22,7 @@ zsp_arl_dm/share/include/zsp/arl/dm/IDataTypePackedStruct.h,sha256=9iy7PWda6kEj9
 zsp_arl_dm/share/include/zsp/arl/dm/ITypeFieldReg.h,sha256=XevXY6lqphs-eRuL3EQRI6mYE3PZx9XpfLbsg_HeC9Y,1084
 zsp_arl_dm/share/include/zsp/arl/dm/IModelFieldExecutorGroup.h,sha256=DGbgy-2GeOjq_rOW9tOpUpUdi6oIYOez9O4dvcoxPrk,1230
 zsp_arl_dm/share/include/zsp/arl/dm/ITypeExprPureCompMethodCall.h,sha256=v54zJr01X7UCiiogHV96MRxQDAhHZPu_3_9UTaWBSyM,1207
-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/ITypeExec.h,sha256=HAap3E1IrH7vjlhuIiMvKjjlCq2hgFyexR_3H46ZNJA,1155
 zsp_arl_dm/share/include/zsp/arl/dm/IDataTypeTransparentAddrSpace.h,sha256=rJSgHeo5dP4nEQEPN55ti0arPrbuH0ZnqQahn-nOqNg,1096
 zsp_arl_dm/share/include/zsp/arl/dm/IArl.h,sha256=YeVQnzv1epGHscICAY4DHpuny1jN_BOuzWPBwvqNgeM,364
@@ -31,7 +37,7 @@ zsp_arl_dm/share/include/zsp/arl/dm/ITypeExprMethodCallContext.h,sha256=IGpxuDNX
 zsp_arl_dm/share/include/zsp/arl/dm/IModelActivityScope.h,sha256=X5oHG2IHu0Maljq4bjh4uJWMTQJb3-7DQLXip4lLHmE,964
 zsp_arl_dm/share/include/zsp/arl/dm/IDataTypeActivitySequence.h,sha256=FzHiRfkncGe3g0K8OJHVpV_E8NqdN5cAO1SOay-fG9o,448
 zsp_arl_dm/share/include/zsp/arl/dm/IType.h,sha256=KeYho80K3rqVnuQHwBggtfMfKd2N5u_HEVRFI-cognA,360
-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/ITypeProcStmt.h,sha256=a_nWdwCERyCUvTqDuE9NJ92gEXjaK6iBYdPMjZsL-k0,972
 zsp_arl_dm/share/include/zsp/arl/dm/ITypeFieldExecutor.h,sha256=ETr4lQU7mVLrEZXJ8U5hR3KYGn0uYVeTN135I6m_Rqo,904
 zsp_arl_dm/share/include/zsp/arl/dm/ITypeFieldRegGroup.h,sha256=kWOgExQBCdU0BAE5XByYA2cHuc73EwUvV-reBTPkfIE,964
@@ -55,7 +61,7 @@ zsp_arl_dm/share/include/zsp/arl/dm/ITypeFieldPool.h,sha256=2Zd5J4BezwaEzSBUbCoA
 zsp_arl_dm/share/include/zsp/arl/dm/IModelFieldRegRef.h,sha256=VhXqg7bZ5obMbDK9f5k-sV2ZRlrXIRq6Bo4TIz2fCI8,977
 zsp_arl_dm/share/include/zsp/arl/dm/ITypeProcStmtReturn.h,sha256=vNMZJOdZwofmnBU4uGoya8GnwG1-sIHvcnxwHl-ZKJ4,1063
 zsp_arl_dm/share/include/zsp/arl/dm/ITypeFieldExecutorClaim.h,sha256=SIvp0r-G4u0qcu3GmCsT0NWH3C3ye5EaNO9JRE2dDSc,926
-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/ITypeProcStmtExpr.h,sha256=_cfdCN2n7d_-dFsMqyjYbWKIJESySPAXUS2cY_8t7Xg,1046
 zsp_arl_dm/share/include/zsp/arl/dm/IDataTypeActivityScope.h,sha256=q9MKoT795Hpd2FQO7d8dPAMHx48aG_agGldy2XgKOBU,987
 zsp_arl_dm/share/include/zsp/arl/dm/IDataTypeReg.h,sha256=TUxP4P0Ki82CXYTspWb93-s1RDLsI93M1NhnqWNdVaA,1299
@@ -131,7 +137,7 @@ zsp_arl_dm/share/include/zsp/arl/dm/IDataTypeAddrSpaceTransparentC.h,sha256=lP10
 zsp_arl_dm/share/include/zsp/arl/dm/impl/TaskIsTypeFieldRegGroupArr.h,sha256=g07ul3zBq2HDNrqfTpAO4yaHdFiyOr-QDBV8VlU-Vfk,920
 zsp_arl_dm/share/include/zsp/arl/dm/impl/ModelBuildContext.h,sha256=l1RftDqDNbNVU92acq-j159YFhSv1wu42qTbzmpgzN8,1094
 zsp_arl_dm/share/include/zsp/arl/dm/impl/TaskVisitModelFieldClaim.h,sha256=RF-7YTtTMtkb9Fad5lVqswzpMfBQklBym-om4O5YvPY,1608
-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/TaskIsDataTypePyObj.h,sha256=LMaJ6cxV027GV931z3h6zYxobtj_td3Vo0ksuC5jSS0,1209
 zsp_arl_dm/share/include/zsp/arl/dm/impl/ModelEvalIteratorListenerBase.h,sha256=nxOeWzoUAnxwHonvNQIkPKOeXs7oRTaFEPR6IPGGCas,1633
 zsp_arl_dm/share/include/zsp/arl/dm/impl/ValRefPyObj.h,sha256=hraEVEtMAoGqTDAGeHKYARM3beCN8GZsOZMms0GTpoc,1720
@@ -158,9 +164,3 @@ zsp_arl_dm/share/include/zsp/arl/dm/impl/IsResourcePool.h,sha256=4WCfYG57dS16_LB
 zsp_arl_dm/share/include/zsp/arl/dm/impl/TaskVisitModelFieldInOut.h,sha256=ZyGqaEx3Xa7TZ_XcEqQVPZp4miw38S6mq43EIPG9PQg,1577
 zsp_arl_dm/share/include/zsp/arl/dm/impl/TaskIsPackedStruct.h,sha256=-ooq_P6eleJwckTVBy2sf4SZgh_OLWus6QZjSNj_VYU,1304
 zsp_arl_dm/share/include/zsp/arl/dm/impl/TaskIsRefGroupRef.h,sha256=uMftrmVD0acma_Tx0B0BSxhJKBbFZpLw-A00LHBVtGI,1433
-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/METADATA,sha256=8Ow1mh6WBICBxV9cHuhWL79Q67Qmwhx9O2JW_SWhOeY,446
-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/WHEEL,sha256=L3HW8fVbXzdi0Qbq6Dl6IkkMSshhqlUpffoAzAKCWvI,111
-zuspec_arl_dm-0.1.0.15657945394rc0.dist-info/LICENSE,sha256=xx0jnfkXJvxRnG63LTGOxlggYnIysveWIZ6H3PNdCrQ,11357