[pypy-commit] pypy reflex-support: rtyper fixes
wlav
noreply at buildbot.pypy.org
Sun Jul 1 23:31:06 CEST 2012
Author: Wim Lavrijsen <WLavrijsen at lbl.gov>
Branch: reflex-support
Changeset: r55890:5e11ea617ab8
Date: 2012-07-01 14:30 -0700
http://bitbucket.org/pypy/pypy/changeset/5e11ea617ab8/
Log: rtyper fixes
diff --git a/pypy/module/cppyy/interp_cppyy.py b/pypy/module/cppyy/interp_cppyy.py
--- a/pypy/module/cppyy/interp_cppyy.py
+++ b/pypy/module/cppyy/interp_cppyy.py
@@ -540,17 +540,18 @@
alldir = []
for i in range(capi.c_num_scopes(self)):
sname = capi.c_scope_name(self, i)
- if sname: alldir.append(sname)
- allmeth = []
+ if sname: alldir.append(self.space.wrap(sname))
+ allmeth = {}
for i in range(capi.c_num_methods(self)):
idx = capi.c_method_index_at(self, i)
mname = capi.c_method_name(self, idx)
- if mname: allmeth.append(mname)
- alldir += set(allmeth)
+ if mname: allmeth.setdefault(mname, 0)
+ for m in allmeth.keys():
+ alldir.append(self.space.wrap(m))
for i in range(capi.c_num_datamembers(self)):
dname = capi.c_datamember_name(self, i)
- if dname: alldir.append(dname)
- return self.space.wrap(alldir)
+ if dname: alldir.append(self.space.wrap(dname))
+ return self.space.newlist(alldir)
W_CPPNamespace.typedef = TypeDef(
More information about the pypy-commit
mailing list