[pypy-commit] pypy reflex-support: cleanup

[wlav]

Author: Wim Lavrijsen <WLavrijsen at lbl.gov>
Branch: reflex-support
Changeset: r52366:7bbc0040ea90
Date: 2012-02-10 16:37 -0800
http://bitbucket.org/pypy/pypy/changeset/7bbc0040ea90/

Log:	cleanup

diff --git a/pypy/jit/metainterp/optimizeopt/fficall.py b/pypy/jit/metainterp/optimizeopt/fficall.py
--- a/pypy/jit/metainterp/optimizeopt/fficall.py
+++ b/pypy/jit/metainterp/optimizeopt/fficall.py
@@ -128,7 +128,7 @@
     optimize_CALL_MAY_FORCE = optimize_CALL
 
     def optimize_FORCE_TOKEN(self, op):
-        # The handling of force_token needs a bit of exaplanation.
+        # The handling of force_token needs a bit of explanation.
         # The original trace which is getting optimized looks like this:
         #    i1 = force_token()
         #    setfield_gc(p0, i1, ...)
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
@@ -73,7 +73,7 @@
 
 
 class W_CPPLibrary(Wrappable):
-    _immutable_fields_ = ["cdll"]
+    _immutable_ = True
 
     def __init__(self, space, cdll):
         self.cdll = cdll
@@ -232,7 +232,7 @@
 
 
 class W_CPPOverload(Wrappable):
-    _immutable_fields_ = ["scope_handle", "func_name", "functions[*]"]
+    _immutable_ = True
 
     def __init__(self, space, scope_handle, func_name, functions):
         self.space = space
@@ -286,7 +286,7 @@
 
 
 class W_CPPDataMember(Wrappable):
-    _immutable_fields_ = ["scope_handle", "converter", "offset", "_is_static"]
+    _immutable_ = True
 
     def __init__(self, space, scope_handle, type_name, offset, is_static):
         self.space = space
@@ -333,7 +333,8 @@
 
 
 class W_CPPScope(Wrappable):
-    _immutable_fields_ = ["name", "handle"]
+    _immutable_ = True
+    _immutable_fields_ = ["methods[*]", "data_members[*]"]
 
     kind = "scope"
 
@@ -399,6 +400,8 @@
 # classes for inheritance. Both are python classes, though, and refactoring
 # may be in order at some point.
 class W_CPPNamespace(W_CPPScope):
+    _immutable_ = True
+
     kind = "namespace"
 
     def _make_cppfunction(self, method_index):
@@ -445,6 +448,8 @@
 
 
 class W_CPPType(W_CPPScope):
+    _immutable_ = True
+
     kind = "class"
 
     def _make_cppfunction(self, method_index):
@@ -506,6 +511,8 @@
 
 
 class W_ComplexCPPType(W_CPPType):
+    _immutable_ = True
+
     @jit.elidable_promote()
     def get_cppthis(self, cppinstance, scope_handle):
         offset = capi.c_base_offset(
@@ -526,7 +533,7 @@
 
 
 class W_CPPTemplateType(Wrappable):
-    _immutable_fields_ = ["name", "handle"]
+    _immutable_ = True
 
     def __init__(self, space, name, handle):
         self.space = space