Author: Tim Felgentreff <timfelgentr...@gmail.com>
Branch: strategies
Changeset: r663:072f88561376
Date: 2014-03-18 15:29 +0100
http://bitbucket.org/pypy/lang-smalltalk/changeset/072f88561376/

Log:    merge upstream

diff --git a/spyvm/model.py b/spyvm/model.py
--- a/spyvm/model.py
+++ b/spyvm/model.py
@@ -485,11 +485,15 @@
 
 class W_AbstractPointersObject(W_AbstractObjectWithClassReference):
     """Common object."""
-    _attrs_ = ['shadow', 'version']
-    import_from_mixin(version.VersionMixin)
+    _attrs_ = ['shadow']
 
     shadow = None # Default value
 
+    def changed(self):
+        # This is called whenever an instance variable is changed on the 
receiver.
+        # Was used with a version variable before. Left here in case it might 
be usefull in the future.
+        pass
+    
     @jit.unroll_safe
     def __init__(self, space, w_class, size):
         """Create new object with size = fixed + variable size."""
@@ -537,7 +541,6 @@
         assert self.shadow is None or self.shadow is shadow
         self.shadow = shadow
 
-    @elidable_for_version
     def _get_shadow(self):
         return self.shadow
     
@@ -680,11 +683,9 @@
     def set_storage(self, storage):
         self._storage = storage
     
-    @elidable_for_version
     def get_storage(self):
         return self._storage
     
-    @elidable_for_version
     def get_strategy(self):
         return self.strategy
     
_______________________________________________
pypy-commit mailing list
pypy-commit@python.org
https://mail.python.org/mailman/listinfo/pypy-commit

Reply via email to