[pypy-commit] pypy gmp: More tests pass.

[arigo]

Author: Armin Rigo <arigo at tunes.org>
Branch: gmp
Changeset: r48268:c40c0e765925
Date: 2011-10-20 16:24 +0200
http://bitbucket.org/pypy/pypy/changeset/c40c0e765925/

Log:	More tests pass.

diff --git a/pypy/rlib/_rbigint_gmp.py b/pypy/rlib/_rbigint_gmp.py
--- a/pypy/rlib/_rbigint_gmp.py
+++ b/pypy/rlib/_rbigint_gmp.py
@@ -1,5 +1,7 @@
 from pypy.rpython.lltypesystem import lltype, rffi
+from pypy.rpython.lltypesystem.lltype import typeMethod
 from pypy.translator.tool.cbuild import ExternalCompilationInfo
+from pypy.rlib import jit
 
 eci = ExternalCompilationInfo(includes=["gmp.h"],
                               libraries=["gmp"])
@@ -8,24 +10,45 @@
 mpz_ptr = lltype.Ptr(mpz_t)
 
 def external(name, args, result=lltype.Void):
-    name = "__g" + name    # temporary hack?
+    if name.startswith('mp'):
+        name = "__g" + name    # temporary hack?
     return rffi.llexternal(name, args, result, compilation_info=eci)
 
 mpz_init        = external("mpz_init", [mpz_ptr])
 mpz_init_set_si = external("mpz_init_set_si", [mpz_ptr, rffi.LONG])
+mpz_init_set_str= external("mpz_init_set_str", [mpz_ptr, rffi.CCHARP,rffi.INT])
 mpz_get_si      = external("mpz_get_si", [mpz_ptr], rffi.LONG)
+mpz_get_str     = external("mpz_get_str", [rffi.CCHARP, rffi.INT, mpz_ptr],
+                           rffi.CCHARP)
 mpz_add         = external("mpz_add", [mpz_ptr, mpz_ptr, mpz_ptr])
 mpz_sub         = external("mpz_sub", [mpz_ptr, mpz_ptr, mpz_ptr])
 mpz_mul         = external("mpz_mul", [mpz_ptr, mpz_ptr, mpz_ptr])
+_free           = external("free", [rffi.CCHARP])
 
 # ____________________________________________________________
 
+def _fromint(value):
+    r = lltype.malloc(RBIGINT)
+    mpz_init_set_si(r.mpz, value)
+    return r
+
+
 class _adtmeths:
 
-    @lltype.typeMethod
+    @typeMethod
+    @jit.elidable
     def fromint(RBIGINT, value):
+        return _fromint(value)
+
+    @typeMethod
+    def frombool(RBIGINT, b):
+        return _fromint(int(b))    # maybe do some caching?
+
+    @typeMethod
+    def fromlong(RBIGINT, l):
+        "NOT_RPYTHON"
         r = lltype.malloc(RBIGINT)
-        mpz_init_set_si(r.mpz, value)
+        mpz_init_set_str(r.mpz, str(l), 10)
         return r
 
     def tolong(r):
@@ -49,9 +72,17 @@
         mpz_mul(r.mpz, r1.mpz, r2.mpz)
         return r
 
+    def str(r):
+        p = mpz_get_str(lltype.nullptr(rffi.CCHARP.TO), 10, r.mpz)
+        result = rffi.charp2str(p)
+        _free(p)
+        return result
+
 _adtmeths = dict([(key, value) for (key, value) in _adtmeths.__dict__.items()
                                if not key.startswith('_')])
 
+# ____________________________________________________________
+
 RBIGINT = lltype.GcStruct("RBIGINT_GMP",
                           ('mpz', mpz_t),
                           adtmeths = _adtmeths)