def __init__(self):
super().__init__("bad backref")
-class namedtype(type):
- pass
-
class decoder(object):
def __init__(self):
self.reftab = []
return buf
buf[key] = self.loadtagged(fp, tag)
+ def makeobjtype(self, nm):
+ return data.namedtype.make(str(nm), (data.obj, object), {}, typename=nm)
+
def loadobj(self, fp, ref=False):
if ref:
refid = len(self.reftab)
nm = self.load(fp)
typ = self.namedtypes.get(nm)
if typ is None:
- typ = self.namedtypes[nm] = namedtype(str(nm), (data.obj, object), {})
- typ.typename = nm
+ typ = self.namedtypes[nm] = self.makeobjtype(nm)
ret = typ()
if ref:
self.reftab[refid] = ret
return self.reftab[idx]
return self.addref(self.loadint(fp))
elif pri == T_STR:
- ret = self.addref(self.loadstr(fp))
+ ret = self.loadstr(fp)
if sec == STR_SYM:
- return data.symbol.get("", ret)
- return ret
+ return self.addref(data.symbol.get("", ret))
+ return self.addref(ret)
elif pri == T_BIT:
ln = self.loadint(fp)
ret = self.addref(fp.read(ln))
return self.loadtagged(fp, tag)
def load(fp):
- decoder().load(fp)
+ return decoder().load(fp)