buildz 0.3.1__tar.gz → 0.3.3__tar.gz

buildz-0.3.3/MANIFEST.in

@@ -0,0 +1,2 @@
+include README.md
+recursive-include buildz *

{buildz-0.3.1/buildz.egg-info → buildz-0.3.3}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: buildz
-Version: 0.3.1
+Version: 0.3.3
 Summary: a json-like file format's read and write code by python, and codes to read and product object from configure file in such format
 Home-page: https://github.com/buildCodeZ/buildz
 Author: Zzz

{buildz-0.3.1 → buildz-0.3.3}/buildz/xconfz/fc_item.py

@@ -1,5 +1,6 @@
 #coding=utf-8
 from buildz.xconfz.base import *
+
 from buildz.xconfz.fmt_base import *
 
 """
@@ -37,7 +38,7 @@ pass
 """
 分割符判断
 """
-class ItemsDeal(BaseDeal):
+class ItemDeal(BaseDeal):
     def find(self, buff):
         for spt in self.spts:
             if self.check_curr(buff, spt):
@@ -74,39 +75,6 @@ class ItemsDeal(BaseDeal):
         return False
 
 pass
-class ItemDeal(BaseDeal):
-    def __init__(self, spt):
-        self.spt= spt
-    def init(self, reg):
-        self.k_spt = reg(self.spt, spt = True)
-    def prev(self, buff, queue):
-        find = self.check_curr(buff, self.spt)
-        if find is None:
-            return False
-        lf = len(find)
-        rm = buff.remain().strip()
-        pos = buff.pos_remain()
-        c_pos = buff.pos_curr()
-        _val = None
-        if len(queue)>0:
-            _val = queue[-1].val
-        if len(queue)==0 or len(rm)>0 or Key.is_inst(_val) and _val.p.spt==True:
-            #print("val:[{rm}]".format(rm=rm))
-            queue.append(Item(rm, pos))
-        queue.append(Item(self.k_spt, c_pos, find))
-        buff.deal2curr(lf)
-        return True
-    def deal(self, queue, stack):
-        if len(queue)==0:
-            return False
-        it = queue[0]
-        if self.k_spt(it.val):
-            queue.pop(0)
-            return True
-        return False
-
-pass
-
 
 '''
 数据生成格式化字符串

{buildz-0.3.1 → buildz-0.3.3}/buildz/xconfz/fc_set.py

@@ -8,7 +8,7 @@ class TypeSet:
         return str(self)
 
 pass
-class SetsDeal(BaseDeal):
+class SetDeal(BaseDeal):
     Type = TypeSet()
     def __str__(self):
         return "@@SetDeal"
@@ -39,55 +39,6 @@ class SetsDeal(BaseDeal):
         queue.append(Item(self.k_spt, c_pos, find, SetDeal.Type))
         buff.deal2curr(lf)
         return True
-    def deal(self, queue, stack):
-        if len(stack)<3:
-            return False
-        if self.k_spt(stack[-2].val):
-            if len(queue)>0:
-                val = queue[0]
-                if val.type == SetDeal.Type:
-                    return False
-            val = stack[-1]
-            if Key.is_inst(val.val):
-                return False
-            val = stack.pop(-1)
-            tmp = stack.pop(-1)
-            key = stack.pop(-1)
-            kv = KeyVal(key.val,val.val)
-            item = Item(kv, key.pos)
-            stack.append(item)
-            return True
-        return False
-
-pass
-class SetDeal(BaseDeal):
-    Type = TypeSet()
-    def __str__(self):
-        return "@@SetDeal"
-    def __repr__(self):
-        return str(self)
-    def find(self, buff):
-        for spt in self.spts:
-            if self.check_curr(buff, spt):
-                return spt
-        return None
-    def __init__(self, spt):
-        self.spt = spt
-    def init(self, reg):
-        self.k_spt = reg(k, spt = True)
-    def prev(self, buff, queue):
-        find = self.find(buff)
-        if find is None:
-            return False
-        lf = len(find)
-        rm = buff.remain().strip()
-        pos = buff.pos_remain()
-        c_pos = buff.pos_curr()
-        if len(queue)==0 or len(rm)>0:
-            queue.append(Item(rm, pos))
-        queue.append(Item(self.k_spt, c_pos, find, SetDeal.Type))
-        buff.deal2curr(lf)
-        return True
     def deal(self, queue, stack):
         if len(stack)<3:
             return False

{buildz-0.3.1 → buildz-0.3.3}/buildz/xconfz/mg_fmt.py

@@ -80,7 +80,7 @@ class JsonFormat(BaseFormat):
         value = node.value
         if value is None:
             return None
-        return json.dumps(node.value)
+        return json.dumps(node.value, ensure_ascii=False)
 
 pass
 def build_format(bts = False, size = 4, format = False, simple = 1, simple_size = 1, loads = None, as_json =False, t_single = True):

buildz-0.3.3/buildz/xf/loader/base.py

@@ -0,0 +1,50 @@
+
+class BaseDeal:
+    def sp(self):
+        return super(self.__class__, self)
+    def regist(self, mgs):
+        if self._id is None:
+            self._id = mgs.regist()
+    def id(self):
+        return self._id
+    def same(self, s, target):
+        return self.like(s, target) == target
+    def like(self, s, target):
+        if type(target) ==type(s):
+            return s
+        if type(s)==str:
+            return s.encode()
+        return s.decode()
+    def __str__(self):
+        return "BaseDeal"
+    def __repr__(self):
+        return str(self)
+    def __init__(self, *argv, **maps):
+        self._id = None
+        self.init(*argv, **maps)
+    def init(self, *argv, **maps):
+        pass
+    def prev(self, buffer, queue, pos):
+        """
+            input:
+                buffer: 1,读取字符串/字节，没有pop的时候，会保留读取的数据据, buffer.read(size=1, pop = False), buffer.pop_read(size=1)
+                        2,缓存, buffer.add(chars), buffer.lget(size=1): chars, buffer.rget(size=1): chars
+                        buffer.lpop(size=1):None, buffer.rpop(size=1)
+                queue: 存放生成节点的队列, queue=list<obj>
+                pos: 位置计算: pos.update(chars), pos.get(index=0|index<=0): return [row, column]
+            output:
+                bool: 是否进行了处理
+        """
+        return False
+    def deal(self, queue, stack):
+        """
+            input:
+                queue: 节点输入队列
+                stack: 存放生成结果的栈
+            output:
+                bool: 是否进行了处理
+        """
+        return False
+
+pass
+

buildz-0.3.3/buildz/xf/loader/buffer.py

@@ -0,0 +1,85 @@
+
+class BufferInput:
+    def __init__(self, buf):
+        self.buf = buf
+    def __call__(self, size=1):
+        s = self.buf[:size]
+        self.buf = self.buf[size:]
+        return s
+
+pass
+
+class Buffer:
+    def read(self, size = 1, pop = 0):
+        if self.s_read is None:
+            self.s_read = self.input(1)
+        l = len(self.s_read)
+        if l<size:
+            self.s_read += self.input(size-l)
+        rst = self.s_read[:size]
+        if pop:
+            self.s_read = self.s_read[size:]
+        if self.buffer is None:
+            self.buffer = self.s_read[:0]
+        return rst
+    def pop_read(self, size=1):
+        self.s_read = self.s_read[size:]
+    def init(self):
+        self.buffer = None
+        self.s_read = None
+    def __init__(self, input):
+        self.input = input
+        self.init()
+    def add(self, arr):
+        if self.buffer is None:
+            self.buffer = arr
+        else:
+            self.buffer += arr
+    def size(self):
+        if self.buffer is None:
+            return 0
+        return len(self.buffer)
+    def full(self, size = 0, right = 1):
+        if right:
+            return self.rfull(size)
+        return self.lfull(size)
+    def clean(self):
+        self.buffer = self.buffer[:0]
+    def get(self, size=1, right=1):
+        if right:
+            return self.rget(size)
+        return self.lget(size)
+    def pop(self, size=1, right=1):
+        if right:
+            return self.rpop(size)
+        return self.lpop(size)
+    def lfull(self, size = 0):
+        if self.buffer is None:
+            return self.buffer
+        if size == 0:
+            return self.buffer
+        return self.buffer[size:]
+    def rfull(self, size = 0):
+        if self.buffer is None:
+            return self.buffer
+        if size == 0:
+            return self.buffer
+        return self.buffer[:-size]
+    def lget(self, size=1):
+        if self.buffer is None:
+            return self.buffer
+        return self.buffer[:size]
+    def rget(self, size=1):
+        if self.buffer is None:
+            return self.buffer
+        return self.buffer[-size:]
+    def lpop(self, size = 1):
+        if self.buffer is None:
+            return self.buffer
+        self.buffer = self.buffer[size:]
+    def rpop(self, size=1):
+        if self.buffer is None:
+            return self.buffer
+        self.buffer = self.buffer[:-size]
+
+pass

buildz-0.3.3/buildz/xf/loader/deal/listz.py

@@ -0,0 +1,19 @@
+from .. import base
+from .. import item
+from .. import exp
+from . import lr
+class ListDeal(lr.LRDeal):
+    """
+        分隔符，有分隔符后将缓存的数据当作字符串
+    """
+    def init(self, left, right):
+        self.sp().init(left, right, 'list')
+    def build(self, arr, l_item):
+        rst = []
+        for _item in arr:
+            if not _item.check(is_val = 1):
+                raise exp.FormatExp("format error find in list:", _item.pos, _item.val)
+            rst.append(_item.val)
+        return item.DealItem(rst, l_item.pos, self.id(), is_val = 1, is_list = 1)
+
+pass

buildz-0.3.3/buildz/xf/loader/deal/lr.py

@@ -0,0 +1,70 @@
+from .. import base
+from .. import item
+from .. import exp
+class LRDeal(base.BaseDeal):
+    """
+        分隔符，有分隔符后将缓存的数据当作字符串
+    """
+    def init(self, left, right, name= "lr"):
+        self.left = left
+        self.right = right
+        self.ll = len(left)
+        self.lr = len(right)
+        self.name = name
+    def build(self, arr, l_item):
+        # implement this
+        return item.DealItem(arr, l_item.pos, self.id())
+    def err(self, s):
+        return s.replace("<lr>", self.name)
+    def prev(self, buffer, queue, pos):
+        cl = buffer.read(self.ll)
+        cr = buffer.read(self.lr)
+        if not self.same(self.left, cl) and not self.same(self.right, cr):
+            return False
+        if self.same(self.left, cl):
+            buffer.pop_read(self.ll)
+            rm = buffer.full()
+            if len(rm.strip())>0:
+                pos.update(rm)
+                raise exp.FormatExp(self.err("unexcept char before <lr> left symbol"), pos.get(), rm)
+            pos.update(cl)
+            queue.append(item.PrevItem(cl, pos.get(), self.id(), left = 1))
+        else:
+            buffer.pop_read(self.lr)
+            rm = buffer.full()
+            buffer.clean()
+            pos.update(rm)
+            # 这里对扩展不太好，需要注意
+            if len(rm.strip())>0 or len(queue)==0 or queue[-1].none(is_val = 1,type=self.id(), right=1,allow_empty=0):
+                queue.append(item.PrevItem(rm, pos.get(), is_val=1))
+            pos.update(cr)
+            queue.append(item.PrevItem(cr, pos.get(), self.id(), right = 1))
+        return True
+    def deal(self, queue, stack):
+        if len(queue)==0:
+            return False
+        _item = queue[0]
+        if not _item.check(type=self.id()):
+            return False
+        if not _item.check(left=1) and not _item.check(right=1):
+            return False
+        queue.pop(0)
+        if _item.check(left = 1):
+            stack.append(_item)
+            return True
+        rst = []
+        l_item = None
+        while len(stack)>0:
+            item_i = stack.pop(-1)
+            if item_i.check(type = self.id()) and item_i.check(left=1):
+                l_item = item_i
+                break
+            rst.append(item_i)
+        if l_item is None:
+            raise exp.FormatExp(self.err("find <lr> right symbal while not left symbal found"), _item.pos, _item.val)
+        rst.reverse()
+        rst = self.build(rst, l_item)
+        stack.append(rst)
+        return True
+
+pass

buildz-0.3.3/buildz/xf/loader/deal/mapz.py

@@ -0,0 +1,22 @@
+from .. import base
+from .. import item
+from .. import exp
+from . import lr
+class MapDeal(lr.LRDeal):
+    """
+        分隔符，有分隔符后将缓存的数据当作字符串
+    """
+    def init(self, left, right):
+        self.sp().init(left, right, "map")
+    def build(self, arr, l_item):
+        rst = []
+        for _item in arr:
+            if not _item.check(is_keyval = 1):
+                print(arr)
+                print("error _item:", _item)
+                raise exp.FormatExp("an not key-val item find in map", _item.pos, _item.val)
+            rst.append(_item.val)
+        maps = {k[0]:k[1] for k in rst}
+        return item.DealItem(maps, l_item.pos, self.id(), is_val = 1, is_map = 1)
+
+pass

buildz-0.3.3/buildz/xf/loader/deal/nextz.py

@@ -0,0 +1,22 @@
+from .. import base
+
+
+class PrevNextDeal(base.BaseDeal):
+    """
+        读取下一个字符放缓存里，应放最低优先级
+    """
+    def prev(self, buffer, queue, pos):
+        c = buffer.read(1,1)
+        if c is None or len(c)==0:
+            return False
+        buffer.add(c)
+        #pos.update(c)
+        return True
+    def deal(self, queue, stack):
+        if len(queue)==0:
+            return False
+        obj = queue.pop(0)
+        stack.append(obj)
+        return True
+
+pass

buildz-0.3.3/buildz/xf/loader/deal/reval.py

@@ -0,0 +1,37 @@
+from .. import base
+from .. import item
+from .. import exp
+from . import lr
+import re
+class ValDeal(base.BaseDeal):
+    """
+        正则表达式匹配
+    """
+    def init(self, pt, fc):
+        st = self.like("^", pt)
+        ed = self.like("$", pt)
+        if pt[0]!=st:
+            pt = st+pt
+        if pt[-1]!=ed:
+            pt = pt+ed
+        self.pt = pt
+        self.fc = fc
+    def deal(self, queue, stack):
+        if len(queue)==0:
+            return False
+        _item = queue[0]
+        if not _item.check(is_val=1, type = None):
+            return False
+        val = _item.val
+        if type(val) not in [bytes, str]:
+            return False
+        pt = self.like(self.pt, val)
+        if re.match(pt, val) is None:
+            return False
+        val = self.fc(val)
+        queue.pop(0)
+        out_item = item.DealItem(val, _item.pos, self.id(), is_val = 1)
+        stack.append(out_item)
+        return True
+
+pass

buildz-0.3.3/buildz/xf/loader/deal/setz.py

@@ -0,0 +1,35 @@
+from .. import base
+from .. import item
+from .. import exp
+from . import spt
+class SetDeal(spt.PrevSptDeal):
+    """
+        Map里的key-val读取
+    """
+    def init(self, spt):
+        self.sp().init(spt, True)
+    def deal(self, queue, stack):
+        if len(stack)<3:
+            return False
+        if not stack[-1].check(is_val=1):
+            return False
+        if not stack[-3].check(is_val=1):
+            return False
+        if not stack[-2].check(type=self.id()):
+            return False
+        if stack[-2].check(is_keyval=1):
+            return False
+        val = stack.pop(-1)
+        spt = stack.pop(-1)
+        key = stack.pop(-1)
+        if not key.check(is_val=1):
+            print("key:", key)
+            raise exp.FormatExp("not an usable key in key-val paris", key.pos, key.val)
+        if not val.check(is_val=1):
+            print("vak:", val)
+            raise exp.FormatExp("not an usable val in key-val paris", val.pos, val.val)
+        rst = [key.val, val.val]
+        stack.append(item.DealItem(rst, key.pos, self.id(), is_keyval = 1))
+        return True
+
+pass

buildz-0.3.3/buildz/xf/loader/deal/spc.py

@@ -0,0 +1,19 @@
+from .. import base
+
+
+class PrevSpcDeal(base.BaseDeal):
+    """
+        去掉左空格
+    """
+    def prev(self, buffer, queue, pos):
+        if buffer.size()>0:
+            return False
+        c = buffer.read()
+        if len(c)==0:
+            return False
+        if len(c.strip())==0:
+            buffer.pop_read()
+            return True
+        return False
+
+pass

buildz-0.3.3/buildz/xf/loader/deal/spt.py

@@ -0,0 +1,39 @@
+from .. import base
+from .. import item
+
+class PrevSptDeal(base.BaseDeal):
+    """
+        分隔符，有分隔符后将缓存的数据当作字符串
+    """
+    def init(self, spt, allow_empty = False):
+        self.spt = spt
+        self.allow_empty = allow_empty
+        self.l = len(spt)
+    def prev(self, buffer, queue, pos):
+        c = buffer.read(self.l)
+        if not self.same(c, self.spt):
+            return False
+        buffer.pop_read(self.l)
+        data = buffer.full()
+        buffer.clean()
+        crr = pos.get()
+        pos.update(data)
+        pos.update(c)
+        data = data.strip()
+        if len(data)==0 and not self.allow_empty:
+            return True
+        if len(data)==0:
+            if len(queue)>0 and queue[-1].check(is_val = 1):
+                return True
+        obj = item.PrevItem(data, crr, is_val = 1, src='spt')
+        queue.append(obj)
+        queue.append(item.PrevItem(self.spt, pos.get(), self.id(), src='spt', allow_empty = self.allow_empty))
+        return True
+    def deal(self, queue, stack):
+        bl = False
+        while len(queue)>0 and queue[0].check(type = self.id()):
+            queue.pop(0)
+            bl = True
+        return bl
+
+pass

buildz-0.3.3/buildz/xf/loader/deal/strz.py

@@ -0,0 +1,72 @@
+from .. import base
+from .. import item
+from .. import exp
+import json
+class PrevStrDeal(base.BaseDeal):
+    def init(self, left = '"', right= '"', single_line = False, note = False, translate = False):
+        self.left = left
+        self.right = right
+        self.ll = len(left)
+        self.lr = len(right)
+        self.single_line = single_line
+        self.note = note
+        self.translate = translate
+    def do_translate(self, s):
+        """
+            取巧直接调用json
+        """
+        qt = self.like('"',s)
+        ql = self.like("\\", s)
+        et = self.like("\n", s)
+        s = s.replace(qt, ql+qt)
+        arr = s.split(et)
+        outs = [json.loads(qt+k+qt) for k in arr]
+        outs = et.join(outs)
+        return outs
+    def prev(self, buffer, queue, pos):
+        cl = buffer.read(self.ll)
+        if not self.same(self.left, cl):
+            return False
+        buffer.pop_read(self.ll)
+        rm = buffer.full()
+        rm_pos = pos.get()
+        if len(rm.strip())>0 and not self.note:
+            print("left:", self.left, rm)
+            raise exp.FormatExp("unexcept char before string", pos.get(), rm)
+        pos.update(rm)
+        pos.update(cl)
+        buffer.clean()
+        tmp = cl[:0]
+        ctmp = tmp[:0]
+        while True:
+            if self.same(self.right, ctmp[-self.lr:]):
+                break
+            c = buffer.read(1,1)
+            if len(c)==0:
+                pos.update(tmp)
+                raise exp.FormatExp("unexcept file end while reading string", pos.get())
+            tmp += c
+            if self.same("\\", c) and self.translate:
+                c = buffer.read(1,1)
+                if len(c)==0:
+                    pos.update(tmp)
+                    raise exp.FormatExp("unexcept file end while reading string", pos.get())
+                tmp += c
+                continue
+            ctmp+=c
+        xtmp = tmp[:-self.lr]
+        if not self.note and self.single_line and xtmp.find(self.like("\n", xtmp))>=0:
+            print("left:",self.left, "right:", self.right)
+            raise exp.FormatExp("contain enter in single line string", pos.get(), tmp)
+        if self.translate:
+            xtmp = self.do_translate(xtmp)
+        curr_pos = pos.get()
+        pos.update(tmp)
+        if self.note:
+            if len(rm)>0:
+                queue.append(item.PrevItem(rm, rm_pos, is_val = 1, src='str'))
+            return True
+        queue.append(item.PrevItem(xtmp, curr_pos, self.id(), is_val = 1, src='str'))
+        return True
+
+pass

buildz-0.3.3/buildz/xf/loader/exp.py

@@ -0,0 +1,12 @@
+'''
+格式化报错
+'''
+class FormatExp(Exception):
+    def __init__(self, err, data, s = ""):
+        if len(s)==0:
+            errs = "Error: {err}, line: {line}, index: {index}".format(err = err, line = data[0], index = data[1])
+        else:
+            errs = "Error: {err}, line: {line}, index: {index}, content: [{s}]".format(err = err, line = data[0], index = data[1], s = s)
+        super(FormatExp, self).__init__(errs)
+
+pass

buildz-0.3.3/buildz/xf/loader/item.py

@@ -0,0 +1,48 @@
+
+'''
+数据封装类
+val是数据（字符）值
+pos是字符在文件里的位置(第几行第几列)
+remain和type？
+'''
+class PrevItem:
+    def __str__(self):
+        return "<prev_item val={val}, type = {type}, pos = {pos}, maps={maps}>".format(val = str(self.val), type = str(self.type), pos = str(self.pos), maps=self._maps)
+    def __repr__(self):
+        return str(self)
+    def none(self, **maps):
+        for k in maps:
+            v = maps[k]
+            if self.maps(k)==v:
+                return False
+        return True
+    def any(self, **maps):
+        for k in maps:
+            v = maps[k]
+            if self.maps(k)==v:
+                return True
+        return False
+    def check(self, **maps):
+        for k in maps:
+            v = maps[k]
+            if self.maps(k)!=v:
+                return False
+        return True
+    def maps(self, key):
+        if key not in self._maps:
+            if key == 'type':
+                return self.type
+            return None
+        return self._maps[key]
+    def __init__(self, val, pos, type = None, remain=None, **maps):
+        self.val= val
+        self.pos= pos
+        self.remain= remain
+        self._maps = maps
+        self.type = type
+
+pass
+class DealItem(PrevItem):
+    def __str__(self):
+        return "<deal_item val={val}, type = {type}, pos = {pos}, maps={maps}>".format(val = str(self.val), type = str(self.type), pos = str(self.pos), maps=self._maps)
+