X-Git-Url: http://git.dolda2000.com/gitweb/?a=blobdiff_plain;f=coe%2Fbin.py;h=e965a79336463ab479e1b14bec213ae20ffbd649;hb=ef6415d59129ca99fa4a0c23110a43ea6abe3a64;hp=de3d6fae74e8d1d2aa541ade6f601d5e6f3f5eff;hpb=8dc0c47abac97c689406a014945e5f605dd762e1;p=coe.git diff --git a/coe/bin.py b/coe/bin.py index de3d6fa..e965a79 100644 --- a/coe/bin.py +++ b/coe/bin.py @@ -223,7 +223,7 @@ class decoder(object): buf[key] = self.loadtagged(fp, tag) def makeobjtype(self, nm): - return data.namedtype(str(nm), (data.obj, object), {}, typename=nm) + return data.namedtype.make(str(nm), (data.obj, object), {}, typename=nm) def loadobj(self, fp, ref=False): if ref: @@ -259,10 +259,10 @@ class decoder(object): 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))