Author: Armin Rigo <ar...@tunes.org> Branch: Changeset: r46447:38e764c3566e Date: 2011-08-12 09:39 +0200 http://bitbucket.org/pypy/pypy/changeset/38e764c3566e/
Log: merge heads diff --git a/pypy/rlib/rbigint.py b/pypy/rlib/rbigint.py --- a/pypy/rlib/rbigint.py +++ b/pypy/rlib/rbigint.py @@ -215,6 +215,7 @@ # then modify the result. return _decimalstr_to_bigint(s) + @jit.elidable def toint(self): """ Get an integer from a bigint object. @@ -294,6 +295,7 @@ def ne(self, other): return not self.eq(other) + @jit.elidable def lt(self, other): if self.sign > other.sign: return False @@ -1603,7 +1605,7 @@ elif (base & (base - 1)) == 0: # JRH: special case for power-of-2 bases accum = 0 - accumbits = 0 # # of bits in accum + accumbits = 0 # # of bits in accum basebits = 1 # # of bits in base-1 i = base while 1: _______________________________________________ pypy-commit mailing list pypy-commit@python.org http://mail.python.org/mailman/listinfo/pypy-commit