[pypy-commit] pypy optresult-unroll: simplify the usage of memo

[fijal]

Author: Maciej Fijalkowski <fijall at gmail.com>
Branch: optresult-unroll
Changeset: r79455:b254ccaf6527
Date: 2015-09-05 12:37 +0200
http://bitbucket.org/pypy/pypy/changeset/b254ccaf6527/

Log:	simplify the usage of memo

diff --git a/rpython/jit/metainterp/resoperation.py b/rpython/jit/metainterp/resoperation.py
--- a/rpython/jit/metainterp/resoperation.py
+++ b/rpython/jit/metainterp/resoperation.py
@@ -158,11 +158,11 @@
         # RPython-friendly version
         if self.type != 'v':
             try:
-                sres = '%s = ' % memo[self]
+                num = memo[self]
             except KeyError:
-                name = self.type + str(len(memo))
-                memo[self] = name
-                sres = name + ' = '
+                num = len(memo)
+                memo[self] = num
+            sres = self.type + str(num) + ' = '
         #if self.result is not None:
         #    sres = '%s = ' % (self.result,)
         else:
@@ -185,11 +185,11 @@
 
     def repr_short(self, memo):
         try:
-            return memo[self]
+            num = memo[self]
         except KeyError:
-            name = self.type + str(len(memo))
-            memo[self] = name
-            return name
+            num = len(memo)
+            memo[self] = num
+        return self.type + str(num)
 
     def __repr__(self):
         r = self.repr(self._repr_memo)
@@ -458,11 +458,11 @@
 
     def repr(self, memo):
         try:
-            return memo[self]
+            num = memo[self]
         except KeyError:
-            name = self.type + str(len(memo))
-            memo[self] = name
-            return name
+            num = len(memo)
+            memo[self] = num
+        return self.type + str(num)
 
     def __repr__(self):
         return self.repr(self._repr_memo)