buildz 0.7.4__tar.gz → 0.7.6__tar.gz

{buildz-0.7.4/buildz.egg-info → buildz-0.7.6}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: buildz
-Version: 0.7.4
+Version: 0.7.6
 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.7.4 → buildz-0.7.6}/buildz/db/dv/basez.py

@@ -85,6 +85,8 @@ class SimpleDv(ItDv):
         self.as_map = as_map
         self.init(*argv, **maps)
     def begin(self):
+        if self.con is not None:
+            return
         self.con = self.new_con()
         self.cursor = self.new_cursor()
     def open(self):
@@ -122,7 +124,7 @@ class SimpleDv(ItDv):
         if commit:
             self.cursor.execute("commit;")
         return tmp
-    def iou_sql(self, table, ks, vs, sets):
+    def iou_sql(self, table, ks, vs, sets, qs):
         sql = f"insert into {table}({ks}) values({vs}) on duplicate key update {sets}"
         return sql
     def insert_or_update(self, maps, table, keys = None, update_keys = None):
@@ -162,7 +164,7 @@ class SimpleDv(ItDv):
         sets = ",".join(sets)
         ks = ",".join([kv[0] for kv in kvs])
         vs = ",".join([str(kv[1]) for kv in kvs])
-        sql = self.iou_sql(table, ks, vs, sets)
+        sql = self.iou_sql(table, ks, vs, sets, keys)
         #sql = f"insert into {table}({ks}) values({vs}) on duplicate key update {sets}"
         return self.execute(sql)
         if update:

{buildz-0.7.4 → buildz-0.7.6}/buildz/db/dv/orm.py

