buildz 0.8.3__tar.gz → 0.8.5__tar.gz

{buildz-0.8.3/buildz.egg-info → buildz-0.8.5}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: buildz
-Version: 0.8.3
+Version: 0.8.5
 Summary: 配置读写（基于json格式进行简化）、ioc、以及其他工具代码。a json-base file format's read and write code by python, and codes to read and product object from configure file in such format(ioc), and other tool codes
 Home-page: https://github.com/buildCodeZ/buildz
 Author: Zzz

{buildz-0.8.3 → buildz-0.8.5}/buildz/argx.py

@@ -43,12 +43,15 @@ class Fetch:
             rst[key] = args[i]
         for key in maps:
             rst[key] = maps[key]
-        for key in self.maps:
-            rkey = self.maps[key]
-            if key in rst:
-                val = rst[key]
-                rst[rkey] = val
-                del rst[key]
+        keys = list(rst.keys())
+        for key in keys:
+            while key in self.maps:
+                rkey = self.maps[key]
+                if key in rst:
+                    val = rst[key]
+                    rst[rkey] = val
+                    del rst[key]
+                key = rkey
         return rst
 
 pass

{buildz-0.8.3 → buildz-0.8.5}/buildz/base.py

@@ -96,6 +96,55 @@ class With(Base):
 pass
 
 class Args(Base):
+    @staticmethod
+    def is_args(obj):
+        return isinstance(obj, Args)
+    @staticmethod
+    def is_collect(obj):
+        return Args.is_args(obj) or type(obj) in (list, tuple, dict)
+    def __len__(self):
+        return self.size()
+    def as_dict(self, deep=False):
+        mps = dict(self.dicts)
+        if deep:
+            rst = {}
+            for k,v in mps.items():
+                if isinstance(k, Args):
+                    k = k.as_dict(deep)
+                if isinstance(v, Args):
+                    v = v.as_dict(deep)
+                rst[k]=v
+            mps = rst
+        for it in self.lists:
+            if isinstance(it, Args):
+                if len(it.lists)!=len(it):
+                    continue
+                it = it.lists
+            if len(it)!=2:
+                continue
+            if deep:
+                it = [k if not isinstance(k, Args) else k.as_dict(deep) for k in it]
+            mps[it[0]] = it[1]
+        return mps
+    def as_list(self, cmb=0, item_args = True, deep=False):
+        lst = list(self.args)
+        if deep:
+            lst = [it if not isinstance(it, Args) else it.as_list(cmb, item_args, deep) for it in lst]
+        mps = dict(self.dicts)
+        for k,v in mps.items():
+            if deep and isinstance(v, Args):
+                v = v.as_list(cmb, item_args, deep)
+            if isinstance(k, Args):
+                k = k.as_list(cmb, item_args, deep)
+            if cmb==0 or type(v)!=list:
+                it = [k,v]
+            else:
+                v = list(v)
+                v.append(k)
+            if item_args:
+                it = Args(v)
+            lst.append(it)
+        return lst
     def size(self):
         return len(self.args)+len(self.maps)
     def str(self):

{buildz-0.8.3 → buildz-0.8.5}/buildz/dz/mapz.py

@@ -1,4 +1,5 @@
 from buildz import pyz
+from ..base import Args
 def isdict(obj):
     return type(obj)==dict
 def islist(obj):
@@ -257,6 +258,38 @@ def l2m(arr, **maps):
     return rst
 
 pass
