[pypy-svn] pypy jitypes2: fix the unwrap specs after the merge

[antocuni]

Author: Antonio Cuni <anto.cuni at gmail.com>
Branch: jitypes2
Changeset: r42862:af772f3391ac
Date: 2011-03-22 21:22 +0100
http://bitbucket.org/pypy/pypy/changeset/af772f3391ac/

Log:	fix the unwrap specs after the merge

diff --git a/pypy/module/_ffi/interp_ffi.py b/pypy/module/_ffi/interp_ffi.py
--- a/pypy/module/_ffi/interp_ffi.py
+++ b/pypy/module/_ffi/interp_ffi.py
@@ -212,7 +212,6 @@
         floatval = libffi.longlong2float(llval)
         argchain.arg_longlong(floatval)
 
-    @unwrap_spec('self', ObjSpace, 'args_w')
     def call(self, space, args_w):
         self = jit.hint(self, promote=True)
         argchain = self.build_argchain(space, args_w)
@@ -322,7 +321,6 @@
         else:
             assert False
 
-    @unwrap_spec('self', ObjSpace)
     def getaddr(self, space):
         """
         Return the physical address in memory of the function
@@ -340,7 +338,7 @@
     restype = unwrap_ffitype(space, w_restype, allow_void=True)
     return argtypes_w, argtypes, w_restype, restype
 
- at unwrap_spec(ObjSpace, W_Root, r_uint, str, W_Root, W_Root)
+ at unwrap_spec(addr=r_uint, name=str)
 def descr_fromaddr(space, w_cls, addr, name, w_argtypes, w_restype):
     argtypes_w, argtypes, w_restype, restype = unpack_argtypes(space,
                                                                w_argtypes,
@@ -387,7 +385,7 @@
             
         return W_FuncPtr(func, argtypes_w, w_restype)
 
-    @unwrap_spec('self', ObjSpace, str)
+    @unwrap_spec(name=str)
     def getaddressindll(self, space, name):
         try:
             address_as_uint = rffi.cast(lltype.Unsigned,
@@ -397,7 +395,7 @@
                                   "No symbol %s found in library %s", name, self.name)
         return space.wrap(address_as_uint)
 
- at unwrap_spec(name=str)
+ at unwrap_spec(name='str_or_None')
 def descr_new_cdll(space, w_type, name):
     return space.wrap(W_CDLL(space, name))