@@ -60,7 +60,7 @@ def make(data, table=None, data_keys = "sql_key,sql_def,py_key".split(","), py_n
                     key:
                         table: 表名
                         query_keys: 默认null，orm做插入/更新时，判断数据是插入还是更新的查询方式
-                        auto_translate: 默认true，如果没有配置“转py后字段名”，是否自动转(a_b=>aB)
+                        auto_translate: 默认false，如果没有配置“转py后字段名”，是否自动转(a_b=>aB)
                         sql_before: 新增一条建表前sql语句
                         sql_after: 新增一条建表后sql语句
                         sql_delete_before: 新增一条删表前sql语句
@@ -78,7 +78,7 @@ def make(data, table=None, data_keys = "sql_key,sql_def,py_key".split(","), py_n
     elif type(data) == dict:
         data = dict2list(data)
     conf = {}
-    xf.s(conf, sql_before = [], sql_after = [], sql_delete_before=[], sql_delete_after=[],auto_translate=True,table=table,keys=[],py2sqls={},query_keys=None, data_keys = data_keys, vars=[], py_name = py_name)
+    xf.s(conf, sql_before = [], sql_after = [], sql_delete_before=[], sql_delete_after=[],auto_translate=False,table=table,keys=[],py2sqls={},query_keys=None, data_keys = data_keys, vars=[], py_name = py_name)
     for it in data:
         if len(it)==1 and type(it[0]) in (list, tuple):
             deal_item(it[0], conf)
@@ -99,7 +99,7 @@ def make(data, table=None, data_keys = "sql_key,sql_def,py_key".split(","), py_n
     sqls_del = sqls[2]+[sql_del]+sqls[3]
     sqls = [sqls_crt, sqls_del]
     sqls = [(";\n".join(k)+";").replace(";;",";") for k in sqls]
-    obj = TableObject(*xf.g(conf, keys=[], table=table, py2sqls = None, query_keys=None,auto_translate=True), sql_create = sqls[0], sql_delete = sqls[1], py_name = py_name)
+    obj = TableObject(*xf.g(conf, keys=[], table=table, py2sqls = None, query_keys=None,auto_translate=False), sql_create = sqls[0], sql_delete = sqls[1], py_name = py_name)
     return sqls, obj
 
 pass
@@ -119,7 +119,7 @@ class TableObject(Base):
         auto_translate:
             对于没有在py2sqls自定义映射的表字段，是否自动转换(py|autoTran<=>auto_tran|sql)
     """
-    def init(self, keys, table=None, py2sqls=None, query_keys=None, auto_translate=True, dv = None, sql_create=None, sql_delete=None, py_name = None):
+    def init(self, keys, table=None, py2sqls=None, query_keys=None, auto_translate=False, dv = None, sql_create=None, sql_delete=None, py_name = None):
         self.src_py2sqls = py2sqls
         if table is None:
             table = tls.lower(self.__class__.__name__)
@@ -148,7 +148,7 @@ class TableObject(Base):
             query_keys = []
         self.query_keys = query_keys
         self.dv = dv
-        self.py2sql=self.toSql
+        self.py2sql=self.to_sql
         self.sql2py = self.toPy
         self.sql_create = sql_create
         self.sql_delete = sql_delete
@@ -160,7 +160,7 @@ class TableObject(Base):
         #print(f"[TESTZ] sql_create: {self.sql_create}")
         dv = self.rdv(dv)
         dv.executes(self.sql_create)
-    def delete(self, dv=None):
+    def drop(self, dv=None):
         assert self.sql_delete is not None
         if self.sql_delete.find("<table>")>=0:
             print(f"[WARN] not delete template table by {self.sql_delete}")
@@ -168,7 +168,7 @@ class TableObject(Base):
         self.rdv(dv).execute(self.sql_delete)
     def bind(self, dv):
         self.dv = dv
-    def toSql(self, obj):
+    def to_sql(self, obj):
         if type(obj)!=dict:
             tmp = {}
             for k in self.py2sqls:
@@ -177,7 +177,7 @@ class TableObject(Base):
             obj = tmp
         obj = {self.py2sqls[k]:v for k,v in obj.items() if k in self.py2sqls}
         return obj
-    def toSqlKeys(self, keys):
+    def to_sql_keys(self, keys):
         obj = [k for k in keys if k in self.py2sqls]
         return obj
     def toPy(self, obj):
@@ -200,10 +200,10 @@ class TableObject(Base):
         if sql2py:
             rst = [self.sql2py(it) for it in rst]
         return rst
-    def queryAll(self, dv=None, sql2py=True):
+    def query_all(self, dv=None, sql2py=True):
         sql = f"select * from {self.table};"
         return self.query(sql, dv, sql2py)
-    def filterSql(self, obj):
+    def filter_sql(self, obj):
         if type(obj)!=dict:
             tmp = {}
             for k in self.sql2py:
@@ -219,11 +219,11 @@ class TableObject(Base):
         if type(obj) not in [list, tuple]:
             obj = [obj]
         if py2sql:
-            obj = [self.toSql(k) for k in obj]
+            obj = [self.to_sql(k) for k in obj]
             if update_keys is not None:
-                update_keys = self.toSqlKeys(update_keys)#[self.toSqlKeys(k) for k in update_keys]
+                update_keys = self.to_sql_keys(update_keys)#[self.to_sql_keys(k) for k in update_keys]
         else:
-            obj = [self.filterSql(k) for k in obj]
+            obj = [self.filter_sql(k) for k in obj]
         query_keys = self.query_keys
         if not check:
             query_keys = None

{buildz-0.7.4 → buildz-0.7.6}/buildz/db/dv/sqlite3z.py

@@ -90,8 +90,8 @@ class Db(SimpleDv):
             rst = rst[1:]
             rst = [{k:v for k,v in zip(keys, dt)} for dt in rst]
         return rst
-    def iou_sql(self, table, ks, vs, sets):
-        sql = f"insert into {table}({ks}) values({vs}) ON CONFLICT DO UPDATE SET {sets}"
+    def iou_sql(self, table, ks, vs, sets, qs):
+        sql = f"insert into {table}({ks}) values({vs}) ON CONFLICT({','.join(qs)}) DO UPDATE SET {sets}"
         return sql
     def insert_or_updatexxx(self, maps, table, keys = None, update_keys = None):
         if type(maps)!=dict:

{buildz-0.7.4 → buildz-0.7.6}/buildz/tz/myers_diff.py

@@ -1,7 +1,6 @@
 #codig=utf-8
 import os
 import re
-import numpy as np
 import base64
 ACT_ADD = "add_prev"
 ACT_DEL = "del_curr"

{buildz-0.7.4 → buildz-0.7.6}/buildz/xf/cpp/Makefile

@@ -1,10 +1,10 @@
-.PHONY: cpp_depend ALL
+.PHONY: ALL
 TARGETLIB = libcxf.a
 TARGETLIB_CPP = cxf
 TARGETDYN=cxf.so
 SRC=$(wildcard loaderz/*.cpp) $(wildcard loaderz/**/*.cpp)
 OBJ=$(SRC:.cpp=.o)
-ALL:$(TARGETLIB) $(TARGETDYN)
+ALL:cpp_depend $(TARGETLIB) $(TARGETDYN)
 	echo "$(SRC)"
 
 $(TARGETDYN):$(OBJ)
@@ -16,9 +16,15 @@ test: $(OBJ)
 %.o:%.cpp
 	g++ -O3 -fPIC -Wall -g -c $< -o $@
 
-include cpp_depend
 cpp_depend:
 	g++ -MM $(SRC) > cpp_depend
 
+include cpp_depend
+
 clean:
-	rm $(OBJ)
+	rm $(OBJ) cpp_depend
+
+wclean:
+	del cpp_depend
+	del loaderz\*.o
+	del loaderz\deal\*.o

{buildz-0.7.4 → buildz-0.7.6}/buildz/xf/cpp/loaderz/cxf.h

@@ -8,12 +8,17 @@ typedef void (*fptr_dict_set)(void* dict, void* key, void *val);
 typedef void (*fptr_list_add)(void* list, void* val);
 typedef void* (*fptr_exp)(const char* s);
 
+typedef void* (*mptr_create)(void* obj, int type, void* val, int ival);
+typedef void (*mptr_dict_set)(void* obj, void* dict, void* key, void *val);
+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* 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* testloads(const char* s);
-int tests(const char* s);
+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);
 #ifdef __cplusplus
 }
 #endif

{buildz-0.7.4 → buildz-0.7.6}/buildz/xf/cpp/loaderz/init.cpp

@@ -143,6 +143,34 @@ void* loadx_fcs(const char* s, fptr_create fc_create, fptr_dict_set fc_set, fptr
     obj_loadx.buildx();
     return obj_loadx.loads(s, callback);
 }
-int tests(const char* s){
-    return 123;
+struct MethodCallback:public Callback{
+    mptr_create fc_create; 
+    mptr_dict_set fc_set; 
+    mptr_list_add fc_add; 
+    mptr_exp fc_exp;
+    void* obj;
+    MethodCallback(void* obj, mptr_create fc_create, mptr_dict_set fc_set, mptr_list_add fc_add, mptr_exp fc_exp):obj(obj),
+    fc_create(fc_create),fc_set(fc_set),fc_add(fc_add),fc_exp(fc_exp){}
+    void* create(int type, void* val=NULL, int ival=0){
+        return fc_create(obj, type, val, ival);
+    }
+    void dict_set(void* dict, void* key, void *val){
+        fc_set(obj, dict, key, val);
+    }
+    void list_add(void* list, void* val){
+        fc_add(obj, list, val);
+    }
+    void* exp(const char* s){
+        return fc_exp(obj, s);
+    }
+};
+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){
+    MethodCallback callback(obj, fc_create, fc_set, fc_add, fc_exp);
+    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){
+    MethodCallback callback(obj, fc_create, fc_set, fc_add, fc_exp);
+    obj_loadx.buildx();
+    return obj_loadx.loads(s, callback);
 }

{buildz-0.7.4 → buildz-0.7.6}/buildz/xf/cpp/pcxf.pyx

@@ -54,6 +54,13 @@ cdef object fCreate(int type, void* dt, int ival)noexcept:
         return Args(list(),dict())
     return None
 pass
+def fetchArgs(val):
+    if type(val)==Args:
+        if val.size()==len(val.lists):
+            val = val.lists
+        elif val.size()==len(val.dicts):
+            val = val.dicts
+    return val
 cdef void fListAdd(object lst, object data)noexcept:
     #print("fListAdd:", lst, data)
     lst.append(data)
@@ -61,6 +68,7 @@ cdef void fListAddx(object lst, object data)noexcept:
     #print("fListAdd:", lst, data)
     if type(lst)==Args:
         lst = lst.args
+    data = fetchArgs(data)
     lst.append(data)
 cdef void fMapSet(object map, object key, object val)noexcept:
     #print("fMapSet:", map, key, val)
@@ -71,6 +79,8 @@ cdef void fMapSetx(object map, object key, object val)noexcept:
     #print("fMapSet:", map, key, val)
     if type(map)==Args:
         map = map.maps
+    key = fetchArgs(key)
+    val = fetchArgs(val)
     if type(key)==list:
         key = tuple(key)
     map[key]=val

buildz-0.7.6/buildz/xf/java/Test.java

@@ -0,0 +1,12 @@
+
+import com.buildz.xf.Loader;
+public class Test {
+    public static void main(String[] args) throws Exception{
+        Loader jni = new Loader();
+        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)");
+        System.out.println("rst:"+rst);
+    }
+}

buildz-0.7.6/buildz/xf/java/all.sh

@@ -0,0 +1,20 @@
+cd ../cpp
+make
+cd ../java
+javac -h ./com/buildz/xf/cpp com/buildz/xf/LoaderJNI.java -encoding utf-8
+javac com/buildz/xf/Loader.java -encoding utf-8
+javac com/buildz/xf/Args.java -encoding utf-8
+
+g++ -I"./com/buildz/xf/cpp" -I"$JAVA_HOME/include" -I"$JAVA_HOME/include/win32" -shared -o ./jxf.dll ./com/buildz/xf/cpp/jxf.cpp -I"../cpp" -L"../cpp" -lcxf -O3
+
+g++ -I"./com/buildz/xf/cpp" -I"%JAVA_HOME%/include" -I"%JAVA_HOME%/include/win32" -shared -o ./jxf.dll ./com/buildz/xf/cpp/jxf.cpp -I"../cpp" -L"../cpp" -lcxf -O3
+
+javac Test.java -encoding utf-8 && java -Djava.library.path=. Test
+
+clean:
+    rm ./com/buildz/xf/*.class
+    rm *.class
+
+win clean
+    del .\com\buildz\xf\*.class
+    del *.class

buildz-0.7.6/buildz/xf/java/com/buildz/xf/Args.java

@@ -0,0 +1,23 @@
+package com.buildz.xf;
+import java.util.List;
+import java.util.ArrayList;
+import java.util.Map;
+import java.util.HashMap;
+
+public class Args{
+    public String toString(){
+        return "<args list="+list.toString()+", map="+map.toString()+">";
+    }
+    public List list = new ArrayList();
+    public Map map = new HashMap();
+    public Args(){}
+    public boolean add(Object obj){
+        return list.add(obj);
+    }
+    public Object put(Object key, Object val){
+        return map.put(key, val);
+    }
+    public int size(){
+        return list.size()+map.size();
+    }
+}

buildz-0.7.6/buildz/xf/java/com/buildz/xf/Loader.java

@@ -0,0 +1,30 @@
+package com.buildz.xf;
+import java.util.List;
+import java.util.Map;
+public class Loader {
+    public static LoaderJNI jni = new LoaderJNI();
+    // 声明native方法
+    public Object loads(String s)throws Exception{
+        Object obj = jni.jloads(s);
+        if (obj instanceof Exception)throw (Exception)obj;
+        if ((obj instanceof List)&&((List)obj).size()==0){
+            return "";
+        }
+        if ((obj instanceof List)&&((List)obj).size()==1){
+            obj = ((List)obj).get(0);
+        }
+        return obj;
+    }
+    public Object loadx(String s)throws Exception{
+        Object obj = jni.jloadx(s);
+        if (obj instanceof Exception)throw (Exception)obj;
+        if ((obj instanceof Args)&&((Args)obj).size()==0){
+            return "";
+        }
+        if ((obj instanceof Args)&&((Args)obj).size()==1&&((Args)obj).list.size()==1){
+            obj = ((Args)obj).list.get(0);
+        }
+        return obj;
+    }
+
+}

buildz-0.7.6/buildz/xf/java/com/buildz/xf/LoaderJNI.java

@@ -0,0 +1,13 @@
+package com.buildz.xf;
+import java.util.List;
+import java.util.Map;
+public class LoaderJNI {
+    // 声明native方法
+    public native Object jloads(String s);
+    public native Object jloadx(String s);
+    // 加载动态链接库
+    static {
+        System.loadLibrary("./jxf");
+    }
+
+}

buildz-0.7.6/buildz/xf/java/com/buildz/xf/cpp/com_buildz_xf_LoaderJNI.h

@@ -0,0 +1,29 @@
+/* DO NOT EDIT THIS FILE - it is machine generated */
+#include <jni.h>
+/* Header for class com_buildz_xf_LoaderJNI */
+
+#ifndef _Included_com_buildz_xf_LoaderJNI
+#define _Included_com_buildz_xf_LoaderJNI
+#ifdef __cplusplus
+extern "C" {
+#endif
+/*
+ * Class:     com_buildz_xf_LoaderJNI
+ * Method:    jloads
+ * Signature: (Ljava/lang/String;)Ljava/lang/Object;
+ */
+JNIEXPORT jobject JNICALL Java_com_buildz_xf_LoaderJNI_jloads
+  (JNIEnv *, jobject, jstring);
+
+/*
+ * Class:     com_buildz_xf_LoaderJNI
+ * Method:    jloadx
+ * Signature: (Ljava/lang/String;)Ljava/lang/Object;
+ */
+JNIEXPORT jobject JNICALL Java_com_buildz_xf_LoaderJNI_jloadx
+  (JNIEnv *, jobject, jstring);
+
+#ifdef __cplusplus
+}
+#endif
+#endif

buildz-0.7.6/buildz/xf/java/com/buildz/xf/cpp/jxf.cpp

@@ -0,0 +1,121 @@
+
+#include <jni.h>
+#include <stdio.h>
+#include "com_buildz_xf_LoaderJNI.h"
+#include "loaderz/cxf.h"
+#include "loaderz/base.h"
+void* fc_create(void* obj, int type, void* val, int ival){
+    JNIEnv* env = (JNIEnv*) obj;
+    switch(type){
+        case TYPE_NULL:
+            return NULL;
+        case TYPE_BOOL:
+        {
+            jclass booleanClass = env->FindClass("java/lang/Boolean");
+            jmethodID constructor = env->GetMethodID(booleanClass, "<init>", "(Z)V");
+            jobject result = env->NewObject(booleanClass, constructor, ival==1);
+            env->DeleteLocalRef(booleanClass);
+            return (void*)result;
+        }
+        case TYPE_INT:
+        {
+            long long lval = std::stoll((const char*) val);
+            jclass longClass = env->FindClass("java/lang/Long");
+            jmethodID constructor = env->GetMethodID(longClass, "<init>", "(J)V");
+            jobject result = env->NewObject(longClass, constructor, lval);
+            env->DeleteLocalRef(longClass);
+            return (void*)result;
+        }
+        case TYPE_FLOAT:
+        {
+            double dval = std::stod((const char*) val);
+            jclass doubleClass = env->FindClass("java/lang/Double");
+            jmethodID constructor = env->GetMethodID(doubleClass, "<init>", "(D)V");
+            jobject result = env->NewObject(doubleClass, constructor, dval);
+            env->DeleteLocalRef(doubleClass);
+            return (void*)result;
+        }
+        case TYPE_STR: {
+            jstring sval = env->NewStringUTF((const char*) val);
+            return (void*)sval;
+        }
+        case TYPE_LIST:{
+            jclass mapClass = env->FindClass("java/util/ArrayList");
+            jmethodID initMethod = env->GetMethodID(mapClass, "<init>", "()V");
+            jobject hashMap = env->NewObject(mapClass, initMethod);
+            env->DeleteLocalRef(mapClass);
+            return (void*)hashMap;
+        }
+        case TYPE_DICT:{
+            jclass mapClass = env->FindClass("java/util/HashMap");
+            jmethodID initMethod = env->GetMethodID(mapClass, "<init>", "()V");
+            jobject hashMap = env->NewObject(mapClass, initMethod);
+            env->DeleteLocalRef(mapClass);
+            return (void*)hashMap;
+        }
+        case TYPE_LISTDICT:{
+            jclass mapClass = env->FindClass("com/buildz/xf/Args");
+            jmethodID initMethod = env->GetMethodID(mapClass, "<init>", "()V");
+            jobject hashMap = env->NewObject(mapClass, initMethod);
+            env->DeleteLocalRef(mapClass);
+            return (void*)hashMap;
+        }
+    }
+    return NULL;
+}
+void fc_dict_set(void* obj, void* dict, void* key, void* val){
+    JNIEnv* env = (JNIEnv*) obj;
+    jclass mapClass = env->FindClass("java/util/Map");
+    jmethodID putMethod = env->GetMethodID(mapClass, "put", 
+        "(Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object;");
+    env->CallObjectMethod((jobject)dict, putMethod, (jobject)key, (jobject)val);
+    env->DeleteLocalRef((jobject)key);
+    env->DeleteLocalRef((jobject)val);
+    env->DeleteLocalRef(mapClass);
+}
+void fc_dict_setx(void* obj, void* dict, void* key, void* val){
+    JNIEnv* env = (JNIEnv*) obj;
+    jclass mapClass = env->FindClass("com/buildz/xf/Args");
+    jmethodID putMethod = env->GetMethodID(mapClass, "put", 
+        "(Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object;");
+    env->CallObjectMethod((jobject)dict, putMethod, (jobject)key, (jobject)val);
+    env->DeleteLocalRef((jobject)key);
+    env->DeleteLocalRef((jobject)val);
+    env->DeleteLocalRef(mapClass);
+}
+void fc_list_add(void* obj, void* list, void* val){
+    JNIEnv* env = (JNIEnv*) obj;
+    jclass mapClass = env->FindClass("java/util/List");
+    jmethodID addMethod = env->GetMethodID(mapClass, "add", 
+        "(Ljava/lang/Object;)Z");
+    env->CallObjectMethod((jobject)list, addMethod, val);
+    env->DeleteLocalRef((jobject)val);
+    env->DeleteLocalRef(mapClass);
+}
+void fc_list_addx(void* obj, void* list, void* val){
+    JNIEnv* env = (JNIEnv*) obj;
+    jclass mapClass = env->FindClass("com/buildz/xf/Args");
+    jmethodID addMethod = env->GetMethodID(mapClass, "add", 
+        "(Ljava/lang/Object;)Z");
+    env->CallObjectMethod((jobject)list, addMethod, val);
+    env->DeleteLocalRef((jobject)val);
+    env->DeleteLocalRef(mapClass);
+}
+void* fc_exp(void* obj, const char* s){
+    JNIEnv* env = (JNIEnv*) obj;
+    jstring str = env->NewStringUTF(s);
+    jclass mapClass = env->FindClass("java/lang/Exception");
+    jmethodID initMethod = env->GetMethodID(mapClass, "<init>", "(Ljava/lang/String;)V");
+    jobject exp = env->NewObject(mapClass, initMethod, str);
+    env->DeleteLocalRef(mapClass);
+    return (void*)exp;
+}
+JNIEXPORT jobject JNICALL Java_com_buildz_xf_LoaderJNI_jloads
+  (JNIEnv *env, jobject it, jstring s){
+    return (jobject)loads_mtds(env->GetStringUTFChars(s, nullptr), (void*)env, fc_create, fc_dict_set, fc_list_add, fc_exp);
+  }
+
+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);
+  }

{buildz-0.7.4 → buildz-0.7.6/buildz.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: buildz
-Version: 0.7.4
+Version: 0.7.6
 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.7.4 → buildz-0.7.6}/buildz.egg-info/SOURCES.txt

@@ -316,6 +316,13 @@ buildz/xf/cpp/loaderz/deal/spt.cpp
 buildz/xf/cpp/loaderz/deal/spt.h
 buildz/xf/cpp/loaderz/deal/str.cpp
 buildz/xf/cpp/loaderz/deal/str.h
+buildz/xf/java/Test.java
+buildz/xf/java/all.sh
+buildz/xf/java/com/buildz/xf/Args.java
+buildz/xf/java/com/buildz/xf/Loader.java
+buildz/xf/java/com/buildz/xf/LoaderJNI.java
+buildz/xf/java/com/buildz/xf/cpp/com_buildz_xf_LoaderJNI.h
+buildz/xf/java/com/buildz/xf/cpp/jxf.cpp
 buildz/xf/loader/base.py
 buildz/xf/loader/buffer.py
 buildz/xf/loader/exp.py

{buildz-0.7.4 → buildz-0.7.6}/setup.py

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