zuspec-dataclasses 0.0.1.6307838556__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/extract_cpp_embedded_dsl.py

@@ -0,0 +1,197 @@
+#****************************************************************************
+#* extract_cpp_embedded_dsl.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 typing import List
+
+#
+#
+#  ZSP_DATACLASSES(TestSuite_testname, RootComp, RootAction, R"(
+#    @vdc.randclass
+#    class MyC(object):
+#      a : vdc.rand_uint32_t
+#  )")
+#
+#
+
+class DSLContent(object):
+    def __init__(self,
+                 name,
+                 root_comp,
+                 root_action,
+                 content):
+        self.name = name
+        self.root_comp = root_comp
+        self.root_action = root_action
+        self.content = content
+
+class ExtractCppEmbeddedDSL(object):
+
+    def __init__(self, 
+            file_or_fp,
+            name=None,
+            macro_name="ZSP_DATACLASSES"):
+        self._macro_name = macro_name
+        if hasattr(file_or_fp, "read"):
+            # This is a stream-like object
+            self._fp = file_or_fp
+            if name is None:
+                self._name = self._fp.name()
+        else:
+            self._fp = open(file_or_fp, "r")
+            self._name = file_or_fp
+        
+        self._lineno = 0
+        self._unget_ch = None
+        self._last_ch = None
+        self._buffer = ""
+        self._buffer_i = 0
+
+    def extract(self) -> List[DSLContent]:
+        ret = []
+
+        while self.find_macro():
+
+            lineno = self._lineno
+            while True:
+                ch = self.getch()
+
+                if ch is None or ch == '(':
+                    break
+
+            if ch is None:
+                raise Exception("Failed to parse embedded DSL @ %s:%d" % (self._name, self._lineno))
+            
+            # Now, collect the complete content of the macro
+            content = ""
+            count_b = 1
+            while count_b > 0:
+                ch = self.getch()
+
+                if ch is None:
+                    break
+                content += ch
+
+                if ch == '(':
+                    count_b += 1
+                elif ch == ')':
+                    count_b -= 1
+
+            if count_b > 0:
+                raise Exception("Unbalanced parens")
+            content = content[:-2]
+            
+            # We now have text from a macro invocation
+            start = 0
+            count_b = 0
+            params = []
+
+            for i in range(len(content)):
+                if content[i] == "," and count_b == 0:
+                    params.append(content[start:i].strip())
+                    start = i+1
+                elif content[i] == '(':
+                    count_b += 1
+                elif content[i] == ')':
+                    count_b -= 1
+
+            if count_b != 0:
+                raise Exception("Unbalanced parens while tokenizing") 
+
+            if start < len(content):
+                params.append(content[start:].strip())
+
+            if len(params) != 4:
+                raise Exception("Expected 3 params; received %d" % len(params))
+
+            if params[-1].startswith('R"('):
+                params[-1] = params[-1][3:-2]
+
+            content = params[-1].split("\n")
+            min_ws = 10000
+
+            for l in content:
+                l_strip = l.strip()
+                if l_strip != "":
+                    ws_l = len(l) - len(l_strip)
+                    if ws_l < min_ws:
+                        min_ws = ws_l
+
+            for i in range(len(content)):
+                content[i] = content[i][min_ws:]
+
+            vsc_content = "\n".join(content)
+
+            root_comp = params[1]
+            root_action = params[2]
+
+            info = DSLContent(params[0], root_comp, root_action, vsc_content)
+            ret.append(info)
+
+        self._fp.close()
+        return ret
+
+    def find_macro(self):
+
+        while True:
+            line = self._fp.readline()
+            self._lineno += 1
+
+            if line == "":
+                break
+            
+            idx = line.find(self._macro_name)
+            
+            if idx >= 0:
+                self._buffer = line
+                self._buffer_i = idx + len(self._macro_name)
+                return True
+        
+        return False
+
+    def getch(self):
+        if self._buffer is None:
+            return None
+
+        if self._buffer_i >= len(self._buffer):
+            try:
+                self._buffer = self._fp.readline()
+                self._buffer_i = 0
+                self._lineno += 1
+                if self._buffer == "":
+                    self._buffer = None
+                    return None
+            except Exception:
+                self._buffer = None
+                return None
+            
+        ret = self._buffer[self._buffer_i]
+        self._buffer_i += 1
+        return ret
+    
+    def ungetch(self, ch):
+        if self._buffer is None:
+            self._buffer = ch
+        elif self._buffer_i > 0:
+            self._buffer_i -= 1
+            self._buffer[self._buffer_i] = ch
+        else:
+            self._buffer.insert(0, ch)
+

