[pypy-svn] r35726 - pypy/dist/pypy/rpython

[arigo at codespeak.net]

Author: arigo
Date: Thu Dec 14 10:36:35 2006
New Revision: 35726

Modified:
   pypy/dist/pypy/rpython/controllerentry.py
Log:
Reordering methods.


Modified: pypy/dist/pypy/rpython/controllerentry.py
==============================================================================
--- pypy/dist/pypy/rpython/controllerentry.py	(original)
+++ pypy/dist/pypy/rpython/controllerentry.py	Thu Dec 14 10:36:35 2006
@@ -48,17 +48,21 @@
                                                    revealargs=[],
                                                    revealresult=True)
 
-    def ctrl_getattr(self, s_obj, s_attr):
-        return delegate(self.getattr, s_obj, s_attr)
-
     def getattr(self, obj, attr):
         return getattr(self, 'get_' + attr)(obj)
     getattr._annspecialcase_ = 'specialize:arg(2)'
 
+    def ctrl_getattr(self, s_obj, s_attr):
+        return delegate(self.getattr, s_obj, s_attr)
+
     def rtype_getattr(self, hop):
         r_controlled_instance = hop.args_r[0]
         return r_controlled_instance.rtypedelegate(self.getattr, hop)
 
+    def setattr(self, obj, attr, value):
+        return getattr(self, 'set_' + attr)(obj, value)
+    setattr._annspecialcase_ = 'specialize:arg(2)'
+
     def ctrl_setattr(self, s_obj, s_attr, s_value):
         return delegate(self.setattr, s_obj, s_attr, s_value)
 
@@ -66,10 +70,6 @@
         r_controlled_instance = hop.args_r[0]
         return r_controlled_instance.rtypedelegate(self.setattr, hop)
 
-    def setattr(self, obj, attr, value):
-        return getattr(self, 'set_' + attr)(obj, value)
-    setattr._annspecialcase_ = 'specialize:arg(2)'
-
 
 def delegate(boundmethod, *args_s):
     bk = getbookkeeper()