buildz 0.3.3__tar.gz → 0.3.5__tar.gz

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

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: buildz
-Version: 0.3.3
+Version: 0.3.5
 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.3 → buildz-0.3.5}/buildz/base.py

@@ -13,7 +13,7 @@ class Map:
         if obj is None:
             obj = {}
         else:
-            obj = dict(obj)
+            obj = builtins.dict(obj)
         obj.update(maps)
         self.__dict__[Map.Key] = obj
     def __call__(self, **maps):

{buildz-0.3.3 → buildz-0.3.5}/buildz/test_loader.py

@@ -17,6 +17,9 @@ s=r"""
         c:d
         url:"http://test.com.cn"
     }
+    # test
+    hehe: <"1", i>
+    nill: <,nil>
 }
 """
 rst = xf.loads(s)

{buildz-0.3.3 → buildz-0.3.5}/buildz/test_writer.py

@@ -30,7 +30,7 @@ s = r"""
 def test():
     obj = xfz.loads(s)
     obj = xf.loads(s)
-    rs = xf.dumps(obj,format=0,deep=0,json_format=1)
+    rs = xf.dumps(obj,format=1,deep=1,json_format=1)
     print(obj)
     print(json.dumps(obj))
     print(rs)

{buildz-0.3.3 → buildz-0.3.5}/buildz/xf/loader/base.py

@@ -9,7 +9,8 @@ class BaseDeal:
         return self._id
     def same(self, s, target):
         return self.like(s, target) == target
-    def like(self, s, target):
+    @staticmethod
+    def like(s, target):
         if type(target) ==type(s):
             return s
         if type(s)==str:

buildz-0.3.5/buildz/xf/loader/deal/lrval.py

@@ -0,0 +1,55 @@
+from .. import base
+from .. import item
+from .. import exp
+from . import lr
+from . import reval
+class Fcs:
+    def __init__(self):
+        self.maps = {}
+    def set(self, _type, fc):
+        self.maps[_type] = fc
+    def __call__(self, val, _type):
+        if _type not in self.maps:
+            raise Exception("unreginize type:"+_type)
+        return self.maps[_type](val)
+
+pass
+
+
+class LRValDeal(lr.LRDeal):
+    """
+    """
+    def init(self, left, right, fc):
+        self.sp().init(left, right, 'lrval')
+        self.fc = fc
+    def build(self, arr, l_item):
+        rst = []
+        if len(arr)!=2:
+            raise exp.FormatExp("format error find in lrval:", l_item.pos, l_item.val)
+        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)
+        try:
+            val = self.fc(rst[0], rst[1])
+        except Exception as exp1:
+            print("exp:", exp1)
+            raise exp.FormatExp("error in lrval fc:\""+str(exp1)+"\"", arr[0].pos, arr[0].val)
+        return item.DealItem(val, l_item.pos, self.id(), is_val = 1, is_lrval = 1)
+
+pass
+
+class LRReValDeal(reval.ValDeal):
+    """
+    """
+    def efc(self, val):
+        arr = val.split(self.like(self.spt, val))
+        val, _type = arr
+        return self._fc(val, _type)
+    def init(self, spt, fc):
+        self.spt = spt
+        self._fc = fc
+        pt = "^.+\s*\\"+spt+"\s*.+$"
+        self.sp().init(pt, self.efc)
+
+pass

{buildz-0.3.3 → buildz-0.3.5}/buildz/xf/loader/deal/reval.py

@@ -28,7 +28,11 @@ class ValDeal(base.BaseDeal):
         pt = self.like(self.pt, val)
         if re.match(pt, val) is None:
             return False
-        val = self.fc(val)
+        try:
+            val = self.fc(val)
+        except Exception as exp1:
+            print("exp:", exp1)
+            raise exp.FormatExp("error in reval fc:\""+str(exp1)+"\"", _item.pos, _item.val)
         queue.pop(0)
         out_item = item.DealItem(val, _item.pos, self.id(), is_val = 1)
         stack.append(out_item)

{buildz-0.3.3 → buildz-0.3.5}/buildz/xf/loader/deal/spt.py

@@ -18,16 +18,19 @@ class PrevSptDeal(base.BaseDeal):
         buffer.clean()
         crr = pos.get()
         pos.update(data)
+        item_spt = item.PrevItem(self.spt, pos.get(), self.id(), src='spt', allow_empty = self.allow_empty)
         pos.update(c)
         data = data.strip()
         if len(data)==0 and not self.allow_empty:
+            queue.append(item_spt)
             return True
         if len(data)==0:
-            if len(queue)>0 and queue[-1].check(is_val = 1):
+            if len(queue)>0 and queue[-1].any(is_val = 1, right=1):
+                queue.append(item_spt)
                 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))
+        queue.append(item_spt)
         return True
     def deal(self, queue, stack):
         bl = False

{buildz-0.3.3 → buildz-0.3.5}/buildz/xf/read.py

@@ -1,8 +1,34 @@
 
 from .loader import mg, buffer
 
-from .loader.deal import nextz, spt, strz, listz, spc, setz, mapz, reval
+from .loader.deal import nextz, spt, strz, listz, spc, setz, mapz, reval, lrval
+def bl(val):
+    trues = [BaseDeal.like(k, val) for k in ["true", "True", "1"]]
+    trues += [1,True]
+    falses = [BaseDeal.like(k, val) for k in ["false", "False", "0"]]
+    falses += [0,False]
+    if val in trues:
+        return True
+    elif val in falses:
+        return False
+    else:
+        raise Exception("unknown bool val")
 
+pass
+def build_lrval(mgs):
+    fcs = lrval.Fcs()
+    fcs.set("float", float)
+    fcs.set("f", float)
+    fcs.set("int", int)
+    fcs.set("i", int)
+    fcs.set("bool", bl)
+    fcs.set("bl", bl)
+    fcs.set("null", lambda x:None)
+    fcs.set("nil", lambda x:None)
+    fcs.set("n", lambda x:None)
+    mgs.add(lrval.LRValDeal("<",">",fcs))
+
+pass
 def build_val(mgs):
     mgs.add(reval.ValDeal("[\+\-]?\d+", int))
     mgs.add(reval.ValDeal("[\+\-]?\d+\.\d+", float))
@@ -29,8 +55,12 @@ def build():
     mgs.add(strz.PrevStrDeal("'","'",1,0,1))
     mgs.add(strz.PrevStrDeal('"','"',1,0,1))
     mgs.add(setz.SetDeal(':'))
+    mgs.add(setz.SetDeal('='))
     mgs.add(spt.PrevSptDeal(',',1))
+    mgs.add(spt.PrevSptDeal(';',1))
     mgs.add(spt.PrevSptDeal('\n'))
+    build_lrval(mgs)
+    mgs.add(listz.ListDeal("(", ")"))
     mgs.add(listz.ListDeal("[", "]"))
     mgs.add(mapz.MapDeal("{", "}"))
     mgs.add(nextz.PrevNextDeal())

{buildz-0.3.3 → buildz-0.3.5}/buildz/xf/write.py

@@ -29,7 +29,7 @@ def dumps(obj, bytes = 0, format = 0, deep = 0, json_format= 0):
     cf = conf.Conf()
     cf.set(bytes=0, format=format, deep=deep)
     if format:
-        cf.set(set=1, prev=0,line=4, spc=' ')
+        cf.set(set=1, prev=1,line=4, spc=' ')
     else:
         cf.set(set=1, prev=1)
     mgs = build(json_format)

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

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

@@ -49,6 +49,11 @@ buildz/xf/mapz.py
 buildz/xf/read.py
 buildz/xf/test_write.py
 buildz/xf/write.py
+buildz/xf/__pycache__/__init__.cpython-311.pyc
+buildz/xf/__pycache__/file.cpython-311.pyc
+buildz/xf/__pycache__/mapz.cpython-311.pyc
+buildz/xf/__pycache__/read.cpython-311.pyc
+buildz/xf/__pycache__/write.cpython-311.pyc
 buildz/xf/loader/base.py
 buildz/xf/loader/buffer.py
 buildz/xf/loader/exp.py
@@ -57,6 +62,7 @@ buildz/xf/loader/mg.py
 buildz/xf/loader/pos.py
 buildz/xf/loader/deal/listz.py
 buildz/xf/loader/deal/lr.py
+buildz/xf/loader/deal/lrval.py
 buildz/xf/loader/deal/mapz.py
 buildz/xf/loader/deal/nextz.py
 buildz/xf/loader/deal/reval.py

{buildz-0.3.3 → buildz-0.3.5}/setup.py

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