Regular update after distribution

Author: JarryShaw

AUTHORS.md

@@ -4,9 +4,9 @@ This list is sorted by the number of commits per contributor in _descending_ ord
 
 Avatar|Contributor|Contributions
 :-:|---|:-:
-<img class='float-left rounded-1' src='https://avatars1.githubusercontent.com/u/15666417?v=4' width='36' height='36' alt='@JarryShaw'>|[@JarryShaw](https://github.com/JarryShaw)|16
+<img class='float-left rounded-1' src='https://avatars1.githubusercontent.com/u/15666417?v=4' width='36' height='36' alt='@JarryShaw'>|[@JarryShaw](https://github.com/JarryShaw)|19
 <img class='float-left rounded-1' src='https://avatars0.githubusercontent.com/u/15073518?v=4' width='36' height='36' alt='@gousaiyang'>|[@gousaiyang](https://github.com/gousaiyang)|7
 
 ---
 
-Auto-generated by [gaocegege/maintainer](https://github.com/gaocegege/maintainer) on 2019-07-10.
+Auto-generated by [gaocegege/maintainer](https://github.com/gaocegege/maintainer) on 2019-07-14.

CHANGELOG.md

@@ -1,5 +1,8 @@
 # Change Log
 
+## [v0.7.3](https://github.com/JarryShaw/f2format/tree/v0.7.3) (2019-07-10)
+[Full Changelog](https://github.com/JarryShaw/f2format/compare/v0.7.2...v0.7.3)
+
 ## [v0.7.2](https://github.com/JarryShaw/f2format/tree/v0.7.2) (2019-06-24)
 [Full Changelog](https://github.com/JarryShaw/f2format/compare/v0.7.1...v0.7.2)
 
@@ -76,13 +79,13 @@
 [Full Changelog](https://github.com/JarryShaw/f2format/compare/v0.3.0...v)
 
 ## [v0.3.0](https://github.com/JarryShaw/f2format/tree/v0.3.0) (2018-11-28)
-[Full Changelog](https://github.com/JarryShaw/f2format/compare/v0.2.3...v0.3.0)
-
-## [v0.2.3](https://github.com/JarryShaw/f2format/tree/v0.2.3) (2018-11-27)
-[Full Changelog](https://github.com/JarryShaw/f2format/compare/v0.2.4...v0.2.3)
+[Full Changelog](https://github.com/JarryShaw/f2format/compare/v0.2.4...v0.3.0)
 
 ## [v0.2.4](https://github.com/JarryShaw/f2format/tree/v0.2.4) (2018-11-27)
-[Full Changelog](https://github.com/JarryShaw/f2format/compare/v0.2.3.post1...v0.2.4)
+[Full Changelog](https://github.com/JarryShaw/f2format/compare/v0.2.3...v0.2.4)
+
+## [v0.2.3](https://github.com/JarryShaw/f2format/tree/v0.2.3) (2018-11-27)
+[Full Changelog](https://github.com/JarryShaw/f2format/compare/v0.2.3.post1...v0.2.3)
 
 ## [v0.2.3.post1](https://github.com/JarryShaw/f2format/tree/v0.2.3.post1) (2018-11-27)
 

CONTRIBUTING.md

@@ -64,4 +64,4 @@ you can use one of some generic reasons like "Improve documentation.",
 
 ---
 
-Auto-generated by [gaocegege/maintainer](https://github.com/gaocegege/maintainer) on 2019-07-10.
+Auto-generated by [gaocegege/maintainer](https://github.com/gaocegege/maintainer) on 2019-07-14.

vendor/pypy/pypy/module/_vmprof/test/test__vmprof.py

@@ -111,14 +111,17 @@ def test_is_enabled(self):
     @py.test.mark.xfail(sys.platform.startswith('freebsd'), reason = "not implemented")
     def test_get_profile_path(self):
         import _vmprof
-        tmpfile = open(self.tmpfilename, 'wb')
-        assert _vmprof.get_profile_path() is None
-        _vmprof.enable(tmpfile.fileno(), 0.01, 0, 0, 0, 0)
-        path = _vmprof.get_profile_path()
+        with open(self.tmpfilename, "wb") as tmpfile:
+            assert _vmprof.get_profile_path() is None
+            _vmprof.enable(tmpfile.fileno(), 0.01, 0, 0, 0, 0)
+            path = _vmprof.get_profile_path()
+            _vmprof.disable()
+
         if path != tmpfile.name:
             with open(path, "rb") as fd1:
-                assert fd1.read() == tmpfile.read()
-        _vmprof.disable()
+                with open(self.tmpfilename, "rb") as fd2:
+                    assert fd1.read() == fd2.read()
+
         assert _vmprof.get_profile_path() is None
 
     def test_stop_sampling(self):

vendor/pypy/pypy/module/posix/test/test_posix2.py

@@ -372,15 +372,24 @@ def test_listdir_unicode(self):
         result = posix.listdir(unicode_dir)
         typed_result = [(type(x), x) for x in result]
         assert (unicode, u'somefile') in typed_result
+        file_system_encoding = sys.getfilesystemencoding()
         try:
-            u = "caf\xe9".decode(sys.getfilesystemencoding())
+            u = "caf\xe9".decode(file_system_encoding)
         except UnicodeDecodeError:
             # Could not decode, listdir returned the byte string
             if sys.platform != 'darwin':
                 assert (str, "caf\xe9") in typed_result
             else:
-                # darwin 'normalized' it
-                assert (unicode, 'caf%E9') in typed_result
+                # if the test is being run in an utf-8 encoded macOS
+                # the posix.listdir function is returning the name of
+                # the file properly.
+                # This test should be run in multiple macOS platforms to
+                # be sure that is working as expected.
+                if file_system_encoding == 'UTF-8':
+                    assert (unicode, 'cafxe9') in typed_result
+                else:
+                    # darwin 'normalized' it
+                    assert (unicode, 'caf%E9') in typed_result
         else:
             assert (unicode, u) in typed_result
 

vendor/pypy/rpython/rlib/rbigint.py

@@ -1423,6 +1423,12 @@ def bit_length(self):
         bits = ovfcheck((i-1) * SHIFT) + msd_bits
         return bits
 
+    def gcd(self, other):
+        """ Compute the (always positive) greatest common divisor of self and
+        other """
+        return gcd_lehmer(self.abs(), other.abs())
+
+
     def __repr__(self):
         return "<rbigint digits=%s, sign=%s, size=%d, len=%d, %s>" % (self._digits,
                                             self.sign, self.numdigits(), len(self._digits),
@@ -2960,3 +2966,91 @@ def parse_string_from_binary_base(parser):
         z.setdigit(pdigit, accum)
     z._normalize()
     return z
+
+
+def gcd_binary(a, b):
+    """ Compute the greatest common divisor of non-negative integers a and b
+    using the binary GCD algorithm. Raises ValueError on negative input. """
+    if a < 0 or b < 0:
+        raise ValueError
+
+    if a == 0:
+        return b
+
+    if b == 0:
+        return a
+
+    shift = 0
+    while (a | b) & 1 == 0:
+        a >>= 1
+        b >>= 1
+        shift += 1
+
+    while a & 1 == 0:
+        a >>= 1
+
+    while b & 1 == 0:
+        b >>= 1
+
+    while a != b:
+        a, b = abs(a - b), min(a, b)
+        while a & 1 == 0:
+            a >>= 1
+
+    return a << shift
+
+def lehmer_xgcd(a, b):
+    s_old, s_new = 1, 0
+    t_old, t_new = 0, 1
+    while b >> (SHIFT >> 1):
+        q, r = a // b, a % b
+
+        a, b = b, r
+        s_old, s_new = s_new, s_old - q * s_new
+        t_old, t_new = t_new, t_old - q * t_new
+
+    return s_old, t_old, s_new, t_new
+
+def gcd_lehmer(a, b):
+    if a.lt(b):
+        a, b = b, a
+
+    while b.size > 1:
+        a_ms = a.digit(abs(a.size-1))
+
+        x = 0
+        while a_ms & (0xFF << SHIFT-8) == 0:
+            a_ms <<= 8
+            x += 8
+
+        while a_ms & (1 << SHIFT-1) == 0:
+            a_ms <<= 1
+            x += 1
+
+        a_ms |= a.digit(abs(a.size-2)) >> SHIFT-x
+
+        if a.size == b.size:
+            b_ms = (b.digit(abs(b.size-1)) << x) | (b.digit(abs(b.size-2)) >> SHIFT-x)
+        elif a.size == b.size+1:
+            b_ms = b.digit(abs(b.size-1)) >> SHIFT-x
+        else:
+            b_ms = 0
+
+        if b_ms >> (SHIFT+1 >> 1) == 0:
+            a, b = b, a.mod(b)
+            continue
+
+        s_old, t_old, s_new, t_new = lehmer_xgcd(a_ms, b_ms)
+
+        n_a = a.int_mul(s_new).add(b.int_mul(t_new)).abs()
+        b = a.int_mul(s_old).add(b.int_mul(t_old)).abs()
+        a = n_a
+
+        if a.lt(b):
+            a, b = b, a
+
+    if not b.tobool():
+        return a
+
+    a = a.mod(b)
+    return rbigint.fromint(gcd_binary(b.toint(), a.toint()))

vendor/pypy/rpython/rlib/test/test_rbigint.py

@@ -11,12 +11,13 @@
 from rpython.rlib import rbigint as lobj
 from rpython.rlib.rarithmetic import r_uint, r_longlong, r_ulonglong, intmask
 from rpython.rlib.rbigint import (rbigint, SHIFT, MASK, KARATSUBA_CUTOFF,
-    _store_digit, _mask_digit, InvalidEndiannessError, InvalidSignednessError)
+    _store_digit, _mask_digit, InvalidEndiannessError, InvalidSignednessError,
+    gcd_lehmer, lehmer_xgcd, gcd_binary)
 from rpython.rlib.rfloat import NAN
 from rpython.rtyper.test.test_llinterp import interpret
 from rpython.translator.c.test.test_standalone import StandaloneTests
 
-from hypothesis import given, strategies, example
+from hypothesis import given, strategies, example, settings
 
 longs = strategies.builds(
     long, strategies.integers())
@@ -836,6 +837,27 @@ def test_frombytes_tobytes_hypothesis(self, s, big, signed):
         t = bigint.tobytes(len(s), byteorder=byteorder, signed=signed)
         assert s == t
 
+    def test_gcd(self):
+        assert gcd_binary(2*3*7**2, 2**2*7) == 2*7
+        pytest.raises(ValueError, gcd_binary, 2*3*7**2, -2**2*7)
+        assert gcd_binary(1234, 5678) == 2
+        assert gcd_binary(13, 13**6) == 13
+        assert gcd_binary(12, 0) == 12
+        assert gcd_binary(0, 0) == 0
+        assert pytest.raises(ValueError, gcd_binary, -10, 0)
+        assert pytest.raises(ValueError, gcd_binary, 10, -10)
+
+        x = rbigint.fromlong(9969216677189303386214405760200)
+        y = rbigint.fromlong(16130531424904581415797907386349)
+        g = x.gcd(y)
+        assert g == rbigint.fromlong(1)
+
+        for x in gen_signs([12843440367927679363613699686751681643652809878241019930204617606850071260822269719878805]):
+            x = rbigint.fromlong(x)
+            for y in gen_signs([12372280584571061381380725743231391746505148712246738812788540537514927882776203827701778968535]):
+                y = rbigint.fromlong(y)
+                g = x.gcd(y)
+                assert g.tolong() == 18218089570126697993340888567155155527541105
 
 
 class TestInternalFunctions(object):
@@ -1255,3 +1277,52 @@ def test_int_comparison(self, x, y):
         assert lx.lt(ly) == (x < y)
         assert lx.eq(ly) == (x == y)
         assert lx.le(ly) == (x <= y)
+
+    @given(ints, ints, ints)
+    def test_gcd_binary(self, x, y, z):
+        x, y, z = abs(x), abs(y), abs(z)
+
+        def test(a, b, res):
+            g = gcd_binary(a, b)
+
+            assert g == res
+
+        a, b = x, y
+        while b:
+            a, b = b, a % b
+
+        gcd_x_y = a
+
+        test(x, y, gcd_x_y)
+        test(x, 0, x)
+        test(0, x, x)
+        test(x * z, y * z, gcd_x_y * z)
+        test(x * z, z, z)
+        test(z, y * z, z)
+
+    @given(biglongs, biglongs, biglongs)
+    @example(112233445566778899112233445566778899112233445566778899,
+             13579246801357924680135792468013579246801,
+             99887766554433221113)
+    @settings(max_examples=10)
+    def test_gcd(self, x, y, z):
+        print(x, y, z)
+        x, y, z = abs(x), abs(y), abs(z)
+
+        def test(a, b, res):
+            g = rbigint.fromlong(a).gcd(rbigint.fromlong(b)).tolong()
+
+            assert g == res
+
+        a, b = x, y
+        while b:
+            a, b = b, a % b
+
+        gcd_x_y = a
+
+        test(x, y, gcd_x_y)
+        test(x * z, y * z, gcd_x_y * z)
+        test(x * z, z, z)
+        test(z, y * z, z)
+        test(x, 0, x)
+        test(0, x, x)

vendor/pypy/rpython/translator/goal/targetbigintbenchmark.py

@@ -251,8 +251,19 @@ def entry_point(argv):
     sumTime += _time
     print "v = v + v", _time
 
+    x = rbigint.fromstr("13579246801357924680135792468013579246801")
+    y = rbigint.fromstr("112233445566778899112233445566778899112233445566778899")
+    t = time()
+    for i in range(5000):
+        x.gcd(y)
+        x = x.int_mul(2).int_add(1)
+    _time = time() - t
+    print "gcd", _time
+
+    sumTime += _time
+
     print "Sum: ", sumTime
-    
+
     return 0
 
 # _____ Define and setup target ___