zsp_dataclasses/util/gen_cpp_dt_defs/__main__.py

@@ -22,8 +22,78 @@
 #*
 #****************************************************************************
 
+import argparse
+import os
+import zsp_dataclasses as zdc
+from zsp_dataclasses.impl.ctor import Ctor
+from zsp_dataclasses.impl.pyctxt.context import Context
+from zsp_dataclasses.impl.generators.zsp_data_model_cpp_gen import ZspDataModelCppGen
+from ..extract_cpp_embedded_dsl import ExtractCppEmbeddedDSL
+
+def get_parser():
+    parser = argparse.ArgumentParser()
+    parser.add_argument("-o","--outdir", default="zspdefs",
+        help="Specifies the output directory")
+    parser.add_argument("-d", "--depfile",
+        help="Specifies a dependency file")
+    parser.add_argument("files", nargs='+')
+
+    return parser
+
 def main():
-    pass
+    parser = get_parser()
+    args = parser.parse_args()
+
+    deps_ts = None
+    if args.depfile is not None and os.path.isfile(args.depfile):
+        deps_ts = os.path.getmtime(args.depfile)
+
+    fragment_m = {}
+    for file in args.files:
+        print("Process %s" % file)
+        if deps_ts is not None:
+            file_ts = os.path.getmtime(file)
+            if file_ts <= deps_ts:
+                print("Skip due to deps")
+                continue
+
+        fragments = ExtractCppEmbeddedDSL(file).extract()
+        print("fragments: %s" % str(fragments))
+
+        for f in fragments:
+            if f.name in fragment_m.keys():
+                raise Exception("Duplicate fragment-name %s" % f.name)
+            fragment_m[f.name] = f
+
+    if not os.path.isdir(args.outdir):
+        os.makedirs(args.outdir, exist_ok=True)
+
+    for fn in fragment_m.keys():
+        Ctor.init(Context())
+
+        _globals = globals().copy()
+        exec(fragment_m[fn].content, _globals)
+
+        Ctor.inst().elab()
+
+        header_path = os.path.join(args.outdir, "%s.h" % fn)
+        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_comp, root_action))
+
+        pass
+
+    if args.depfile is not None:
+        with open(args.depfile, "w") as fp:
+            fp.write("\n")
 
 if __name__ == "__main__":
     main()
+

{zuspec_dataclasses-0.0.1.6307838556.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.6307838556
+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.6307838556.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
@@ -97,9 +97,10 @@ zsp_dataclasses/impl/pyctxt/type_field_activity.py,sha256=SFpdm_fOQgE1F3qKTM9gU9
 zsp_dataclasses/impl/pyctxt/type_proc_stmt_var_decl.py,sha256=S72xc5tIRiFOIv68yop77IO7a1Dy7WQ2YyZ4NSznhoE,1235
 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/gen_cpp_dt_defs/__main__.py,sha256=qj9JZGOZkn4F4S275Wepbgn_-Tic58KeNpKSlwj1RPc,932
-zuspec_dataclasses-0.0.1.6307838556.dist-info/LICENSE,sha256=xx0jnfkXJvxRnG63LTGOxlggYnIysveWIZ6H3PNdCrQ,11357
-zuspec_dataclasses-0.0.1.6307838556.dist-info/METADATA,sha256=QwyLM-Cld_hlaC26hwTmi215HeVn_dEy4z118pqX6rw,499
-zuspec_dataclasses-0.0.1.6307838556.dist-info/WHEEL,sha256=iYlv5fX357PQyRT2o6tw1bN-YcKFFHKqB_LwHO5wP-g,110
-zuspec_dataclasses-0.0.1.6307838556.dist-info/top_level.txt,sha256=BHigRYcGvNv_xCJUUv5OXgSPSoczsH3Tle0gABks4l0,16
-zuspec_dataclasses-0.0.1.6307838556.dist-info/RECORD,,
+zsp_dataclasses/util/extract_cpp_embedded_dsl.py,sha256=SyMMLumZD6fsubj40hyekYzWyrcoUGTijJH3NmK1ihY,5630
+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,,