[pypy-commit] pypy default: another attempt to fix translation

[fijal]

Author: Maciej Fijalkowski <fijall at gmail.com>
Branch: 
Changeset: r49914:7e26680ebb76
Date: 2011-11-28 17:04 +0200
http://bitbucket.org/pypy/pypy/changeset/7e26680ebb76/

Log:	another attempt to fix translation

diff --git a/pypy/module/micronumpy/interp_numarray.py b/pypy/module/micronumpy/interp_numarray.py
--- a/pypy/module/micronumpy/interp_numarray.py
+++ b/pypy/module/micronumpy/interp_numarray.py
@@ -968,9 +968,9 @@
         call_sig = sig.components[0]
         assert isinstance(call_sig, signature.Call1)
         if self.forced_result is not None:
-            return 'Call1(%s, forced=%s)' % (call_sig.func.func_name,
+            return 'Call1(%s, forced=%s)' % (call_sig.name,
                                              self.forced_result.debug_repr())
-        return 'Call1(%s, %s)' % (call_sig.func.func_name,
+        return 'Call1(%s, %s)' % (call_sig.name,
                                   self.values.debug_repr())
 
 class Call2(VirtualArray):
@@ -1018,9 +1018,9 @@
         call_sig = sig.components[0]
         assert isinstance(call_sig, signature.Call2)
         if self.forced_result is not None:
-            return 'Call2(%s, forced=%s)' % (call_sig.func.func_name,
+            return 'Call2(%s, forced=%s)' % (call_sig.name,
                 self.forced_result.debug_repr())
-        return 'Call2(%s, %s, %s)' % (call_sig.func.func_name,
+        return 'Call2(%s, %s, %s)' % (call_sig.name,
             self.left.debug_repr(),
             self.right.debug_repr())
 
diff --git a/pypy/module/micronumpy/signature.py b/pypy/module/micronumpy/signature.py
--- a/pypy/module/micronumpy/signature.py
+++ b/pypy/module/micronumpy/signature.py
@@ -40,13 +40,15 @@
         return Signature._known_sigs.setdefault(components, Signature(components))
 
 class Call1(BaseSignature):
-    _immutable_fields_ = ["func"]
+    _immutable_fields_ = ["func", "name"]
 
     def __init__(self, func):
         self.func = func
+        self.name = func.func_name
 
 class Call2(BaseSignature):
-    _immutable_fields_ = ["func"]
+    _immutable_fields_ = ["func", "name"]
 
     def __init__(self, func):
         self.func = func
+        self.name = func.func_name