Author: Carl Friedrich Bolz <cfb...@gmx.de>
Branch: value-profiling
Changeset: r78895:4c89f76ea898
Date: 2015-08-11 15:06 +0200
http://bitbucket.org/pypy/pypy/changeset/4c89f76ea898/

Log:    (cfbolz, arigo): rename attributes to lessen risk of conflict

diff --git a/pypy/interpreter/test/test_valueprof.py 
b/pypy/interpreter/test/test_valueprof.py
--- a/pypy/interpreter/test/test_valueprof.py
+++ b/pypy/interpreter/test/test_valueprof.py
@@ -19,67 +19,67 @@
 
 def test_int():
     v = ValueProf()
-    assert v.status == SEEN_NOTHING
+    assert v._vprof_status == SEEN_NOTHING
     v.see_write(ValueInt(1))
     v.see_write(ValueInt(1))
     v.see_write(ValueInt(1))
     v.see_write(ValueInt(1))
     assert v.read_constant_int() == 1
-    assert v.status == SEEN_INT
+    assert v._vprof_status == SEEN_INT
     v.see_int(2)
-    assert v.status == SEEN_TOO_MUCH
+    assert v._vprof_status == SEEN_TOO_MUCH
     v.see_int(1)
-    assert v.status == SEEN_TOO_MUCH
+    assert v._vprof_status == SEEN_TOO_MUCH
     v.see_int(2)
-    assert v.status == SEEN_TOO_MUCH
+    assert v._vprof_status == SEEN_TOO_MUCH
     v.see_int(3)
-    assert v.status == SEEN_TOO_MUCH
+    assert v._vprof_status == SEEN_TOO_MUCH
 
     v = ValueProf()
-    assert v.status == SEEN_NOTHING
+    assert v._vprof_status == SEEN_NOTHING
     v.see_write(ValueInt(1))
     v.see_write(Value())
-    assert v.status == SEEN_TOO_MUCH
+    assert v._vprof_status == SEEN_TOO_MUCH
     v.see_write(Value())
-    assert v.status == SEEN_TOO_MUCH
+    assert v._vprof_status == SEEN_TOO_MUCH
 
 
 def test_obj():
     v = ValueProf()
     value = Value()
-    assert v.status == SEEN_NOTHING
+    assert v._vprof_status == SEEN_NOTHING
     v.see_write(value)
     v.see_write(value)
     v.see_write(value)
     v.see_write(value)
     assert v.try_read_constant_obj() is value
-    assert v.status == SEEN_OBJ
+    assert v._vprof_status == SEEN_OBJ
     v.see_int(2)
-    assert v.status == SEEN_TOO_MUCH
+    assert v._vprof_status == SEEN_TOO_MUCH
 
     v = ValueProf()
-    assert v.status == SEEN_NOTHING
+    assert v._vprof_status == SEEN_NOTHING
     v.see_write(Value())
     v.see_write(Value())
-    assert v.status == SEEN_TOO_MUCH
+    assert v._vprof_status == SEEN_TOO_MUCH
 
 
 def test_none():
     v = ValueProf()
-    assert v.status == SEEN_NOTHING
+    assert v._vprof_status == SEEN_NOTHING
     v.see_write(None)
-    assert v.status == SEEN_TOO_MUCH
+    assert v._vprof_status == SEEN_TOO_MUCH
     v.see_write(None)
-    assert v.status == SEEN_TOO_MUCH
+    assert v._vprof_status == SEEN_TOO_MUCH
 
     v = ValueProf()
     v.see_write(ValueInt(1))
-    assert v.status == SEEN_INT
+    assert v._vprof_status == SEEN_INT
     v.see_write(None)
-    assert v.status == SEEN_TOO_MUCH
+    assert v._vprof_status == SEEN_TOO_MUCH
 
     v = ValueProf()
     v.see_write(Value())
-    assert v.status == SEEN_OBJ
+    assert v._vprof_status == SEEN_OBJ
     v.see_write(None)
-    assert v.status == SEEN_TOO_MUCH
+    assert v._vprof_status == SEEN_TOO_MUCH
diff --git a/pypy/interpreter/valueprof.py b/pypy/interpreter/valueprof.py
--- a/pypy/interpreter/valueprof.py
+++ b/pypy/interpreter/valueprof.py
@@ -8,16 +8,16 @@
 
 class ValueProf(object):
     _mixin_ = True
-    _immutable_fields_ = ['status?']
+    _immutable_fields_ = ['_vprof_status?']
 
     def __init__(self):
         # only if you subclass normally
         self.init_valueprof()
 
     def init_valueprof(self):
-        self.status = SEEN_NOTHING
-        self.value_int = 0
-        self.value_wref = dead_ref
+        self._vprof_status = SEEN_NOTHING
+        self._vprof_value_int = 0
+        self._vprof_value_wref = dead_ref
 
     def is_int(self, w_obj):
         raise NotImplementedError("abstract base")
@@ -31,44 +31,44 @@
         return self.see_object(w_value)
 
     def see_int(self, value):
-        status = self.status
+        status = self._vprof_status
         if status == SEEN_NOTHING:
-            self.value_int = value
-            self.status = SEEN_INT
+            self._vprof_value_int = value
+            self._vprof_status = SEEN_INT
         elif status == SEEN_INT:
             if self.read_constant_int() != value:
-                self.status = SEEN_TOO_MUCH
+                self._vprof_status = SEEN_TOO_MUCH
         elif status == SEEN_OBJ:
-            self.status = SEEN_TOO_MUCH
+            self._vprof_status = SEEN_TOO_MUCH
 
     def see_object(self, value):
-        status = self.status
+        status = self._vprof_status
         if value is None:
             if status != SEEN_TOO_MUCH:
-                self.status = SEEN_TOO_MUCH
+                self._vprof_status = SEEN_TOO_MUCH
         elif status == SEEN_NOTHING:
-            self.value_wref = ref(value)
-            self.status = SEEN_OBJ
+            self._vprof_value_wref = ref(value)
+            self._vprof_status = SEEN_OBJ
         elif status == SEEN_INT:
-            self.status = SEEN_TOO_MUCH
+            self._vprof_status = SEEN_TOO_MUCH
         elif status == SEEN_OBJ:
             if self.try_read_constant_obj() is not value:
-                self.status = SEEN_TOO_MUCH
+                self._vprof_status = SEEN_TOO_MUCH
 
     def can_fold_read_int(self):
-        return self.status == SEEN_INT
+        return self._vprof_status == SEEN_INT
 
     def can_fold_read_obj(self):
-        return self.status == SEEN_OBJ
+        return self._vprof_status == SEEN_OBJ
 
     @jit.elidable
     def read_constant_int(self):
         assert self.can_fold_read_int()
-        return self.value_int
+        return self._vprof_value_int
 
     @jit.elidable
     def try_read_constant_obj(self):
         assert self.can_fold_read_obj()
-        return self.value_wref()
+        return self._vprof_value_wref()
 
 
_______________________________________________
pypy-commit mailing list
pypy-commit@python.org
https://mail.python.org/mailman/listinfo/pypy-commit

Reply via email to