Author: Maciej Fijalkowski <[email protected]>
Branch:
Changeset: r76157:954bf2fe475a
Date: 2015-02-26 12:36 +0200
http://bitbucket.org/pypy/pypy/changeset/954bf2fe475a/
Log: merge
diff --git a/rpython/doc/index.rst b/rpython/doc/index.rst
--- a/rpython/doc/index.rst
+++ b/rpython/doc/index.rst
@@ -36,6 +36,7 @@
:maxdepth: 1
arm
+ logging
Writing your own interpreter in RPython
diff --git a/rpython/rlib/listsort.py b/rpython/rlib/listsort.py
--- a/rpython/rlib/listsort.py
+++ b/rpython/rlib/listsort.py
@@ -496,6 +496,12 @@
# 1. len[-3] > len[-2] + len[-1]
# 2. len[-2] > len[-1]
#
+ # Note these invariants will not hold for the entire pending array even
+ # after this function completes. [1] This does not affect the
+ # correctness of the overall algorithm.
+ #
+ # [1]
http://envisage-project.eu/proving-android-java-and-python-sorting-algorithm-is-broken-and-how-to-fix-it/
+ #
# See listsort.txt for more info.
def merge_collapse(self):
_______________________________________________
pypy-commit mailing list
[email protected]
https://mail.python.org/mailman/listinfo/pypy-commit