+def deep_fill_argx(src, target, replace=1):
+    # print(f"src:{src}")
+    # print(f"target:{target}")
+    if not isinstance(src, Args):
+        if type(src) in (list, tuple):
+            src = Args(src)
+        elif type(src)==dict:
+            src = Args([], src)
+        else:
+            return
+    tp = type(target)
+    if not isinstance(target, Args):
+        if tp == list:
+            target = Args(target)
+        elif tp == dict:
+            target = Args([], target)
+        else:
+            return
+    for it in src.lists:
+        target.args.append(it)
+    for k,v in src.dicts.items():
+        if k not in target.dicts:
+            target.dicts[k] = v
+            continue
+        tv = target.dicts[k]
+        if Args.is_collect(tv) and Args.is_collect(v):
+            deep_fill_argx(v, tv, replace)
+        elif replace:
+            #print(f"[TESTZ] replace: {k}:{tv} to {v}")
+            target.dicts[k] = v
+
+
 
 def deep_update(target, src, replace=1):
     """

{buildz-0.8.3 → buildz-0.8.5}/buildz/pathz.py

@@ -32,7 +32,9 @@ class Path(Base):
         return os.path.join(*a)
     @staticmethod
     def rjoin(path, *a):
-        a = [k.strip() for k in a if k.strip()!=""]
+        a = [k.strip() for k in a if k is not None and k.strip()!=""]
+        if len(a)==0:
+            return None
         if path is None:
             return os.path.join(*a)
         return os.path.join(path, *a)
@@ -69,6 +71,7 @@ class Path(Base):
     def __getattr__(self, name):
         return self.fcs[name]
     def call(self, *obj):
+        return self.fcs[None](*obj)
         it = obj[0]
         fc = Path.join
         if type(it) in (list, tuple):

{buildz-0.8.3 → buildz-0.8.5}/buildz/xf/cpp/loaderz/cxf.h

@@ -14,11 +14,11 @@ typedef void (*mptr_list_add)(void* obj, void* list, void* val);
 typedef void* (*mptr_exp)(void* obj, const char* s);
 
 void* loads(const char* s, void* callback);
-void* loadx(const char* s, void* callback);
+void* loadx(const char* s, void* callback, bool spc=true);
 void* loads_fcs(const char* s, fptr_create fc_create, fptr_dict_set fc_set, fptr_list_add fc_add, fptr_exp fc_exp);
-void* loadx_fcs(const char* s, fptr_create fc_create, fptr_dict_set fc_set, fptr_list_add fc_add, fptr_exp fc_exp);
+void* loadx_fcs(const char* s, fptr_create fc_create, fptr_dict_set fc_set, fptr_list_add fc_add, fptr_exp fc_exp, bool spc=true);
 void* loads_mtds(const char* s, void* obj, mptr_create fc_create, mptr_dict_set fc_set, mptr_list_add fc_add, mptr_exp fc_exp);
-void* loadx_mtds(const char* s, void* obj, mptr_create fc_create, mptr_dict_set fc_set, mptr_list_add fc_add, mptr_exp fc_exp);
+void* loadx_mtds(const char* s, void* obj, mptr_create fc_create, mptr_dict_set fc_set, mptr_list_add fc_add, mptr_exp fc_exp, bool spc=true);
 #ifdef __cplusplus
 }
 #endif

{buildz-0.8.3 → buildz-0.8.5}/buildz/xf/cpp/loaderz/init.cpp

@@ -69,7 +69,7 @@ void Loads::build(){
     mg.add(new StrDeal("\"","\"",true,false,true));
     mg.add(new PrevNextDeal());
 }
-void Loads::buildx(){
+void Loads::buildx(bool spc){
     if (mark_init)return;
     mark_init = true;
     mg.add(new KeyValDeal(":"));
@@ -77,7 +77,7 @@ void Loads::buildx(){
     mg.add(new PrevSptDeal(",",true));
     mg.add(new PrevSptDeal(";",true));
     mg.add(new PrevSptDeal("\n",false));
-    mg.add(new PrevSptDeal(" ",false));
+    if (spc)mg.add(new PrevSptDeal(" ",false));
     add_lrval(mg);
     mg.add(new ListDictDeal("[","]"));
     mg.add(new ListDictDeal("(",")"));
@@ -123,25 +123,38 @@ struct FcCallback:public Callback{
 };
 static Loads obj_loads;
 static Loads obj_loadx;
+static Loads obj_loadx_spc;
 void* loads(const char* s, void* callback){
     Callback* cb = (Callback*)callback;
     obj_loads.build();
     return obj_loads.loads(s, *cb);
 }
-void* loadx(const char* s, void* callback){
+void* loadx(const char* s, void* callback, bool spc){
     Callback* cb = (Callback*)callback;
-    obj_loadx.buildx();
-    return obj_loadx.loads(s, *cb);
+    Loads* obj_ld = NULL;
+    if(spc){
+        obj_ld = &obj_loadx_spc;
+    } else {
+        obj_ld = &obj_loadx;
+    }
+    obj_ld->buildx(spc);
+    return obj_ld->loads(s, *cb);
 }
 void* loads_fcs(const char* s, fptr_create fc_create, fptr_dict_set fc_set, fptr_list_add fc_add, fptr_exp fc_exp){
     FcCallback callback(fc_create, fc_set, fc_add, fc_exp);
     obj_loads.build();
     return obj_loads.loads(s, callback);
 }
-void* loadx_fcs(const char* s, fptr_create fc_create, fptr_dict_set fc_set, fptr_list_add fc_add, fptr_exp fc_exp){
+void* loadx_fcs(const char* s, fptr_create fc_create, fptr_dict_set fc_set, fptr_list_add fc_add, fptr_exp fc_exp, bool spc){
     FcCallback callback(fc_create, fc_set, fc_add, fc_exp);
-    obj_loadx.buildx();
-    return obj_loadx.loads(s, callback);
+    Loads* obj_ld = NULL;
+    if(spc){
+        obj_ld = &obj_loadx_spc;
+    } else {
+        obj_ld = &obj_loadx;
+    }
+    obj_ld->buildx(spc);
+    return obj_ld->loads(s, callback);
 }
 struct MethodCallback:public Callback{
     mptr_create fc_create; 
@@ -169,8 +182,14 @@ void* loads_mtds(const char* s, void* obj, mptr_create fc_create, mptr_dict_set
     obj_loads.build();
     return obj_loads.loads(s, callback);
 }
-void* loadx_mtds(const char* s, void* obj, mptr_create fc_create, mptr_dict_set fc_set, mptr_list_add fc_add, mptr_exp fc_exp){
+void* loadx_mtds(const char* s, void* obj, mptr_create fc_create, mptr_dict_set fc_set, mptr_list_add fc_add, mptr_exp fc_exp, bool spc){
     MethodCallback callback(obj, fc_create, fc_set, fc_add, fc_exp);
-    obj_loadx.buildx();
-    return obj_loadx.loads(s, callback);
+    Loads* obj_ld = NULL;
+    if(spc){
+        obj_ld = &obj_loadx_spc;
+    } else {
+        obj_ld = &obj_loadx;
+    }
+    obj_ld->buildx(spc);
+    return obj_ld->loads(s, callback);
 }

{buildz-0.8.3 → buildz-0.8.5}/buildz/xf/cpp/loaderz/init.h

@@ -7,7 +7,7 @@ struct Loads{
     bool mark_init;
     Loads();
     void build();
-    void buildx();
+    void buildx(bool spc=true);
     void* loads(const char* s, Callback& callback){
         return mg.loads(s, &callback);
     }

{buildz-0.8.3 → buildz-0.8.5}/buildz/xf/cpp/pc.cpp

@@ -3,6 +3,6 @@
 PyObject* ploads_fcs(const char* s, pfptr_create fc_create, pfptr_dict_set fc_set, pfptr_list_add fc_add, pfptr_exp fc_exp){
 	return (PyObject*)loads_fcs(s, (fptr_create)fc_create,(fptr_dict_set)fc_set, (fptr_list_add)fc_add, (fptr_exp)fc_exp);
 }
-PyObject* ploadx_fcs(const char* s, pfptr_create fc_create, pfptr_dict_set fc_set, pfptr_list_add fc_add, pfptr_exp fc_exp){
-	return (PyObject*)loadx_fcs(s, (fptr_create)fc_create,(fptr_dict_set)fc_set, (fptr_list_add)fc_add, (fptr_exp)fc_exp);
+PyObject* ploadx_fcs(const char* s, pfptr_create fc_create, pfptr_dict_set fc_set, pfptr_list_add fc_add, pfptr_exp fc_exp, bool spc){
+	return (PyObject*)loadx_fcs(s, (fptr_create)fc_create,(fptr_dict_set)fc_set, (fptr_list_add)fc_add, (fptr_exp)fc_exp, spc);
 }

{buildz-0.8.3 → buildz-0.8.5}/buildz/xf/cpp/pc.h

@@ -9,7 +9,7 @@ typedef void (*pfptr_list_add)(PyObject* list, PyObject* val);
 typedef PyObject* (*pfptr_exp)(const char* s);
 
 PyObject* ploads_fcs(const char* s, pfptr_create fc_create, pfptr_dict_set fc_set, pfptr_list_add fc_add, pfptr_exp fc_exp);
-PyObject* ploadx_fcs(const char* s, pfptr_create fc_create, pfptr_dict_set fc_set, pfptr_list_add fc_add, pfptr_exp fc_exp);
+PyObject* ploadx_fcs(const char* s, pfptr_create fc_create, pfptr_dict_set fc_set, pfptr_list_add fc_add, pfptr_exp fc_exp, bool spc);
 #ifdef __cplusplus
 }
 #endif

{buildz-0.8.3 → buildz-0.8.5}/buildz/xf/cpp/pcxf.pyx

@@ -25,7 +25,7 @@ cdef extern from "pc.h":
     ctypedef void (*fptr_dict_set)(object map, object key, object val)
     ctypedef object (*fptr_exp)(const char* msg)
     object ploads_fcs(const char* s, fptr_create fc_create, fptr_dict_set fc_set, fptr_list_add fc_add, fptr_exp fc_error)
-    object ploadx_fcs(const char* s, fptr_create fc_create, fptr_dict_set fc_set, fptr_list_add fc_add, fptr_exp fc_error)
+    object ploadx_fcs(const char* s, fptr_create fc_create, fptr_dict_set fc_set, fptr_list_add fc_add, fptr_exp fc_error, bint spc)
 
 # pass
 cdef object fCreate(int type, void* dt, int ival)noexcept:
@@ -54,7 +54,11 @@ cdef object fCreate(int type, void* dt, int ival)noexcept:
         return Args(list(),dict())
     return None
 pass
+g_as_args = False
 def fetchArgs(val):
+    global g_as_args
+    if g_as_args:
+        return val
     if type(val)==Args:
         if val.size()==len(val.lists):
             val = val.lists
@@ -105,14 +109,16 @@ def loads(s,coding="utf-8"):
     return rst
 
 pass
-def loadx(s,coding="utf-8", out_args=False):
+def loadx(s,coding="utf-8", out_args=False, as_args=False, spc = True):
     """
         和python版loadx区别：
             cpp版没有dict和list，全是Args
     """
+    global g_as_args
+    g_as_args = as_args
     if type(s)==str:
         s = s.encode(coding)
-    rst = ploadx_fcs(s, fCreate,fMapSetx,fListAddx,fError)
+    rst = ploadx_fcs(s, fCreate,fMapSetx,fListAddx,fError, spc)
     if type(rst)==Exception:
         raise rst
     # if type(rst)==list and len(rst)==0:

{buildz-0.8.3 → buildz-0.8.5}/buildz/xf/java/Test.java

@@ -6,7 +6,9 @@ public class Test {
         Object rst;
         rst = jni.loads("a,b,c,{},[1,2,3,(4,5,6),{7=8,9=0},'asdf\\n']");
         System.out.println("rst:"+rst);
-        rst = jni.loadx("(a,b,c=0)");
+        rst = jni.loadx("(a,b,c=0) x y");
+        System.out.println("rst:"+rst);
+        rst = jni.loadx("(a,b,c=0) x y", false);
         System.out.println("rst:"+rst);
     }
 }

{buildz-0.8.3 → buildz-0.8.5}/buildz/xf/java/com/buildz/xf/Loader.java

@@ -16,7 +16,10 @@ public class Loader {
         return obj;
     }
     public Object loadx(String s)throws Exception{
-        Object obj = jni.jloadx(s);
+        return loadx(s, true);
+    }
+    public Object loadx(String s, boolean spc)throws Exception{
+        Object obj = jni.jloadx(s,spc);
         if (obj instanceof Exception)throw (Exception)obj;
         if ((obj instanceof Args)&&((Args)obj).size()==0){
             return "";

{buildz-0.8.3 → buildz-0.8.5}/buildz/xf/java/com/buildz/xf/LoaderJNI.java

@@ -4,7 +4,7 @@ import java.util.Map;
 public class LoaderJNI {
     // 声明native方法
     public native Object jloads(String s);
-    public native Object jloadx(String s);
+    public native Object jloadx(String s, boolean spc);
     // 加载动态链接库
     static {
         System.loadLibrary("./jxf");

{buildz-0.8.3 → buildz-0.8.5}/buildz/xf/java/com/buildz/xf/cpp/com_buildz_xf_LoaderJNI.h

@@ -18,10 +18,10 @@ JNIEXPORT jobject JNICALL Java_com_buildz_xf_LoaderJNI_jloads
 /*
  * Class:     com_buildz_xf_LoaderJNI
  * Method:    jloadx
- * Signature: (Ljava/lang/String;)Ljava/lang/Object;
+ * Signature: (Ljava/lang/String;Z)Ljava/lang/Object;
  */
 JNIEXPORT jobject JNICALL Java_com_buildz_xf_LoaderJNI_jloadx
-  (JNIEnv *, jobject, jstring);
+  (JNIEnv *, jobject, jstring, jboolean);
 
 #ifdef __cplusplus
 }

{buildz-0.8.3 → buildz-0.8.5}/buildz/xf/java/com/buildz/xf/cpp/jxf.cpp

@@ -116,6 +116,6 @@ JNIEXPORT jobject JNICALL Java_com_buildz_xf_LoaderJNI_jloads
   }
 
 JNIEXPORT jobject JNICALL Java_com_buildz_xf_LoaderJNI_jloadx
-  (JNIEnv *env, jobject it, jstring s){
-    return (jobject)loadx_mtds(env->GetStringUTFChars(s, nullptr), (void*)env, fc_create, fc_dict_setx, fc_list_addx, fc_exp);
+  (JNIEnv *env, jobject it, jstring s, jboolean spc){
+    return (jobject)loadx_mtds(env->GetStringUTFChars(s, nullptr), (void*)env, fc_create, fc_dict_setx, fc_list_addx, fc_exp, spc);
   }

{buildz-0.8.3 → buildz-0.8.5}/buildz/xf/loaderz/deal/listmapz.py

@@ -36,6 +36,8 @@ class ListMapDeal(lr.LRDeal):
                 if i+2>=len(arr):
                     raise exp.Exp(f"u f in listmap: {arr}", arr_pos)
                 val = arr[i+2]
+                if type(obj.val)==list:
+                    obj.val = tuple(obj.val)
                 mp[obj.val]=val.val
                 i+=3
             else:

{buildz-0.8.3 → buildz-0.8.5}/buildz/xf/readz.py

@@ -81,9 +81,10 @@ def build(as_bytes=False):
 pass
 g_mgx = None
 g_colon = None
-def build_args(as_bytes=False, as_args = False, colon = True):
-    global g_mgx,g_colon
-    if g_mgx is not None and g_mgx.as_bytes == as_bytes and g_colon == colon:
+g_spc = None
+def build_args(as_bytes=False, as_args = False, colon = True, spc=True):
+    global g_mgx,g_colon, g_spc
+    if g_mgx is not None and g_mgx.as_bytes == as_bytes and g_colon == colon and g_spc == spc:
         return g_mgx
     mgs = mg.Manager(as_bytes)
     if colon:
@@ -92,7 +93,8 @@ def build_args(as_bytes=False, as_args = False, colon = True):
     mgs.add(spt.PrevSptDeal(",",1))
     mgs.add(spt.PrevSptDeal(';',1))
     mgs.add(spt.PrevSptDeal('\n'))
-    mgs.add(spt.PrevSptDeal(' '))
+    if spc:
+        mgs.add(spt.PrevSptDeal(' '))
     build_lrval(mgs)
     # mgs.add(listz.ListDeal("(", ")"))
     # mgs.add(listz.ListDeal("[", "]"))
@@ -130,8 +132,8 @@ def is_args(obj):
     return type(obj)==listmapz.Args
 
 pass
-def loads_args(s, as_args = False, out_args=False, colon = True):
-    mgs = build_args(type(s)==bytes, as_args, colon)
+def loads_args(s, as_args = False, out_args=False, colon = True, spc=True):
+    mgs = build_args(type(s)==bytes, as_args, colon, spc)
     #input = buffer.BufferInput(s)
     rst = mgs.loads(s)
     if not out_args:
@@ -167,21 +169,25 @@ def loadf(fp, bts = False, **maps):
     if not os.path.isfile(fp):
         if 'default' in maps:
             return maps['default']
+    if 'default' in maps:
+        del maps['default']
     if bts:
         s = file.bread(fp)
     else:
         s = file.fread(fp)
-    return loads(s)
+    return loads(s, **maps)
 
 pass
 def loadxf(fp, bts = False, **maps):
     if not os.path.isfile(fp):
         if 'default' in maps:
             return maps['default']
+    if 'default' in maps:
+        del maps['default']
     if bts:
         s = file.bread(fp)
     else:
         s = file.fread(fp)
-    return loadx(s)
+    return loadx(s, **maps)
 
 pass

{buildz-0.8.3 → buildz-0.8.5/buildz.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: buildz
-Version: 0.8.3
+Version: 0.8.5
 Summary: 配置读写（基于json格式进行简化）、ioc、以及其他工具代码。a json-base file format's read and write code by python, and codes to read and product object from configure file in such format(ioc), and other tool codes
 Home-page: https://github.com/buildCodeZ/buildz
 Author: Zzz

{buildz-0.8.3 → buildz-0.8.5}/setup.py

@@ -7,7 +7,7 @@ from setuptools import setup, find_packages
 
 setup(
     name = 'buildz',
-    version = '0.8.3',
+    version = '0.8.5',
     keywords='buildz',
     long_description=open('README.md', 'r', encoding="utf-8").read(),
     long_description_content_type='text/markdown',