[pypy-svn] pypy documentation-cleanup: merge
lac
commits-noreply at bitbucket.org
Wed Apr 27 12:44:38 CEST 2011
Author: Laura Creighton <lac at openend.se>
Branch: documentation-cleanup
Changeset: r43663:505c263eb524
Date: 2011-04-27 12:40 +0200
http://bitbucket.org/pypy/pypy/changeset/505c263eb524/
Log: merge
diff --git a/pypy/doc/config/objspace.std.optimized_int_add.rst b/pypy/doc/config/objspace.std.optimized_int_add.txt
copy from pypy/doc/config/objspace.std.optimized_int_add.rst
copy to pypy/doc/config/objspace.std.optimized_int_add.txt
diff --git a/pypy/doc/config/objspace.std.withcelldict.rst b/pypy/doc/config/objspace.std.withcelldict.rst
deleted file mode 100644
--- a/pypy/doc/config/objspace.std.withcelldict.rst
+++ /dev/null
@@ -1,2 +0,0 @@
-Enable cell-dicts. This optimization is not helpful without the JIT. In the
-presence of the JIT, it greatly helps looking up globals.
diff --git a/pypy/doc/config/objspace.std.withprebuiltint.rst b/pypy/doc/config/objspace.std.withprebuiltint.rst
deleted file mode 100644
--- a/pypy/doc/config/objspace.std.withprebuiltint.rst
+++ /dev/null
@@ -1,5 +0,0 @@
-This option enables the caching of small integer objects (similar to what
-CPython does). The range of which integers are cached can be influenced with
-the :config:`objspace.std.prebuiltintfrom` and
-:config:`objspace.std.prebuiltintto` options.
-
diff --git a/pypy/doc/config/objspace.honor__builtins__.rst b/pypy/doc/config/objspace.honor__builtins__.txt
copy from pypy/doc/config/objspace.honor__builtins__.rst
copy to pypy/doc/config/objspace.honor__builtins__.txt
diff --git a/pypy/doc/config/objspace.std.optimized_comparison_op.rst b/pypy/doc/config/objspace.std.optimized_comparison_op.txt
copy from pypy/doc/config/objspace.std.optimized_comparison_op.rst
copy to pypy/doc/config/objspace.std.optimized_comparison_op.txt
diff --git a/pypy/doc/config/translation.list_comprehension_operations.rst b/pypy/doc/config/translation.list_comprehension_operations.rst
deleted file mode 100644
--- a/pypy/doc/config/translation.list_comprehension_operations.rst
+++ /dev/null
@@ -1,2 +0,0 @@
-Experimental optimization for list comprehensions in RPython.
-
diff --git a/pypy/doc/config/objspace.soabi.rst b/pypy/doc/config/objspace.soabi.rst
deleted file mode 100644
--- a/pypy/doc/config/objspace.soabi.rst
+++ /dev/null
@@ -1,14 +0,0 @@
-This option controls the tag included into extension module file names. The
-default is something like `pypy-14`, which means that `import foo` will look for
-a file named `foo.pypy-14.so` (or `foo.pypy-14.pyd` on Windows).
-
-This is an implementation of PEP3149_, with two differences:
-
- * the filename without tag `foo.so` is not considered.
- * the feature is also available on Windows.
-
-When set to the empty string (with `--soabi=`), the interpreter will only look
-for a file named `foo.so`, and will crash if this file was compiled for another
-Python interpreter.
-
-.. _PEP3149: http://www.python.org/dev/peps/pep-3149/
diff --git a/pypy/doc/config/objspace.name.rst b/pypy/doc/config/objspace.name.rst
deleted file mode 100644
--- a/pypy/doc/config/objspace.name.rst
+++ /dev/null
@@ -1,16 +0,0 @@
-Determine which `Object Space`_ to use. The `Standard Object Space`_ gives the
-normal Python semantics, the others are `Object Space Proxies`_ giving
-additional features (except the Flow Object Space which is not intended
-for normal usage):
-
- * thunk_: The thunk object space adds lazy evaluation to PyPy.
- * taint_: The taint object space adds soft security features.
- * dump_: Using this object spaces results in the dumpimp of all operations
- to a log.
-
-.. _`Object Space`: ../objspace.html
-.. _`Object Space Proxies`: ../objspace-proxies.html
-.. _`Standard Object Space`: ../objspace.html#standard-object-space
-.. _thunk: ../objspace-proxies.html#thunk
-.. _taint: ../objspace-proxies.html#taint
-.. _dump: ../objspace-proxies.html#dump
diff --git a/pypy/doc/config/translation.ootype.mangle.rst b/pypy/doc/config/translation.ootype.mangle.rst
deleted file mode 100644
--- a/pypy/doc/config/translation.ootype.mangle.rst
+++ /dev/null
@@ -1,3 +0,0 @@
-Mangle the names of user defined attributes of the classes, in order
-to ensure that every name is unique. Default is true, and it should
-not be turned off unless you know what you are doing.
diff --git a/pypy/config/test/test_makerestdoc.py b/pypy/config/test/test_makerestdoc.py
--- a/pypy/config/test/test_makerestdoc.py
+++ b/pypy/config/test/test_makerestdoc.py
@@ -20,14 +20,14 @@
config = Config(descr)
txt = descr.make_rest_doc().text()
- result = {"": checkrest(txt, descr._name + ".txt")}
+ result = {"": txt}
for path in config.getpaths(include_groups=True):
subconf, step = config._cfgimpl_get_home_by_path(path)
fullpath = (descr._name + "." + path)
prefix = fullpath.rsplit(".", 1)[0]
txt = getattr(subconf._cfgimpl_descr, step).make_rest_doc(
prefix).text()
- result[path] = checkrest(txt, fullpath + ".txt")
+ result[path] = txt
return result
def test_simple():
@@ -68,7 +68,6 @@
ChoiceOption("bar", "more doc", ["a", "b", "c"],
default="a")])
result = generate_html(descr)
- assert "more doc" in result[""]
def test_cmdline_overview():
descr = OptionDescription("foo", "doc", [
diff --git a/pypy/doc/config/objspace.usemodules._warnings.rst b/pypy/doc/config/objspace.usemodules._warnings.txt
copy from pypy/doc/config/objspace.usemodules._warnings.rst
copy to pypy/doc/config/objspace.usemodules._warnings.txt
diff --git a/pypy/doc/config/objspace.usemodules._random.rst b/pypy/doc/config/objspace.usemodules._random.rst
deleted file mode 100644
--- a/pypy/doc/config/objspace.usemodules._random.rst
+++ /dev/null
@@ -1,2 +0,0 @@
-Use the '_random' module. It is necessary to use the module "random" from the standard library.
-This module is expected to be working and is included by default.
diff --git a/pypy/doc/config/objspace.usemodules.pyexpat.rst b/pypy/doc/config/objspace.usemodules.pyexpat.txt
copy from pypy/doc/config/objspace.usemodules.pyexpat.rst
copy to pypy/doc/config/objspace.usemodules.pyexpat.txt
diff --git a/pypy/doc/config/objspace.std.withmapdict.rst b/pypy/doc/config/objspace.std.withmapdict.rst
deleted file mode 100644
--- a/pypy/doc/config/objspace.std.withmapdict.rst
+++ /dev/null
@@ -1,5 +0,0 @@
-Enable the new version of "sharing dictionaries".
-
-See the section in `Standard Interpreter Optimizations`_ for more details.
-
-.. _`Standard Interpreter Optimizations`: ../interpreter-optimizations.html#sharing-dicts
diff --git a/pypy/doc/config/translation.stackless.rst b/pypy/doc/config/translation.stackless.rst
deleted file mode 100644
--- a/pypy/doc/config/translation.stackless.rst
+++ /dev/null
@@ -1,5 +0,0 @@
-Run the `stackless transform`_ on each generated graph, which enables the use
-of coroutines at RPython level and the "stackless" module when translating
-PyPy.
-
-.. _`stackless transform`: ../stackless.html
diff --git a/pypy/doc/config/translation.backendopt.none.rst b/pypy/doc/config/translation.backendopt.none.txt
copy from pypy/doc/config/translation.backendopt.none.rst
copy to pypy/doc/config/translation.backendopt.none.txt
diff --git a/pypy/doc/config/translation.backendopt.clever_malloc_removal_heuristic.rst b/pypy/doc/config/translation.backendopt.clever_malloc_removal_heuristic.txt
copy from pypy/doc/config/translation.backendopt.clever_malloc_removal_heuristic.rst
copy to pypy/doc/config/translation.backendopt.clever_malloc_removal_heuristic.txt
diff --git a/pypy/doc/config/objspace.std.withprebuiltchar.rst b/pypy/doc/config/objspace.std.withprebuiltchar.rst
deleted file mode 100644
diff --git a/pypy/doc/config/translation.backend.rst b/pypy/doc/config/translation.backend.rst
deleted file mode 100644
--- a/pypy/doc/config/translation.backend.rst
+++ /dev/null
@@ -1,3 +0,0 @@
-Which backend to use when translating, see `translation documentation`_.
-
-.. _`translation documentation`: ../translation.html
diff --git a/pypy/doc/config/objspace.usemodules.token.rst b/pypy/doc/config/objspace.usemodules.token.rst
deleted file mode 100644
--- a/pypy/doc/config/objspace.usemodules.token.rst
+++ /dev/null
@@ -1,2 +0,0 @@
-Use the 'token' module.
-This module is expected to be working and is included by default.
diff --git a/pypy/doc/config/objspace.usemodules._winreg.rst b/pypy/doc/config/objspace.usemodules._winreg.txt
copy from pypy/doc/config/objspace.usemodules._winreg.rst
copy to pypy/doc/config/objspace.usemodules._winreg.txt
diff --git a/pypy/doc/config/translation.debug.rst b/pypy/doc/config/translation.debug.rst
deleted file mode 100644
--- a/pypy/doc/config/translation.debug.rst
+++ /dev/null
@@ -1,2 +0,0 @@
-Record extra debugging information during annotation. This leads to slightly
-less obscure error messages.
diff --git a/pypy/doc/config/objspace.usemodules.math.rst b/pypy/doc/config/objspace.usemodules.math.rst
deleted file mode 100644
--- a/pypy/doc/config/objspace.usemodules.math.rst
+++ /dev/null
@@ -1,2 +0,0 @@
-Use the 'math' module.
-This module is expected to be working and is included by default.
diff --git a/pypy/doc/config/translation.backendopt.rst b/pypy/doc/config/translation.backendopt.rst
deleted file mode 100644
--- a/pypy/doc/config/translation.backendopt.rst
+++ /dev/null
@@ -1,5 +0,0 @@
-This group contains options about various backend optimization passes. Most of
-them are described in the `EU report about optimization`_
-
-.. _`EU report about optimization`: http://codespeak.net/pypy/extradoc/eu-report/D07.1_Massive_Parallelism_and_Translation_Aspects-2007-02-28.pdf
-
diff --git a/pypy/doc/config/translation.jit.rst b/pypy/doc/config/translation.jit.rst
deleted file mode 100644
--- a/pypy/doc/config/translation.jit.rst
+++ /dev/null
@@ -1,2 +0,0 @@
-Enable the JIT generator, for targets that have JIT support.
-Experimental so far.
diff --git a/pypy/doc/config/objspace.std.builtinshortcut.rst b/pypy/doc/config/objspace.std.builtinshortcut.rst
deleted file mode 100644
--- a/pypy/doc/config/objspace.std.builtinshortcut.rst
+++ /dev/null
@@ -1,5 +0,0 @@
-A shortcut speeding up primitive operations between built-in types.
-
-This is a space-time trade-off: at the moment, this option makes a
-translated pypy-c executable bigger by about 1.7 MB. (This can probably
-be improved with careful analysis.)
diff --git a/pypy/doc/config/translation.cc.rst b/pypy/doc/config/translation.cc.txt
copy from pypy/doc/config/translation.cc.rst
copy to pypy/doc/config/translation.cc.txt
diff --git a/pypy/doc/config/objspace.std.prebuiltintfrom.rst b/pypy/doc/config/objspace.std.prebuiltintfrom.txt
copy from pypy/doc/config/objspace.std.prebuiltintfrom.rst
copy to pypy/doc/config/objspace.std.prebuiltintfrom.txt
diff --git a/pypy/doc/config/objspace.usemodules.operator.rst b/pypy/doc/config/objspace.usemodules.operator.txt
copy from pypy/doc/config/objspace.usemodules.operator.rst
copy to pypy/doc/config/objspace.usemodules.operator.txt
diff --git a/pypy/doc/config/objspace.usemodules.__pypy__.rst b/pypy/doc/config/objspace.usemodules.__pypy__.txt
copy from pypy/doc/config/objspace.usemodules.__pypy__.rst
copy to pypy/doc/config/objspace.usemodules.__pypy__.txt
diff --git a/pypy/doc/config/objspace.honor__builtins__.rst b/pypy/doc/config/objspace.honor__builtins__.rst
deleted file mode 100644
diff --git a/pypy/doc/config/objspace.std.multimethods.rst b/pypy/doc/config/objspace.std.multimethods.rst
deleted file mode 100644
--- a/pypy/doc/config/objspace.std.multimethods.rst
+++ /dev/null
@@ -1,8 +0,0 @@
-Choose the multimethod implementation.
-
-* ``doubledispatch`` turns
- a multimethod call into a sequence of normal method calls.
-
-* ``mrd`` uses a technique known as Multiple Row Displacement
- which precomputes a few compact tables of numbers and
- function pointers.
diff --git a/pypy/doc/config/translation.linkerflags.rst b/pypy/doc/config/translation.linkerflags.rst
deleted file mode 100644
--- a/pypy/doc/config/translation.linkerflags.rst
+++ /dev/null
@@ -1,1 +0,0 @@
-Experimental. Specify extra flags to pass to the linker.
diff --git a/pypy/doc/config/objspace.std.withmethodcache.rst b/pypy/doc/config/objspace.std.withmethodcache.txt
copy from pypy/doc/config/objspace.std.withmethodcache.rst
copy to pypy/doc/config/objspace.std.withmethodcache.txt
diff --git a/pypy/doc/config/objspace.usemodules._random.rst b/pypy/doc/config/objspace.usemodules._random.txt
copy from pypy/doc/config/objspace.usemodules._random.rst
copy to pypy/doc/config/objspace.usemodules._random.txt
diff --git a/pypy/doc/config/objspace.usemodules.mmap.rst b/pypy/doc/config/objspace.usemodules.mmap.txt
copy from pypy/doc/config/objspace.usemodules.mmap.rst
copy to pypy/doc/config/objspace.usemodules.mmap.txt
diff --git a/pypy/doc/config/translation.simplifying.rst b/pypy/doc/config/translation.simplifying.txt
copy from pypy/doc/config/translation.simplifying.rst
copy to pypy/doc/config/translation.simplifying.txt
diff --git a/pypy/doc/config/objspace.std.withmethodcache.rst b/pypy/doc/config/objspace.std.withmethodcache.rst
deleted file mode 100644
--- a/pypy/doc/config/objspace.std.withmethodcache.rst
+++ /dev/null
@@ -1,2 +0,0 @@
-Enable method caching. See the section "Method Caching" in `Standard
-Interpreter Optimizations <../interpreter-optimizations.html#method-caching>`__.
diff --git a/pypy/doc/config/translation.jit_backend.rst b/pypy/doc/config/translation.jit_backend.txt
copy from pypy/doc/config/translation.jit_backend.rst
copy to pypy/doc/config/translation.jit_backend.txt
diff --git a/pypy/doc/config/objspace.usemodules.__pypy__.rst b/pypy/doc/config/objspace.usemodules.__pypy__.rst
deleted file mode 100644
--- a/pypy/doc/config/objspace.usemodules.__pypy__.rst
+++ /dev/null
@@ -1,9 +0,0 @@
-Use the '__pypy__' module.
-This module is expected to be working and is included by default.
-It contains special PyPy-specific functionality.
-For example most of the special functions described in the `object space proxies`
-document are in the module.
-See the `__pypy__ module documentation`_ for more details.
-
-.. _`object space proxy`: ../objspace-proxies.html
-.. _`__pypy__ module documentation`: ../__pypy__-module.html
diff --git a/pypy/doc/config/objspace.usemodules._hashlib.rst b/pypy/doc/config/objspace.usemodules._hashlib.txt
copy from pypy/doc/config/objspace.usemodules._hashlib.rst
copy to pypy/doc/config/objspace.usemodules._hashlib.txt
diff --git a/pypy/doc/config/objspace.usemodules.posix.rst b/pypy/doc/config/objspace.usemodules.posix.txt
copy from pypy/doc/config/objspace.usemodules.posix.rst
copy to pypy/doc/config/objspace.usemodules.posix.txt
diff --git a/pypy/doc/config/objspace.std.sharesmallstr.rst b/pypy/doc/config/objspace.std.sharesmallstr.rst
deleted file mode 100644
diff --git a/pypy/doc/config/objspace.geninterp.rst b/pypy/doc/config/objspace.geninterp.txt
copy from pypy/doc/config/objspace.geninterp.rst
copy to pypy/doc/config/objspace.geninterp.txt
diff --git a/pypy/doc/config/translation.cli.exception_transformer.rst b/pypy/doc/config/translation.cli.exception_transformer.txt
copy from pypy/doc/config/translation.cli.exception_transformer.rst
copy to pypy/doc/config/translation.cli.exception_transformer.txt
diff --git a/pypy/doc/config/translation.backendopt.stack_optimization.rst b/pypy/doc/config/translation.backendopt.stack_optimization.rst
deleted file mode 100644
--- a/pypy/doc/config/translation.backendopt.stack_optimization.rst
+++ /dev/null
@@ -1,1 +0,0 @@
-Enable the optimized code generation for stack based machine, if the backend support it
diff --git a/pypy/doc/config/objspace.usemodules._codecs.rst b/pypy/doc/config/objspace.usemodules._codecs.txt
copy from pypy/doc/config/objspace.usemodules._codecs.rst
copy to pypy/doc/config/objspace.usemodules._codecs.txt
diff --git a/pypy/doc/config/objspace.usemodules.unicodedata.rst b/pypy/doc/config/objspace.usemodules.unicodedata.txt
copy from pypy/doc/config/objspace.usemodules.unicodedata.rst
copy to pypy/doc/config/objspace.usemodules.unicodedata.txt
diff --git a/pypy/doc/config/translation.rst b/pypy/doc/config/translation.rst
deleted file mode 100644
--- a/pypy/doc/config/translation.rst
+++ /dev/null
@@ -1,1 +0,0 @@
-.. intentionally empty
diff --git a/pypy/doc/config/translation.jit_backend.rst b/pypy/doc/config/translation.jit_backend.rst
deleted file mode 100644
--- a/pypy/doc/config/translation.jit_backend.rst
+++ /dev/null
@@ -1,2 +0,0 @@
-Choose the backend to use for the JIT.
-By default, this is the best backend for the current platform.
diff --git a/pypy/doc/config/objspace.std.newshortcut.rst b/pypy/doc/config/objspace.std.newshortcut.txt
copy from pypy/doc/config/objspace.std.newshortcut.rst
copy to pypy/doc/config/objspace.std.newshortcut.txt
diff --git a/pypy/doc/config/objspace.std.methodcachesizeexp.rst b/pypy/doc/config/objspace.std.methodcachesizeexp.rst
deleted file mode 100644
--- a/pypy/doc/config/objspace.std.methodcachesizeexp.rst
+++ /dev/null
@@ -1,1 +0,0 @@
-Set the cache size (number of entries) for :config:`objspace.std.withmethodcache`.
diff --git a/pypy/doc/config/objspace.std.rst b/pypy/doc/config/objspace.std.rst
deleted file mode 100644
--- a/pypy/doc/config/objspace.std.rst
+++ /dev/null
@@ -1,1 +0,0 @@
-.. intentionally empty
diff --git a/pypy/doc/config/objspace.extmodules.rst b/pypy/doc/config/objspace.extmodules.rst
deleted file mode 100644
--- a/pypy/doc/config/objspace.extmodules.rst
+++ /dev/null
@@ -1,12 +0,0 @@
-You can pass a comma-separated list of third-party builtin modules
-which should be translated along with the standard modules within
-``pypy.module``.
-
-The module names need to be fully qualified (i.e. have a ``.`` in them),
-be on the ``$PYTHONPATH`` and not conflict with any existing ones, e.g.
-``mypkg.somemod``.
-
-Once translated, the module will be accessible with a simple::
-
- import somemod
-
diff --git a/pypy/doc/config/objspace.usemodules._ast.rst b/pypy/doc/config/objspace.usemodules._ast.rst
deleted file mode 100644
--- a/pypy/doc/config/objspace.usemodules._ast.rst
+++ /dev/null
@@ -1,2 +0,0 @@
-Use the '_ast' module.
-This module is expected to be working and is included by default.
diff --git a/pypy/doc/config/objspace.usemodules.sys.rst b/pypy/doc/config/objspace.usemodules.sys.txt
copy from pypy/doc/config/objspace.usemodules.sys.rst
copy to pypy/doc/config/objspace.usemodules.sys.txt
diff --git a/pypy/doc/config/translation.ootype.rst b/pypy/doc/config/translation.ootype.txt
copy from pypy/doc/config/translation.ootype.rst
copy to pypy/doc/config/translation.ootype.txt
diff --git a/pypy/doc/config/translation.backendopt.profile_based_inline.rst b/pypy/doc/config/translation.backendopt.profile_based_inline.rst
deleted file mode 100644
--- a/pypy/doc/config/translation.backendopt.profile_based_inline.rst
+++ /dev/null
@@ -1,10 +0,0 @@
-Inline flowgraphs only for call-sites for which there was a minimal
-number of calls during an instrumented run of the program. Callee
-flowgraphs are considered candidates based on a weight heuristic like
-for basic inlining. (see :config:`translation.backendopt.inline`,
-:config:`translation.backendopt.profile_based_inline_threshold` ).
-
-The option takes as value a string which is the arguments to pass to
-the program for the instrumented run.
-
-This optimization is not used by default.
\ No newline at end of file
diff --git a/pypy/doc/Makefile b/pypy/doc/Makefile
--- a/pypy/doc/Makefile
+++ b/pypy/doc/Makefile
@@ -31,32 +31,38 @@
-rm -rf $(BUILDDIR)/*
html:
+ python config/generate.py
$(SPHINXBUILD) -b html $(ALLSPHINXOPTS) $(BUILDDIR)/html
@echo
@echo "Build finished. The HTML pages are in $(BUILDDIR)/html."
dirhtml:
+ python config/generate.py
$(SPHINXBUILD) -b dirhtml $(ALLSPHINXOPTS) $(BUILDDIR)/dirhtml
@echo
@echo "Build finished. The HTML pages are in $(BUILDDIR)/dirhtml."
pickle:
+ python config/generate.py
$(SPHINXBUILD) -b pickle $(ALLSPHINXOPTS) $(BUILDDIR)/pickle
@echo
@echo "Build finished; now you can process the pickle files."
json:
+ python config/generate.py
$(SPHINXBUILD) -b json $(ALLSPHINXOPTS) $(BUILDDIR)/json
@echo
@echo "Build finished; now you can process the JSON files."
htmlhelp:
+ python config/generate.py
$(SPHINXBUILD) -b htmlhelp $(ALLSPHINXOPTS) $(BUILDDIR)/htmlhelp
@echo
@echo "Build finished; now you can run HTML Help Workshop with the" \
".hhp project file in $(BUILDDIR)/htmlhelp."
qthelp:
+ python config/generate.py
$(SPHINXBUILD) -b qthelp $(ALLSPHINXOPTS) $(BUILDDIR)/qthelp
@echo
@echo "Build finished; now you can run "qcollectiongenerator" with the" \
@@ -66,6 +72,7 @@
@echo "# assistant -collectionFile $(BUILDDIR)/qthelp/PyPy.qhc"
latex:
+ python config/generate.py
$(SPHINXBUILD) -b latex $(ALLSPHINXOPTS) $(BUILDDIR)/latex
@echo
@echo "Build finished; the LaTeX files are in $(BUILDDIR)/latex."
@@ -73,17 +80,20 @@
"run these through (pdf)latex."
changes:
+ python config/generate.py
$(SPHINXBUILD) -b changes $(ALLSPHINXOPTS) $(BUILDDIR)/changes
@echo
@echo "The overview file is in $(BUILDDIR)/changes."
linkcheck:
+ python config/generate.py
$(SPHINXBUILD) -b linkcheck $(ALLSPHINXOPTS) $(BUILDDIR)/linkcheck
@echo
@echo "Link check complete; look for any errors in the above output " \
"or in $(BUILDDIR)/linkcheck/output.txt."
doctest:
+ python config/generate.py
$(SPHINXBUILD) -b doctest $(ALLSPHINXOPTS) $(BUILDDIR)/doctest
@echo "Testing of doctests in the sources finished, look at the " \
"results in $(BUILDDIR)/doctest/output.txt."
diff --git a/pypy/doc/config/objspace.usemodules._md5.rst b/pypy/doc/config/objspace.usemodules._md5.rst
deleted file mode 100644
--- a/pypy/doc/config/objspace.usemodules._md5.rst
+++ /dev/null
@@ -1,5 +0,0 @@
-Use the built-in '_md5' module.
-This module is expected to be working and is included by default.
-There is also a pure Python version in lib_pypy which is used
-if the built-in is disabled, but it is several orders of magnitude
-slower.
diff --git a/pypy/doc/config/objspace.std.builtinshortcut.rst b/pypy/doc/config/objspace.std.builtinshortcut.txt
copy from pypy/doc/config/objspace.std.builtinshortcut.rst
copy to pypy/doc/config/objspace.std.builtinshortcut.txt
diff --git a/pypy/doc/config/objspace.std.optimized_list_getitem.rst b/pypy/doc/config/objspace.std.optimized_list_getitem.txt
copy from pypy/doc/config/objspace.std.optimized_list_getitem.rst
copy to pypy/doc/config/objspace.std.optimized_list_getitem.txt
diff --git a/pypy/doc/config/objspace.std.withropeunicode.rst b/pypy/doc/config/objspace.std.withropeunicode.rst
deleted file mode 100644
--- a/pypy/doc/config/objspace.std.withropeunicode.rst
+++ /dev/null
@@ -1,7 +0,0 @@
-Use ropes to implement unicode strings (and also normal strings).
-
-See the section in `Standard Interpreter Optimizations`_ for more details.
-
-.. _`Standard Interpreter Optimizations`: ../interpreter-optimizations.html#ropes
-
-
diff --git a/pypy/doc/config/objspace.std.optimized_int_add.rst b/pypy/doc/config/objspace.std.optimized_int_add.rst
deleted file mode 100644
--- a/pypy/doc/config/objspace.std.optimized_int_add.rst
+++ /dev/null
@@ -1,2 +0,0 @@
-Optimize the addition of two integers a bit. Enabling this option gives small
-speedups.
diff --git a/pypy/doc/config/objspace.usemodules._multiprocessing.rst b/pypy/doc/config/objspace.usemodules._multiprocessing.txt
copy from pypy/doc/config/objspace.usemodules._multiprocessing.rst
copy to pypy/doc/config/objspace.usemodules._multiprocessing.txt
diff --git a/pypy/doc/config/objspace.std.withrope.rst b/pypy/doc/config/objspace.std.withrope.txt
copy from pypy/doc/config/objspace.std.withrope.rst
copy to pypy/doc/config/objspace.std.withrope.txt
diff --git a/pypy/doc/config/objspace.usemodules.operator.rst b/pypy/doc/config/objspace.usemodules.operator.rst
deleted file mode 100644
--- a/pypy/doc/config/objspace.usemodules.operator.rst
+++ /dev/null
@@ -1,2 +0,0 @@
-Use the 'operator' module.
-This module is expected to be working and is included by default.
diff --git a/pypy/doc/config/objspace.name.rst b/pypy/doc/config/objspace.name.txt
copy from pypy/doc/config/objspace.name.rst
copy to pypy/doc/config/objspace.name.txt
diff --git a/pypy/doc/config/translation.stackless.rst b/pypy/doc/config/translation.stackless.txt
copy from pypy/doc/config/translation.stackless.rst
copy to pypy/doc/config/translation.stackless.txt
diff --git a/pypy/doc/config/objspace.usemodules.termios.rst b/pypy/doc/config/objspace.usemodules.termios.rst
deleted file mode 100644
--- a/pypy/doc/config/objspace.usemodules.termios.rst
+++ /dev/null
@@ -1,2 +0,0 @@
-Use the 'termios' module.
-This module is expected to be fully working.
diff --git a/pypy/doc/config/objspace.timing.rst b/pypy/doc/config/objspace.timing.rst
deleted file mode 100644
--- a/pypy/doc/config/objspace.timing.rst
+++ /dev/null
@@ -1,1 +0,0 @@
-timing of various parts of the interpreter (simple profiling)
diff --git a/pypy/doc/config/translation.builtins_can_raise_exceptions.rst b/pypy/doc/config/translation.builtins_can_raise_exceptions.rst
deleted file mode 100644
--- a/pypy/doc/config/translation.builtins_can_raise_exceptions.rst
+++ /dev/null
@@ -1,3 +0,0 @@
-Internal option.
-
-.. internal
diff --git a/pypy/doc/config/objspace.usepycfiles.rst b/pypy/doc/config/objspace.usepycfiles.txt
copy from pypy/doc/config/objspace.usepycfiles.rst
copy to pypy/doc/config/objspace.usepycfiles.txt
diff --git a/pypy/doc/config/translation.gcremovetypeptr.rst b/pypy/doc/config/translation.gcremovetypeptr.txt
copy from pypy/doc/config/translation.gcremovetypeptr.rst
copy to pypy/doc/config/translation.gcremovetypeptr.txt
diff --git a/pypy/doc/config/objspace.timing.rst b/pypy/doc/config/objspace.timing.txt
copy from pypy/doc/config/objspace.timing.rst
copy to pypy/doc/config/objspace.timing.txt
diff --git a/pypy/doc/config/translation.shared.rst b/pypy/doc/config/translation.shared.rst
deleted file mode 100644
--- a/pypy/doc/config/translation.shared.rst
+++ /dev/null
@@ -1,2 +0,0 @@
-Build pypy as a shared library or a DLL, with a small executable to run it.
-This is necessary on Windows to expose the C API provided by the cpyext module.
diff --git a/pypy/doc/config/objspace.std.sharesmallstr.rst b/pypy/doc/config/objspace.std.sharesmallstr.txt
copy from pypy/doc/config/objspace.std.sharesmallstr.rst
copy to pypy/doc/config/objspace.std.sharesmallstr.txt
diff --git a/pypy/doc/config/objspace.usemodules.select.rst b/pypy/doc/config/objspace.usemodules.select.rst
deleted file mode 100644
--- a/pypy/doc/config/objspace.usemodules.select.rst
+++ /dev/null
@@ -1,2 +0,0 @@
-Use the 'select' module.
-This module is expected to be fully working.
diff --git a/pypy/doc/config/objspace.usemodules.select.rst b/pypy/doc/config/objspace.usemodules.select.txt
copy from pypy/doc/config/objspace.usemodules.select.rst
copy to pypy/doc/config/objspace.usemodules.select.txt
diff --git a/pypy/doc/config/objspace.usemodules._md5.rst b/pypy/doc/config/objspace.usemodules._md5.txt
copy from pypy/doc/config/objspace.usemodules._md5.rst
copy to pypy/doc/config/objspace.usemodules._md5.txt
diff --git a/pypy/doc/config/translation.platform.rst b/pypy/doc/config/translation.platform.txt
copy from pypy/doc/config/translation.platform.rst
copy to pypy/doc/config/translation.platform.txt
diff --git a/pypy/doc/config/objspace.usemodules.signal.rst b/pypy/doc/config/objspace.usemodules.signal.rst
deleted file mode 100644
--- a/pypy/doc/config/objspace.usemodules.signal.rst
+++ /dev/null
@@ -1,2 +0,0 @@
-Use the 'signal' module.
-This module is expected to be fully working.
diff --git a/pypy/doc/config/objspace.std.methodcachesizeexp.rst b/pypy/doc/config/objspace.std.methodcachesizeexp.txt
copy from pypy/doc/config/objspace.std.methodcachesizeexp.rst
copy to pypy/doc/config/objspace.std.methodcachesizeexp.txt
diff --git a/pypy/doc/config/translation.backendopt.constfold.rst b/pypy/doc/config/translation.backendopt.constfold.txt
copy from pypy/doc/config/translation.backendopt.constfold.rst
copy to pypy/doc/config/translation.backendopt.constfold.txt
diff --git a/pypy/doc/config/objspace.std.withrangelist.rst b/pypy/doc/config/objspace.std.withrangelist.rst
deleted file mode 100644
--- a/pypy/doc/config/objspace.std.withrangelist.rst
+++ /dev/null
@@ -1,11 +0,0 @@
-Enable "range list" objects. They are an additional implementation of the Python
-``list`` type, indistinguishable for the normal user. Whenever the ``range``
-builtin is called, an range list is returned. As long as this list is not
-mutated (and for example only iterated over), it uses only enough memory to
-store the start, stop and step of the range. This makes using ``range`` as
-efficient as ``xrange``, as long as the result is only used in a ``for``-loop.
-
-See the section in `Standard Interpreter Optimizations`_ for more details.
-
-.. _`Standard Interpreter Optimizations`: ../interpreter-optimizations.html#range-lists
-
diff --git a/pypy/doc/config/translation.gcrootfinder.rst b/pypy/doc/config/translation.gcrootfinder.txt
copy from pypy/doc/config/translation.gcrootfinder.rst
copy to pypy/doc/config/translation.gcrootfinder.txt
diff --git a/pypy/doc/config/translation.force_make.rst b/pypy/doc/config/translation.force_make.rst
deleted file mode 100644
--- a/pypy/doc/config/translation.force_make.rst
+++ /dev/null
@@ -1,1 +0,0 @@
-Force executing makefile instead of using platform.
diff --git a/pypy/doc/config/objspace.std.withrangelist.rst b/pypy/doc/config/objspace.std.withrangelist.txt
copy from pypy/doc/config/objspace.std.withrangelist.rst
copy to pypy/doc/config/objspace.std.withrangelist.txt
diff --git a/pypy/doc/config/objspace.soabi.rst b/pypy/doc/config/objspace.soabi.txt
copy from pypy/doc/config/objspace.soabi.rst
copy to pypy/doc/config/objspace.soabi.txt
diff --git a/pypy/doc/config/objspace.std.newshortcut.rst b/pypy/doc/config/objspace.std.newshortcut.rst
deleted file mode 100644
--- a/pypy/doc/config/objspace.std.newshortcut.rst
+++ /dev/null
@@ -1,1 +0,0 @@
-Performance only: cache and shortcut calling __new__ from builtin types
diff --git a/pypy/doc/config/objspace.std.optimized_list_getitem.rst b/pypy/doc/config/objspace.std.optimized_list_getitem.rst
deleted file mode 100644
--- a/pypy/doc/config/objspace.std.optimized_list_getitem.rst
+++ /dev/null
@@ -1,1 +0,0 @@
-Optimized list[int] a bit.
diff --git a/pypy/doc/config/objspace.std.prebuiltintto.rst b/pypy/doc/config/objspace.std.prebuiltintto.txt
copy from pypy/doc/config/objspace.std.prebuiltintto.rst
copy to pypy/doc/config/objspace.std.prebuiltintto.txt
diff --git a/pypy/doc/config/objspace.usemodules._ast.rst b/pypy/doc/config/objspace.usemodules._ast.txt
copy from pypy/doc/config/objspace.usemodules._ast.rst
copy to pypy/doc/config/objspace.usemodules._ast.txt
diff --git a/pypy/doc/config/objspace.usemodules.parser.rst b/pypy/doc/config/objspace.usemodules.parser.rst
deleted file mode 100644
--- a/pypy/doc/config/objspace.usemodules.parser.rst
+++ /dev/null
@@ -1,4 +0,0 @@
-Use the 'parser' module.
-This is PyPy implementation of the standard library 'parser' module (e.g. if
-this option is enabled and you say ``import parser`` you get this module).
-It is enabled by default.
diff --git a/pypy/doc/config/objspace.disable_call_speedhacks.rst b/pypy/doc/config/objspace.disable_call_speedhacks.txt
copy from pypy/doc/config/objspace.disable_call_speedhacks.rst
copy to pypy/doc/config/objspace.disable_call_speedhacks.txt
diff --git a/pypy/doc/config/translation.jit_profiler.rst b/pypy/doc/config/translation.jit_profiler.rst
deleted file mode 100644
--- a/pypy/doc/config/translation.jit_profiler.rst
+++ /dev/null
@@ -1,1 +0,0 @@
-Integrate profiler support into the JIT
diff --git a/pypy/doc/config/translation.rst b/pypy/doc/config/translation.txt
copy from pypy/doc/config/translation.rst
copy to pypy/doc/config/translation.txt
diff --git a/pypy/doc/config/objspace.std.withcelldict.rst b/pypy/doc/config/objspace.std.withcelldict.txt
copy from pypy/doc/config/objspace.std.withcelldict.rst
copy to pypy/doc/config/objspace.std.withcelldict.txt
diff --git a/pypy/doc/config/objspace.usemodules.signal.rst b/pypy/doc/config/objspace.usemodules.signal.txt
copy from pypy/doc/config/objspace.usemodules.signal.rst
copy to pypy/doc/config/objspace.usemodules.signal.txt
diff --git a/pypy/doc/config/translation.output.rst b/pypy/doc/config/translation.output.rst
deleted file mode 100644
--- a/pypy/doc/config/translation.output.rst
+++ /dev/null
@@ -1,1 +0,0 @@
-Specify file name that the produced executable gets.
diff --git a/pypy/doc/config/objspace.allworkingmodules.rst b/pypy/doc/config/objspace.allworkingmodules.txt
copy from pypy/doc/config/objspace.allworkingmodules.rst
copy to pypy/doc/config/objspace.allworkingmodules.txt
diff --git a/pypy/doc/config/objspace.usemodules.fcntl.rst b/pypy/doc/config/objspace.usemodules.fcntl.txt
copy from pypy/doc/config/objspace.usemodules.fcntl.rst
copy to pypy/doc/config/objspace.usemodules.fcntl.txt
diff --git a/pypy/doc/config/objspace.rst b/pypy/doc/config/objspace.txt
copy from pypy/doc/config/objspace.rst
copy to pypy/doc/config/objspace.txt
diff --git a/pypy/doc/config/objspace.usemodules._weakref.rst b/pypy/doc/config/objspace.usemodules._weakref.rst
deleted file mode 100644
--- a/pypy/doc/config/objspace.usemodules._weakref.rst
+++ /dev/null
@@ -1,6 +0,0 @@
-Use the '_weakref' module, necessary for the standard lib 'weakref' module.
-PyPy's weakref implementation is not completely stable yet. The first
-difference to CPython is that weak references only go away after the next
-garbage collection, not immediately. The other problem seems to be that under
-certain circumstances (that we have not determined) weak references keep the
-object alive.
diff --git a/pypy/doc/config/objspace.usemodules.array.rst b/pypy/doc/config/objspace.usemodules.array.txt
copy from pypy/doc/config/objspace.usemodules.array.rst
copy to pypy/doc/config/objspace.usemodules.array.txt
diff --git a/pypy/doc/config/translation.make_jobs.rst b/pypy/doc/config/translation.make_jobs.txt
copy from pypy/doc/config/translation.make_jobs.rst
copy to pypy/doc/config/translation.make_jobs.txt
diff --git a/pypy/doc/config/objspace.std.prebuiltintto.rst b/pypy/doc/config/objspace.std.prebuiltintto.rst
deleted file mode 100644
--- a/pypy/doc/config/objspace.std.prebuiltintto.rst
+++ /dev/null
@@ -1,1 +0,0 @@
-See :config:`objspace.std.withprebuiltint`.
diff --git a/pypy/doc/config/translation.vanilla.rst b/pypy/doc/config/translation.vanilla.rst
deleted file mode 100644
--- a/pypy/doc/config/translation.vanilla.rst
+++ /dev/null
@@ -1,2 +0,0 @@
-Try to make the resulting compiled program as portable (=movable to another
-machine) as possible. Which is not much.
diff --git a/pypy/doc/interpreter-optimizations.rst b/pypy/doc/interpreter-optimizations.rst
--- a/pypy/doc/interpreter-optimizations.rst
+++ b/pypy/doc/interpreter-optimizations.rst
@@ -135,7 +135,6 @@
implementations for various purposes (see below).
This is now the default implementation of dictionaries in the Python interpreter.
-option.
Sharing Dicts
+++++++++++++
@@ -206,28 +205,11 @@
User Class Optimizations
------------------------
-Shadow Tracking
-+++++++++++++++
-
-Shadow tracking is a general optimization that speeds up method calls for user
-classes (that don't have special meta-class). For this a special dict
-representation is used together with multidicts. This dict representation is
-used only for instance dictionaries. The instance dictionary tracks whether an
-instance attribute shadows an attribute of its class. This makes method calls
-slightly faster in the following way: When calling a method the first thing that
-is checked is the class dictionary to find descriptors. Normally, when a method
-is found, the instance dictionary is then checked for instance attributes
-shadowing the class attribute. If we know that there is no shadowing (since
-instance dict tells us that) we can save this lookup on the instance dictionary.
-
-*This was deprecated and is no longer available.*
-
Method Caching
++++++++++++++
-Shadow tracking is also an important building block for the method caching
-optimization. A method cache is introduced where the result of a method lookup
+A method cache is introduced where the result of a method lookup
is stored (which involves potentially many lookups in the base classes of a
class). Entries in the method cache are stored using a hash computed from
the name being looked up, the call site (i.e. the bytecode object and
@@ -345,14 +327,12 @@
improving results by anything from 15-40 per cent.
Another optimization, or rather set of optimizations, that has a uniformly good
-effect is the set of three 'method optimizations', i.e. shadow tracking, the
+effect are the two 'method optimizations', i.e. the
method cache and the LOOKUP_METHOD and CALL_METHOD opcodes. On a heavily
object-oriented benchmark (richards) they combine to give a speed-up of nearly
50%, and even on the extremely un-object-oriented pystone benchmark, the
improvement is over 20%.
-.. waffles about ropes
-
When building pypy, all generally useful optimizations are turned on by default
unless you explicitly lower the translation optimization level with the
``--opt`` option.
diff --git a/pypy/doc/config/objspace.usemodules._multiprocessing.rst b/pypy/doc/config/objspace.usemodules._multiprocessing.rst
deleted file mode 100644
--- a/pypy/doc/config/objspace.usemodules._multiprocessing.rst
+++ /dev/null
@@ -1,2 +0,0 @@
-Use the '_multiprocessing' module.
-Used by the 'multiprocessing' standard lib module. This module is expected to be working and is included by default.
diff --git a/pypy/doc/config/objspace.usemodules.oracle.rst b/pypy/doc/config/objspace.usemodules.oracle.txt
copy from pypy/doc/config/objspace.usemodules.oracle.rst
copy to pypy/doc/config/objspace.usemodules.oracle.txt
diff --git a/pypy/doc/config/objspace.usemodules.errno.rst b/pypy/doc/config/objspace.usemodules.errno.rst
deleted file mode 100644
--- a/pypy/doc/config/objspace.usemodules.errno.rst
+++ /dev/null
@@ -1,2 +0,0 @@
-Use the 'errno' module.
-This module is expected to be working and is included by default.
diff --git a/pypy/doc/config/objspace.usemodules.posix.rst b/pypy/doc/config/objspace.usemodules.posix.rst
deleted file mode 100644
--- a/pypy/doc/config/objspace.usemodules.posix.rst
+++ /dev/null
@@ -1,3 +0,0 @@
-Use the essential 'posix' module.
-This module is essential, included by default and cannot be removed (even when
-specified explicitly, the option gets overridden later).
diff --git a/pypy/doc/config/objspace.std.getattributeshortcut.rst b/pypy/doc/config/objspace.std.getattributeshortcut.rst
deleted file mode 100644
--- a/pypy/doc/config/objspace.std.getattributeshortcut.rst
+++ /dev/null
@@ -1,1 +0,0 @@
-Performance only: track types that override __getattribute__.
diff --git a/pypy/doc/config/objspace.usemodules.cpyext.rst b/pypy/doc/config/objspace.usemodules.cpyext.txt
copy from pypy/doc/config/objspace.usemodules.cpyext.rst
copy to pypy/doc/config/objspace.usemodules.cpyext.txt
diff --git a/pypy/doc/config/translation.platform.rst b/pypy/doc/config/translation.platform.rst
deleted file mode 100644
--- a/pypy/doc/config/translation.platform.rst
+++ /dev/null
@@ -1,1 +0,0 @@
-select the target platform, in case of cross-compilation
diff --git a/pypy/doc/config/translation.instrumentctl.rst b/pypy/doc/config/translation.instrumentctl.txt
copy from pypy/doc/config/translation.instrumentctl.rst
copy to pypy/doc/config/translation.instrumentctl.txt
diff --git a/pypy/doc/discussion/VM-integration.rst b/pypy/doc/discussion/VM-integration.rst
--- a/pypy/doc/discussion/VM-integration.rst
+++ b/pypy/doc/discussion/VM-integration.rst
@@ -1,5 +1,3 @@
-.. XXX anto, do we still need this?
-
==============================================
Integration of PyPy with host Virtual Machines
==============================================
diff --git a/pypy/doc/config/translation.fork_before.rst b/pypy/doc/config/translation.fork_before.rst
deleted file mode 100644
--- a/pypy/doc/config/translation.fork_before.rst
+++ /dev/null
@@ -1,4 +0,0 @@
-This is an option mostly useful when working on the PyPy toolchain. If you use
-it, translate.py will fork before the specified phase. If the translation
-crashes after that fork, you can fix the bug in the toolchain, and continue
-translation at the fork-point.
diff --git a/pypy/doc/config/objspace.std.withmethodcachecounter.rst b/pypy/doc/config/objspace.std.withmethodcachecounter.txt
copy from pypy/doc/config/objspace.std.withmethodcachecounter.rst
copy to pypy/doc/config/objspace.std.withmethodcachecounter.txt
diff --git a/pypy/doc/config/translation.fork_before.rst b/pypy/doc/config/translation.fork_before.txt
copy from pypy/doc/config/translation.fork_before.rst
copy to pypy/doc/config/translation.fork_before.txt
diff --git a/pypy/doc/config/translation.gcremovetypeptr.rst b/pypy/doc/config/translation.gcremovetypeptr.rst
deleted file mode 100644
--- a/pypy/doc/config/translation.gcremovetypeptr.rst
+++ /dev/null
@@ -1,1 +0,0 @@
-If set, save one word in every object. Framework GC only.
diff --git a/pypy/doc/config/objspace.usemodules._lsprof.rst b/pypy/doc/config/objspace.usemodules._lsprof.rst
deleted file mode 100644
--- a/pypy/doc/config/objspace.usemodules._lsprof.rst
+++ /dev/null
@@ -1,1 +0,0 @@
-Use the '_lsprof' module.
diff --git a/pypy/doc/config/translation.jit_profiler.rst b/pypy/doc/config/translation.jit_profiler.txt
copy from pypy/doc/config/translation.jit_profiler.rst
copy to pypy/doc/config/translation.jit_profiler.txt
diff --git a/pypy/doc/config/objspace.usemodules._sha.rst b/pypy/doc/config/objspace.usemodules._sha.rst
deleted file mode 100644
--- a/pypy/doc/config/objspace.usemodules._sha.rst
+++ /dev/null
@@ -1,5 +0,0 @@
-Use the built-in _'sha' module.
-This module is expected to be working and is included by default.
-There is also a pure Python version in lib_pypy which is used
-if the built-in is disabled, but it is several orders of magnitude
-slower.
diff --git a/pypy/doc/config/translation.force_make.rst b/pypy/doc/config/translation.force_make.txt
copy from pypy/doc/config/translation.force_make.rst
copy to pypy/doc/config/translation.force_make.txt
diff --git a/pypy/config/makerestdoc.py b/pypy/config/makerestdoc.py
--- a/pypy/config/makerestdoc.py
+++ b/pypy/config/makerestdoc.py
@@ -28,9 +28,6 @@
fullpath = get_fullpath(self, path)
result = Rest(
Title(fullpath, abovechar="=", belowchar="="),
- Directive("contents"),
- Paragraph(Link("back to parent", path + ".html")),
- Title("Basic Option Information"),
ListItem(Strong("name:"), self._name),
ListItem(Strong("description:"), self.doc))
if self.cmdline is not None:
@@ -132,36 +129,18 @@
def make_rest_doc(self, path=""):
fullpath = get_fullpath(self, path)
content = Rest(
- Title(fullpath, abovechar="=", belowchar="="),
- Directive("contents"))
- if path:
- content.add(
- Paragraph(Link("back to parent", path + ".html")))
+ Title(fullpath, abovechar="=", belowchar="="))
+ toctree = []
+ for child in self._children:
+ subpath = fullpath + "." + child._name
+ toctree.append(subpath)
+ content.add(Directive("toctree", *toctree, maxdepth=4))
content.join(
- Title("Basic Option Information"),
ListItem(Strong("name:"), self._name),
- ListItem(Strong("description:"), self.doc),
- Title("Sub-Options"))
+ ListItem(Strong("description:"), self.doc))
stack = []
- prefix = fullpath
curr = content
config = Config(self)
- for ending in self.getpaths(include_groups=True):
- subpath = fullpath + "." + ending
- while not (subpath.startswith(prefix) and
- subpath[len(prefix)] == "."):
- curr, prefix = stack.pop()
- print subpath, fullpath, ending, curr
- sub, step = config._cfgimpl_get_home_by_path(ending)
- doc = getattr(sub._cfgimpl_descr, step).doc
- if doc:
- new = curr.add(ListItem(Link(subpath + ":", subpath + ".html"),
- Em(doc)))
- else:
- new = curr.add(ListItem(Link(subpath + ":", subpath + ".html")))
- stack.append((curr, prefix))
- prefix = subpath
- curr = new
return content
diff --git a/pypy/doc/config/translation.instrumentctl.rst b/pypy/doc/config/translation.instrumentctl.rst
deleted file mode 100644
--- a/pypy/doc/config/translation.instrumentctl.rst
+++ /dev/null
@@ -1,3 +0,0 @@
-Internal option.
-
-.. internal
diff --git a/pypy/doc/discussion/cli-optimizations.rst b/pypy/doc/discussion/cli-optimizations.rst
deleted file mode 100644
--- a/pypy/doc/discussion/cli-optimizations.rst
+++ /dev/null
@@ -1,233 +0,0 @@
-Possible optimizations for the CLI backend
-==========================================
-
-Stack push/pop optimization
----------------------------
-
-The CLI's VM is a stack based machine: this fact doesn't play nicely
-with the SSI form the flowgraphs are generated in. At the moment
-gencli does a literal translation of the SSI statements, allocating a
-new local variable for each variable of the flowgraph.
-
-For example, consider the following RPython code and the corresponding
-flowgraph::
-
- def bar(x, y):
- foo(x+y, x-y)
-
-
- inputargs: x_0 y_0
- v0 = int_add(x_0, y_0)
- v1 = int_sub(x_0, y_0)
- v2 = directcall((sm foo), v0, v1)
-
-This is the IL code generated by the CLI backend::
-
- .locals init (int32 v0, int32 v1, int32 v2)
-
- block0:
- ldarg 'x_0'
- ldarg 'y_0'
- add
- stloc 'v0'
- ldarg 'x_0'
- ldarg 'y_0'
- sub
- stloc 'v1'
- ldloc 'v0'
- ldloc 'v1'
- call int32 foo(int32, int32)
- stloc 'v2'
-
-As you can see, the results of 'add' and 'sub' are stored in v0 and
-v1, respectively, then v0 and v1 are reloaded onto stack. These
-store/load is redundant, since the code would work nicely even without
-them::
-
- .locals init (int32 v2)
-
- block0:
- ldarg 'x_0'
- ldarg 'y_0'
- add
- ldarg 'x_0'
- ldarg 'y_0'
- sub
- call int32 foo(int32, int32)
- stloc 'v2'
-
-I've checked the native code generated by the Mono Jit on x86 and I've
-seen that it does not optimize it. I haven't checked the native code
-generated by Microsoft CLR, yet.
-
-Thus, we might consider to optimize it manually; it should not be so
-difficult, but it is not trivial because we have to make sure that the
-dropped locals are used only once.
-
-
-Mapping RPython exceptions to native CLI exceptions
----------------------------------------------------
-
-Both RPython and CLI have its own set of exception classes: some of
-these are pretty similar; e.g., we have OverflowError,
-ZeroDivisionError and IndexError on the first side and
-OverflowException, DivideByZeroException and IndexOutOfRangeException
-on the other side.
-
-The first attempt was to map RPython classes to their corresponding
-CLI ones: this worked for simple cases, but it would have triggered
-subtle bugs in more complex ones, because the two exception
-hierarchies don't completely overlap.
-
-For now I've chosen to build an RPython exception hierarchy
-completely independent from the CLI one, but this means that we can't
-rely on exceptions raised by standard operations. The currently
-implemented solution is to do an exception translation on-the-fly; for
-example, the 'ind_add_ovf' is translated into the following IL code::
-
- .try
- {
- ldarg 'x_0'
- ldarg 'y_0'
- add.ovf
- stloc 'v1'
- leave __check_block_2
- }
- catch [mscorlib]System.OverflowException
- {
- newobj instance void class exceptions.OverflowError::.ctor()
- dup
- ldsfld class Object_meta pypy.runtime.Constants::exceptions_OverflowError_meta
- stfld class Object_meta Object::meta
- throw
- }
-
-I.e., it catches the builtin OverflowException and raises a RPython
-OverflowError.
-
-I haven't measured timings yet, but I guess that this machinery brings
-to some performance penalties even in the non-overflow case; a
-possible optimization is to do the on-the-fly translation only when it
-is strictly necessary, i.e. only when the except clause catches an
-exception class whose subclass hierarchy is compatible with the
-builtin one. As an example, consider the following RPython code::
-
- try:
- return mylist[0]
- except IndexError:
- return -1
-
-Given that IndexError has no subclasses, we can map it to
-IndexOutOfBoundException and directly catch this one::
-
- try
- {
- ldloc 'mylist'
- ldc.i4 0
- call int32 getitem(MyListType, int32)
- ...
- }
- catch [mscorlib]System.IndexOutOfBoundException
- {
- // return -1
- ...
- }
-
-By contrast we can't do so if the except clause catches classes that
-don't directly map to any builtin class, such as LookupError::
-
- try:
- return mylist[0]
- except LookupError:
- return -1
-
-Has to be translated in the old way::
-
- .try
- {
- ldloc 'mylist'
- ldc.i4 0
-
- .try
- {
- call int32 getitem(MyListType, int32)
- }
- catch [mscorlib]System.IndexOutOfBoundException
- {
- // translate IndexOutOfBoundException into IndexError
- newobj instance void class exceptions.IndexError::.ctor()
- dup
- ldsfld class Object_meta pypy.runtime.Constants::exceptions_IndexError_meta
- stfld class Object_meta Object::meta
- throw
- }
- ...
- }
- .catch exceptions.LookupError
- {
- // return -1
- ...
- }
-
-
-Specializing methods of List
-----------------------------
-
-Most methods of RPython lists are implemented by ll_* helpers placed
-in rpython/rlist.py. For some of those we have a direct correspondent
-already implemented in .NET List<>; we could use the oopspec attribute
-for doing an on-the-fly replacement of these low level helpers with
-their builtin correspondent. As an example the 'append' method is
-already mapped to pypylib.List.append. Thanks to Armin Rigo for the
-idea of using oopspec.
-
-
-Doing some caching on Dict
---------------------------
-
-The current implementations of ll_dict_getitem and ll_dict_get in
-ootypesystem.rdict do two consecutive lookups (calling ll_contains and
-ll_get) on the same key. We might cache the result of
-pypylib.Dict.ll_contains so that the successive ll_get don't need a
-lookup. Btw, we need some profiling before choosing the best way. Or
-we could directly refactor ootypesystem.rdict for doing a single
-lookup.
-
-XXX
-I tried it on revision 32917 and performance are slower! I don't know
-why, but pypy.net pystone.py is slower by 17%, and pypy.net
-richards.py is slower by 71% (!!!). I don't know why, need to be
-investigated further.
-
-
-Optimize StaticMethod
----------------------
-
-::
-
- 2006-10-02, 13:41
-
- <pedronis> antocuni: do you try to not wrap static methods that are just called and not passed around
- <antocuni> no
- I think I don't know how to detect them
- <pedronis> antocuni: you should try to render them just as static methods not as instances when possible
- you need to track what appears only in direct_calls vs other places
-
-
-Optimize Unicode
-----------------
-
-We should try to use native .NET unicode facilities instead of our
-own. These should save both time (especially startup time) and memory.
-
-On 2006-10-02 I got these benchmarks:
-
-Pypy.NET Startup time Memory used
-with unicodedata ~12 sec 112508 Kb
-without unicodedata ~6 sec 79004 Kb
-
-The version without unicodedata is buggy, of course.
-
-Unfortunately it seems that .NET doesn't expose all the things we
-need, so we will still need some data. For example there is no way to
-get the unicode name of a char.
diff --git a/pypy/doc/config/translation.backendopt.constfold.rst b/pypy/doc/config/translation.backendopt.constfold.rst
deleted file mode 100644
--- a/pypy/doc/config/translation.backendopt.constfold.rst
+++ /dev/null
@@ -1,1 +0,0 @@
-Do constant folding of operations and constant propagation on flowgraphs.
diff --git a/pypy/doc/config/objspace.usemodules.pyexpat.rst b/pypy/doc/config/objspace.usemodules.pyexpat.rst
deleted file mode 100644
--- a/pypy/doc/config/objspace.usemodules.pyexpat.rst
+++ /dev/null
@@ -1,2 +0,0 @@
-Use (experimental) pyexpat module written in RPython, instead of CTypes
-version which is used by default.
diff --git a/pypy/doc/config/objspace.usemodules.binascii.rst b/pypy/doc/config/objspace.usemodules.binascii.txt
copy from pypy/doc/config/objspace.usemodules.binascii.rst
copy to pypy/doc/config/objspace.usemodules.binascii.txt
diff --git a/pypy/doc/config/translation.type_system.rst b/pypy/doc/config/translation.type_system.txt
copy from pypy/doc/config/translation.type_system.rst
copy to pypy/doc/config/translation.type_system.txt
diff --git a/pypy/doc/config/objspace.std.withtypeversion.rst b/pypy/doc/config/objspace.std.withtypeversion.txt
copy from pypy/doc/config/objspace.std.withtypeversion.rst
copy to pypy/doc/config/objspace.std.withtypeversion.txt
diff --git a/pypy/doc/config/objspace.usemodules._io.rst b/pypy/doc/config/objspace.usemodules._io.rst
deleted file mode 100644
--- a/pypy/doc/config/objspace.usemodules._io.rst
+++ /dev/null
@@ -1,2 +0,0 @@
-Use the '_io module.
-Used by the 'io' standard lib module. This module is expected to be working and is included by default.
diff --git a/pypy/doc/config/objspace.usemodules._lsprof.rst b/pypy/doc/config/objspace.usemodules._lsprof.txt
copy from pypy/doc/config/objspace.usemodules._lsprof.rst
copy to pypy/doc/config/objspace.usemodules._lsprof.txt
diff --git a/pypy/doc/config/translation.backendopt.remove_asserts.rst b/pypy/doc/config/translation.backendopt.remove_asserts.rst
deleted file mode 100644
--- a/pypy/doc/config/translation.backendopt.remove_asserts.rst
+++ /dev/null
@@ -1,1 +0,0 @@
-Remove raising of assertions from the flowgraphs, which might give small speedups.
diff --git a/pypy/doc/config/objspace.translationmodules.rst b/pypy/doc/config/objspace.translationmodules.rst
deleted file mode 100644
--- a/pypy/doc/config/objspace.translationmodules.rst
+++ /dev/null
@@ -1,1 +0,0 @@
-This option enables all modules which are needed to translate PyPy using PyPy.
diff --git a/pypy/doc/config/objspace.usemodules.array.rst b/pypy/doc/config/objspace.usemodules.array.rst
deleted file mode 100644
--- a/pypy/doc/config/objspace.usemodules.array.rst
+++ /dev/null
@@ -1,1 +0,0 @@
-Use interpreter-level version of array module (on by default).
diff --git a/pypy/doc/config/objspace.usemodules.termios.rst b/pypy/doc/config/objspace.usemodules.termios.txt
copy from pypy/doc/config/objspace.usemodules.termios.rst
copy to pypy/doc/config/objspace.usemodules.termios.txt
diff --git a/pypy/doc/config/translation.backendopt.mallocs.rst b/pypy/doc/config/translation.backendopt.mallocs.rst
deleted file mode 100644
--- a/pypy/doc/config/translation.backendopt.mallocs.rst
+++ /dev/null
@@ -1,29 +0,0 @@
-This optimization enables "malloc removal", which "explodes"
-allocations of structures which do not escape from the function they
-are allocated in into one or more additional local variables.
-
-An example. Consider this rather unlikely seeming code::
-
- class C:
- pass
- def f(y):
- c = C()
- c.x = y
- return c.x
-
-Malloc removal will spot that the ``C`` object can never leave ``f``
-and replace the above with code like this::
-
- def f(y):
- _c__x = y
- return _c__x
-
-It is rare for code to be directly written in a way that allows this
-optimization to be useful, but inlining often results in opportunities
-for its use (and indeed, this is one of the main reasons PyPy does its
-own inlining rather than relying on the C compilers).
-
-For much more information about this and other optimizations you can
-read section 4.1 of the technical report on "Massive Parallelism and
-Translation Aspects" which you can find on the `Technical reports page
-<../index-report.html>`__.
diff --git a/pypy/doc/config/translation.rweakref.rst b/pypy/doc/config/translation.rweakref.rst
deleted file mode 100644
--- a/pypy/doc/config/translation.rweakref.rst
+++ /dev/null
@@ -1,3 +0,0 @@
-This indicates if the backend and GC policy support RPython-level weakrefs.
-Can be tested in an RPython program to select between two implementation
-strategies.
diff --git a/pypy/doc/config/objspace.opcodes.rst b/pypy/doc/config/objspace.opcodes.txt
copy from pypy/doc/config/objspace.opcodes.rst
copy to pypy/doc/config/objspace.opcodes.txt
diff --git a/pypy/doc/config/objspace.usemodules._locale.rst b/pypy/doc/config/objspace.usemodules._locale.rst
deleted file mode 100644
--- a/pypy/doc/config/objspace.usemodules._locale.rst
+++ /dev/null
@@ -1,3 +0,0 @@
-Use the '_locale' module.
-This module runs _locale written in RPython (instead of ctypes version).
-It's not really finished yet; it's enabled by default on Windows.
diff --git a/pypy/doc/config/objspace.usemodules.cStringIO.rst b/pypy/doc/config/objspace.usemodules.cStringIO.txt
copy from pypy/doc/config/objspace.usemodules.cStringIO.rst
copy to pypy/doc/config/objspace.usemodules.cStringIO.txt
diff --git a/pypy/doc/config/objspace.usemodules.thread.rst b/pypy/doc/config/objspace.usemodules.thread.txt
copy from pypy/doc/config/objspace.usemodules.thread.rst
copy to pypy/doc/config/objspace.usemodules.thread.txt
diff --git a/pypy/doc/config/objspace.std.logspaceoptypes.rst b/pypy/doc/config/objspace.std.logspaceoptypes.txt
copy from pypy/doc/config/objspace.std.logspaceoptypes.rst
copy to pypy/doc/config/objspace.std.logspaceoptypes.txt
diff --git a/pypy/doc/config/translation.simplifying.rst b/pypy/doc/config/translation.simplifying.rst
deleted file mode 100644
--- a/pypy/doc/config/translation.simplifying.rst
+++ /dev/null
@@ -1,3 +0,0 @@
-Internal option.
-
-.. internal
diff --git a/pypy/doc/config/translation.backendopt.clever_malloc_removal_threshold.rst b/pypy/doc/config/translation.backendopt.clever_malloc_removal_threshold.txt
copy from pypy/doc/config/translation.backendopt.clever_malloc_removal_threshold.rst
copy to pypy/doc/config/translation.backendopt.clever_malloc_removal_threshold.txt
diff --git a/pypy/doc/config/objspace.usemodules.cStringIO.rst b/pypy/doc/config/objspace.usemodules.cStringIO.rst
deleted file mode 100644
--- a/pypy/doc/config/objspace.usemodules.cStringIO.rst
+++ /dev/null
@@ -1,4 +0,0 @@
-Use the built-in cStringIO module.
-
-If not enabled, importing cStringIO gives you the app-level
-implementation from the standard library StringIO module.
diff --git a/pypy/doc/config/objspace.usemodules._stackless.rst b/pypy/doc/config/objspace.usemodules._stackless.txt
copy from pypy/doc/config/objspace.usemodules._stackless.rst
copy to pypy/doc/config/objspace.usemodules._stackless.txt
diff --git a/pypy/doc/config/objspace.usemodules.zlib.rst b/pypy/doc/config/objspace.usemodules.zlib.rst
deleted file mode 100644
--- a/pypy/doc/config/objspace.usemodules.zlib.rst
+++ /dev/null
@@ -1,2 +0,0 @@
-Use the 'zlib' module.
-This module is expected to be working and is included by default.
diff --git a/pypy/doc/config/translation.instrument.rst b/pypy/doc/config/translation.instrument.txt
copy from pypy/doc/config/translation.instrument.rst
copy to pypy/doc/config/translation.instrument.txt
diff --git a/pypy/doc/config/translation.backendopt.profile_based_inline_heuristic.rst b/pypy/doc/config/translation.backendopt.profile_based_inline_heuristic.rst
deleted file mode 100644
--- a/pypy/doc/config/translation.backendopt.profile_based_inline_heuristic.rst
+++ /dev/null
@@ -1,4 +0,0 @@
-Internal option. Switch to a different weight heuristic for inlining.
-This is for profile-based inlining (:config:`translation.backendopt.profile_based_inline`).
-
-.. internal
diff --git a/pypy/doc/config/translation.insist.rst b/pypy/doc/config/translation.insist.txt
copy from pypy/doc/config/translation.insist.rst
copy to pypy/doc/config/translation.insist.txt
diff --git a/pypy/doc/config/objspace.std.withmapdict.rst b/pypy/doc/config/objspace.std.withmapdict.txt
copy from pypy/doc/config/objspace.std.withmapdict.rst
copy to pypy/doc/config/objspace.std.withmapdict.txt
diff --git a/pypy/doc/config/objspace.usemodules._ssl.rst b/pypy/doc/config/objspace.usemodules._ssl.txt
copy from pypy/doc/config/objspace.usemodules._ssl.rst
copy to pypy/doc/config/objspace.usemodules._ssl.txt
diff --git a/pypy/doc/config/translation.linkerflags.rst b/pypy/doc/config/translation.linkerflags.txt
copy from pypy/doc/config/translation.linkerflags.rst
copy to pypy/doc/config/translation.linkerflags.txt
diff --git a/pypy/doc/config/translation.withsmallfuncsets.rst b/pypy/doc/config/translation.withsmallfuncsets.rst
deleted file mode 100644
--- a/pypy/doc/config/translation.withsmallfuncsets.rst
+++ /dev/null
@@ -1,3 +0,0 @@
-Represent function sets smaller than this option's value as an integer instead
-of a function pointer. A call is then done via a switch on that integer, which
-allows inlining etc. Small numbers for this can speed up PyPy (try 5).
diff --git a/pypy/doc/config/objspace.usemodules.errno.rst b/pypy/doc/config/objspace.usemodules.errno.txt
copy from pypy/doc/config/objspace.usemodules.errno.rst
copy to pypy/doc/config/objspace.usemodules.errno.txt
diff --git a/pypy/doc/config/objspace.usemodules.itertools.rst b/pypy/doc/config/objspace.usemodules.itertools.txt
copy from pypy/doc/config/objspace.usemodules.itertools.rst
copy to pypy/doc/config/objspace.usemodules.itertools.txt
diff --git a/pypy/doc/config/translation.cli.exception_transformer.rst b/pypy/doc/config/translation.cli.exception_transformer.rst
deleted file mode 100644
--- a/pypy/doc/config/translation.cli.exception_transformer.rst
+++ /dev/null
@@ -1,3 +0,0 @@
-Use the exception transformer instead of the native .NET exceptions to
-implement RPython exceptions. Enable this option only if you know what
-you are doing.
diff --git a/pypy/doc/config/objspace.usemodules.marshal.rst b/pypy/doc/config/objspace.usemodules.marshal.txt
copy from pypy/doc/config/objspace.usemodules.marshal.rst
copy to pypy/doc/config/objspace.usemodules.marshal.txt
diff --git a/pypy/doc/config/objspace.std.withsmallint.rst b/pypy/doc/config/objspace.std.withsmallint.txt
copy from pypy/doc/config/objspace.std.withsmallint.rst
copy to pypy/doc/config/objspace.std.withsmallint.txt
diff --git a/pypy/doc/config/translation.backendopt.profile_based_inline_threshold.rst b/pypy/doc/config/translation.backendopt.profile_based_inline_threshold.txt
copy from pypy/doc/config/translation.backendopt.profile_based_inline_threshold.rst
copy to pypy/doc/config/translation.backendopt.profile_based_inline_threshold.txt
diff --git a/pypy/doc/config/objspace.usemodules._sre.rst b/pypy/doc/config/objspace.usemodules._sre.rst
deleted file mode 100644
--- a/pypy/doc/config/objspace.usemodules._sre.rst
+++ /dev/null
@@ -1,2 +0,0 @@
-Use the '_sre' module.
-This module is expected to be working and is included by default.
diff --git a/pypy/doc/config/translation.backendopt.print_statistics.rst b/pypy/doc/config/translation.backendopt.print_statistics.txt
copy from pypy/doc/config/translation.backendopt.print_statistics.rst
copy to pypy/doc/config/translation.backendopt.print_statistics.txt
diff --git a/pypy/doc/config/translation.taggedpointers.rst b/pypy/doc/config/translation.taggedpointers.rst
deleted file mode 100644
--- a/pypy/doc/config/translation.taggedpointers.rst
+++ /dev/null
@@ -1,3 +0,0 @@
-Enable tagged pointers. This option is mostly useful for the Smalltalk and
-Prolog interpreters. For the Python interpreter the option
-:config:`objspace.std.withsmallint` should be used.
diff --git a/pypy/doc/config/objspace.usemodules.imp.rst b/pypy/doc/config/objspace.usemodules.imp.rst
deleted file mode 100644
--- a/pypy/doc/config/objspace.usemodules.imp.rst
+++ /dev/null
@@ -1,2 +0,0 @@
-Use the 'imp' module.
-This module is included by default.
diff --git a/pypy/doc/config/objspace.usemodules.time.rst b/pypy/doc/config/objspace.usemodules.time.rst
deleted file mode 100644
--- a/pypy/doc/config/objspace.usemodules.time.rst
+++ /dev/null
@@ -1,4 +0,0 @@
-Use the 'time' module.
-
-Obsolete; use :config:`objspace.usemodules.rctime` for our up-to-date version
-of the application-level 'time' module.
diff --git a/pypy/doc/config/objspace.std.withtproxy.rst b/pypy/doc/config/objspace.std.withtproxy.txt
copy from pypy/doc/config/objspace.std.withtproxy.rst
copy to pypy/doc/config/objspace.std.withtproxy.txt
diff --git a/pypy/doc/config/translation.output.rst b/pypy/doc/config/translation.output.txt
copy from pypy/doc/config/translation.output.rst
copy to pypy/doc/config/translation.output.txt
diff --git a/pypy/doc/config/objspace.std.mutable_builtintypes.rst b/pypy/doc/config/objspace.std.mutable_builtintypes.txt
copy from pypy/doc/config/objspace.std.mutable_builtintypes.rst
copy to pypy/doc/config/objspace.std.mutable_builtintypes.txt
diff --git a/pypy/doc/config/translation.taggedpointers.rst b/pypy/doc/config/translation.taggedpointers.txt
copy from pypy/doc/config/translation.taggedpointers.rst
copy to pypy/doc/config/translation.taggedpointers.txt
diff --git a/pypy/doc/config/translation.backendopt.print_statistics.rst b/pypy/doc/config/translation.backendopt.print_statistics.rst
deleted file mode 100644
--- a/pypy/doc/config/translation.backendopt.print_statistics.rst
+++ /dev/null
@@ -1,2 +0,0 @@
-Debugging option. Print statics about the forest of flowgraphs as they
-go through the various backend optimizations.
\ No newline at end of file
diff --git a/pypy/doc/config/objspace.usemodules._locale.rst b/pypy/doc/config/objspace.usemodules._locale.txt
copy from pypy/doc/config/objspace.usemodules._locale.rst
copy to pypy/doc/config/objspace.usemodules._locale.txt
diff --git a/pypy/doc/config/translation.instrument.rst b/pypy/doc/config/translation.instrument.rst
deleted file mode 100644
--- a/pypy/doc/config/translation.instrument.rst
+++ /dev/null
@@ -1,3 +0,0 @@
-Internal option.
-
-.. internal
diff --git a/pypy/doc/config/objspace.usemodules._warnings.rst b/pypy/doc/config/objspace.usemodules._warnings.rst
deleted file mode 100644
--- a/pypy/doc/config/objspace.usemodules._warnings.rst
+++ /dev/null
@@ -1,1 +0,0 @@
-Use the '_warning' module. This module is expected to be working and is included by default.
diff --git a/pypy/doc/config/objspace.std.getattributeshortcut.rst b/pypy/doc/config/objspace.std.getattributeshortcut.txt
copy from pypy/doc/config/objspace.std.getattributeshortcut.rst
copy to pypy/doc/config/objspace.std.getattributeshortcut.txt
diff --git a/pypy/doc/config/translation.countmallocs.rst b/pypy/doc/config/translation.countmallocs.txt
copy from pypy/doc/config/translation.countmallocs.rst
copy to pypy/doc/config/translation.countmallocs.txt
diff --git a/pypy/doc/config/objspace.std.withstrjoin.rst b/pypy/doc/config/objspace.std.withstrjoin.txt
copy from pypy/doc/config/objspace.std.withstrjoin.rst
copy to pypy/doc/config/objspace.std.withstrjoin.txt
diff --git a/pypy/doc/config/translation.debug.rst b/pypy/doc/config/translation.debug.txt
copy from pypy/doc/config/translation.debug.rst
copy to pypy/doc/config/translation.debug.txt
diff --git a/pypy/doc/config/objspace.usemodules.token.rst b/pypy/doc/config/objspace.usemodules.token.txt
copy from pypy/doc/config/objspace.usemodules.token.rst
copy to pypy/doc/config/objspace.usemodules.token.txt
diff --git a/pypy/doc/config/translation.backendopt.mallocs.rst b/pypy/doc/config/translation.backendopt.mallocs.txt
copy from pypy/doc/config/translation.backendopt.mallocs.rst
copy to pypy/doc/config/translation.backendopt.mallocs.txt
diff --git a/pypy/doc/config/translation.vanilla.rst b/pypy/doc/config/translation.vanilla.txt
copy from pypy/doc/config/translation.vanilla.rst
copy to pypy/doc/config/translation.vanilla.txt
diff --git a/pypy/doc/config/objspace.std.withprebuiltchar.rst b/pypy/doc/config/objspace.std.withprebuiltchar.txt
copy from pypy/doc/config/objspace.std.withprebuiltchar.rst
copy to pypy/doc/config/objspace.std.withprebuiltchar.txt
diff --git a/pypy/doc/config/translation.profopt.rst b/pypy/doc/config/translation.profopt.rst
deleted file mode 100644
--- a/pypy/doc/config/translation.profopt.rst
+++ /dev/null
@@ -1,5 +0,0 @@
-Use GCCs profile-guided optimizations. This option specifies the the
-arguments with which to call pypy-c (and in general the translated
-RPython program) to gather profile data. Example for pypy-c: "-c 'from
-richards import main;main(); from test import pystone;
-pystone.main()'"
diff --git a/pypy/doc/config/objspace.usemodules.clr.rst b/pypy/doc/config/objspace.usemodules.clr.rst
deleted file mode 100644
--- a/pypy/doc/config/objspace.usemodules.clr.rst
+++ /dev/null
@@ -1,1 +0,0 @@
-Use the 'clr' module.
diff --git a/pypy/doc/config/objspace.usemodules.crypt.rst b/pypy/doc/config/objspace.usemodules.crypt.txt
copy from pypy/doc/config/objspace.usemodules.crypt.rst
copy to pypy/doc/config/objspace.usemodules.crypt.txt
diff --git a/pypy/doc/config/objspace.usemodules._ssl.rst b/pypy/doc/config/objspace.usemodules._ssl.rst
deleted file mode 100644
--- a/pypy/doc/config/objspace.usemodules._ssl.rst
+++ /dev/null
@@ -1,1 +0,0 @@
-Use the '_ssl' module, which implements SSL socket operations.
diff --git a/pypy/doc/config/objspace.usemodules._socket.rst b/pypy/doc/config/objspace.usemodules._socket.rst
deleted file mode 100644
--- a/pypy/doc/config/objspace.usemodules._socket.rst
+++ /dev/null
@@ -1,7 +0,0 @@
-Use the '_socket' module.
-
-This is our implementation of '_socket', the Python builtin module
-exposing socket primitives, which is wrapped and used by the standard
-library 'socket.py' module. It is based on `rffi`_.
-
-.. _`rffi`: ../rffi.html
diff --git a/pypy/doc/config/translation.backendopt.inline.rst b/pypy/doc/config/translation.backendopt.inline.rst
deleted file mode 100644
--- a/pypy/doc/config/translation.backendopt.inline.rst
+++ /dev/null
@@ -1,10 +0,0 @@
-Inline flowgraphs based on an heuristic, the default one considers
-essentially the a weight for the flowgraph based on the number of
-low-level operations in them (see
-:config:`translation.backendopt.inline_threshold` ).
-
-Some amount of inlining in order to have RPython builtin type helpers
-inlined is needed for malloc removal
-(:config:`translation.backendopt.mallocs`) to be effective.
-
-This optimization is used by default.
diff --git a/pypy/doc/config/objspace.std.withropeunicode.rst b/pypy/doc/config/objspace.std.withropeunicode.txt
copy from pypy/doc/config/objspace.std.withropeunicode.rst
copy to pypy/doc/config/objspace.std.withropeunicode.txt
diff --git a/pypy/doc/config/objspace.std.multimethods.rst b/pypy/doc/config/objspace.std.multimethods.txt
copy from pypy/doc/config/objspace.std.multimethods.rst
copy to pypy/doc/config/objspace.std.multimethods.txt
diff --git a/pypy/doc/config/objspace.std.withsmalllong.rst b/pypy/doc/config/objspace.std.withsmalllong.rst
deleted file mode 100644
--- a/pypy/doc/config/objspace.std.withsmalllong.rst
+++ /dev/null
@@ -1,5 +0,0 @@
-Enable "small longs", an additional implementation of the Python
-type "long", implemented with a C long long. It is mostly useful
-on 32-bit; on 64-bit, a C long long is the same as a C long, so
-its usefulness is limited to Python objects of type "long" that
-would anyway fit in an "int".
diff --git a/pypy/doc/config/objspace.opcodes.rst b/pypy/doc/config/objspace.opcodes.rst
deleted file mode 100644
--- a/pypy/doc/config/objspace.opcodes.rst
+++ /dev/null
@@ -1,1 +0,0 @@
-.. intentionally empty
diff --git a/pypy/doc/config/objspace.usemodules.parser.rst b/pypy/doc/config/objspace.usemodules.parser.txt
copy from pypy/doc/config/objspace.usemodules.parser.rst
copy to pypy/doc/config/objspace.usemodules.parser.txt
diff --git a/pypy/doc/config/objspace.std.withrope.rst b/pypy/doc/config/objspace.std.withrope.rst
deleted file mode 100644
--- a/pypy/doc/config/objspace.std.withrope.rst
+++ /dev/null
@@ -1,7 +0,0 @@
-Enable ropes to be the default string implementation.
-
-See the section in `Standard Interpreter Optimizations`_ for more details.
-
-.. _`Standard Interpreter Optimizations`: ../interpreter-optimizations.html#ropes
-
-
diff --git a/pypy/doc/config/objspace.usemodules.crypt.rst b/pypy/doc/config/objspace.usemodules.crypt.rst
deleted file mode 100644
--- a/pypy/doc/config/objspace.usemodules.crypt.rst
+++ /dev/null
@@ -1,2 +0,0 @@
-Use the 'crypt' module.
-This module is expected to be fully working.
diff --git a/pypy/doc/config/objspace.std.logspaceoptypes.rst b/pypy/doc/config/objspace.std.logspaceoptypes.rst
deleted file mode 100644
--- a/pypy/doc/config/objspace.std.logspaceoptypes.rst
+++ /dev/null
@@ -1,4 +0,0 @@
-.. internal
-
-Wrap "simple" bytecode implementations like BINARY_ADD with code that collects
-information about which types these bytecodes receive as arguments.
diff --git a/pypy/doc/config/objspace.usemodules.rst b/pypy/doc/config/objspace.usemodules.txt
copy from pypy/doc/config/objspace.usemodules.rst
copy to pypy/doc/config/objspace.usemodules.txt
diff --git a/pypy/doc/config/translation.backendopt.clever_malloc_removal_heuristic.rst b/pypy/doc/config/translation.backendopt.clever_malloc_removal_heuristic.rst
deleted file mode 100644
--- a/pypy/doc/config/translation.backendopt.clever_malloc_removal_heuristic.rst
+++ /dev/null
@@ -1,4 +0,0 @@
-Internal option. Switch to a different weight heuristic for inlining.
-This is for clever malloc removal (:config:`translation.backendopt.clever_malloc_removal`).
-
-.. internal
diff --git a/pypy/doc/config/objspace.usemodules._demo.rst b/pypy/doc/config/objspace.usemodules._demo.txt
copy from pypy/doc/config/objspace.usemodules._demo.rst
copy to pypy/doc/config/objspace.usemodules._demo.txt
diff --git a/pypy/doc/config/translation.noprofopt.rst b/pypy/doc/config/translation.noprofopt.txt
copy from pypy/doc/config/translation.noprofopt.rst
copy to pypy/doc/config/translation.noprofopt.txt
diff --git a/pypy/doc/config/translation.backendopt.clever_malloc_removal_threshold.rst b/pypy/doc/config/translation.backendopt.clever_malloc_removal_threshold.rst
deleted file mode 100644
--- a/pypy/doc/config/translation.backendopt.clever_malloc_removal_threshold.rst
+++ /dev/null
@@ -1,2 +0,0 @@
-Weight threshold used to decide whether to inline flowgraphs.
-This is for clever malloc removal (:config:`translation.backendopt.clever_malloc_removal`).
diff --git a/pypy/doc/config/translation.gcrootfinder.rst b/pypy/doc/config/translation.gcrootfinder.rst
deleted file mode 100644
--- a/pypy/doc/config/translation.gcrootfinder.rst
+++ /dev/null
@@ -1,15 +0,0 @@
-Choose method how to find roots in the GC. Boehm and refcounting have their own
-methods, this is mostly only interesting for framework GCs. For those you have
-a choice of various alternatives:
-
- - use a shadow stack (XXX link to paper), e.g. explicitly maintaining a stack
- of roots
-
- - use stackless to find roots by unwinding the stack. Requires
- :config:`translation.stackless`. Note that this turned out to
- be slower than just using a shadow stack.
-
- - use GCC and i386 specific assembler hackery to find the roots on the stack.
- This is fastest but platform specific.
-
- - Use LLVM's GC facilities to find the roots.
diff --git a/pypy/doc/config/translation.builtins_can_raise_exceptions.rst b/pypy/doc/config/translation.builtins_can_raise_exceptions.txt
copy from pypy/doc/config/translation.builtins_can_raise_exceptions.rst
copy to pypy/doc/config/translation.builtins_can_raise_exceptions.txt
diff --git a/.hgignore b/.hgignore
--- a/.hgignore
+++ b/.hgignore
@@ -17,6 +17,7 @@
^pypy/module/cpyext/test/.+\.manifest$
^pypy/module/test_lib_pypy/ctypes_tests/.+\.o$
^pypy/doc/.+\.html$
+^pypy/doc/config/.+\.rst$
^pypy/doc/basicblock\.asc$
^pypy/doc/.+\.svninfo$
^pypy/translator/c/src/libffi_msvc/.+\.obj$
diff --git a/pypy/doc/config/translation.backendopt.raisingop2direct_call.rst b/pypy/doc/config/translation.backendopt.raisingop2direct_call.txt
copy from pypy/doc/config/translation.backendopt.raisingop2direct_call.rst
copy to pypy/doc/config/translation.backendopt.raisingop2direct_call.txt
diff --git a/pypy/doc/config/objspace.usemodules._minimal_curses.rst b/pypy/doc/config/objspace.usemodules._minimal_curses.txt
copy from pypy/doc/config/objspace.usemodules._minimal_curses.rst
copy to pypy/doc/config/objspace.usemodules._minimal_curses.txt
diff --git a/pypy/doc/config/objspace.std.withdictmeasurement.rst b/pypy/doc/config/objspace.std.withdictmeasurement.rst
deleted file mode 100644
--- a/pypy/doc/config/objspace.std.withdictmeasurement.rst
+++ /dev/null
@@ -1,3 +0,0 @@
-Internal option.
-
-.. internal
diff --git a/pypy/doc/config/translation.ootype.mangle.rst b/pypy/doc/config/translation.ootype.mangle.txt
copy from pypy/doc/config/translation.ootype.mangle.rst
copy to pypy/doc/config/translation.ootype.mangle.txt
diff --git a/pypy/doc/config/objspace.usemodules.zipimport.rst b/pypy/doc/config/objspace.usemodules.zipimport.txt
copy from pypy/doc/config/objspace.usemodules.zipimport.rst
copy to pypy/doc/config/objspace.usemodules.zipimport.txt
diff --git a/pypy/doc/config/translation.jit_ffi.rst b/pypy/doc/config/translation.jit_ffi.txt
copy from pypy/doc/config/translation.jit_ffi.rst
copy to pypy/doc/config/translation.jit_ffi.txt
diff --git a/pypy/doc/config/objspace.usemodules.itertools.rst b/pypy/doc/config/objspace.usemodules.itertools.rst
deleted file mode 100644
--- a/pypy/doc/config/objspace.usemodules.itertools.rst
+++ /dev/null
@@ -1,2 +0,0 @@
-Use the interp-level 'itertools' module.
-If not included, a slower app-level version of itertools is used.
diff --git a/pypy/doc/config/translation.list_comprehension_operations.rst b/pypy/doc/config/translation.list_comprehension_operations.txt
copy from pypy/doc/config/translation.list_comprehension_operations.rst
copy to pypy/doc/config/translation.list_comprehension_operations.txt
diff --git a/pypy/doc/config/objspace.usemodules.rst b/pypy/doc/config/objspace.usemodules.rst
deleted file mode 100644
--- a/pypy/doc/config/objspace.usemodules.rst
+++ /dev/null
@@ -1,1 +0,0 @@
-.. intentionally empty
diff --git a/pypy/doc/config/objspace.usemodules._rawffi.rst b/pypy/doc/config/objspace.usemodules._rawffi.rst
deleted file mode 100644
--- a/pypy/doc/config/objspace.usemodules._rawffi.rst
+++ /dev/null
@@ -1,3 +0,0 @@
-An experimental module providing very low-level interface to
-C-level libraries, for use when implementing ctypes, not
-intended for a direct use at all.
\ No newline at end of file
diff --git a/pypy/doc/config/objspace.usemodules._pickle_support.rst b/pypy/doc/config/objspace.usemodules._pickle_support.rst
deleted file mode 100644
--- a/pypy/doc/config/objspace.usemodules._pickle_support.rst
+++ /dev/null
@@ -1,6 +0,0 @@
-Use the '_pickle_support' module.
-Internal helpers for pickling runtime builtin types (frames, cells, etc)
-for `stackless`_ tasklet pickling support.
-.. _`stackless`: ../stackless.html
-
-.. internal
diff --git a/pypy/doc/config/objspace.usemodules._demo.rst b/pypy/doc/config/objspace.usemodules._demo.rst
deleted file mode 100644
--- a/pypy/doc/config/objspace.usemodules._demo.rst
+++ /dev/null
@@ -1,3 +0,0 @@
-Use the '_demo' module.
-
-This is the demo module for mixed modules. Not enabled by default.
diff --git a/pypy/doc/config/translation.backendopt.merge_if_blocks.rst b/pypy/doc/config/translation.backendopt.merge_if_blocks.txt
copy from pypy/doc/config/translation.backendopt.merge_if_blocks.rst
copy to pypy/doc/config/translation.backendopt.merge_if_blocks.txt
diff --git a/pypy/doc/config/objspace.extmodules.rst b/pypy/doc/config/objspace.extmodules.txt
copy from pypy/doc/config/objspace.extmodules.rst
copy to pypy/doc/config/objspace.extmodules.txt
diff --git a/pypy/doc/config/objspace.usemodules._rawffi.rst b/pypy/doc/config/objspace.usemodules._rawffi.txt
copy from pypy/doc/config/objspace.usemodules._rawffi.rst
copy to pypy/doc/config/objspace.usemodules._rawffi.txt
diff --git a/pypy/doc/config/translation.ootype.rst b/pypy/doc/config/translation.ootype.rst
deleted file mode 100644
--- a/pypy/doc/config/translation.ootype.rst
+++ /dev/null
@@ -1,1 +0,0 @@
-This group contains options specific for ootypesystem.
diff --git a/pypy/doc/config/objspace.usemodules._hashlib.rst b/pypy/doc/config/objspace.usemodules._hashlib.rst
deleted file mode 100644
--- a/pypy/doc/config/objspace.usemodules._hashlib.rst
+++ /dev/null
@@ -1,2 +0,0 @@
-Use the '_hashlib' module.
-Used by the 'hashlib' standard lib module, and indirectly by the various cryptographic libs. This module is expected to be working and is included by default.
diff --git a/pypy/doc/config/objspace.usemodules._socket.rst b/pypy/doc/config/objspace.usemodules._socket.txt
copy from pypy/doc/config/objspace.usemodules._socket.rst
copy to pypy/doc/config/objspace.usemodules._socket.txt
diff --git a/pypy/doc/config/translation.cc.rst b/pypy/doc/config/translation.cc.rst
deleted file mode 100644
--- a/pypy/doc/config/translation.cc.rst
+++ /dev/null
@@ -1,1 +0,0 @@
-Specify which C compiler to use.
diff --git a/pypy/doc/config/objspace.lonepycfiles.rst b/pypy/doc/config/objspace.lonepycfiles.rst
deleted file mode 100644
--- a/pypy/doc/config/objspace.lonepycfiles.rst
+++ /dev/null
@@ -1,16 +0,0 @@
-If turned on, PyPy accepts to import a module ``x`` if it finds a
-file ``x.pyc`` even if there is no file ``x.py``.
-
-This is the way that CPython behaves, but it is disabled by
-default for PyPy because it is a common cause of issues: most
-typically, the ``x.py`` file is removed (manually or by a
-version control system) but the ``x`` module remains
-accidentally importable because the ``x.pyc`` file stays
-around.
-
-The usual reason for wanting this feature is to distribute
-non-open-source Python programs by distributing ``pyc`` files
-only, but this use case is not practical for PyPy at the
-moment because multiple versions of PyPy compiled with various
-optimizations might be unable to load each other's ``pyc``
-files.
diff --git a/pypy/doc/config/objspace.std.withtypeversion.rst b/pypy/doc/config/objspace.std.withtypeversion.rst
deleted file mode 100644
--- a/pypy/doc/config/objspace.std.withtypeversion.rst
+++ /dev/null
@@ -1,6 +0,0 @@
-This (mostly internal) option enables "type versions": Every type object gets an
-(only internally visible) version that is updated when the type's dict is
-changed. This is e.g. used for invalidating caches. It does not make sense to
-enable this option alone.
-
-.. internal
diff --git a/pypy/doc/config/translation.thread.rst b/pypy/doc/config/translation.thread.txt
copy from pypy/doc/config/translation.thread.rst
copy to pypy/doc/config/translation.thread.txt
diff --git a/pypy/doc/config/translation.backendopt.profile_based_inline_heuristic.rst b/pypy/doc/config/translation.backendopt.profile_based_inline_heuristic.txt
copy from pypy/doc/config/translation.backendopt.profile_based_inline_heuristic.rst
copy to pypy/doc/config/translation.backendopt.profile_based_inline_heuristic.txt
diff --git a/pypy/doc/config/objspace.usemodules.fcntl.rst b/pypy/doc/config/objspace.usemodules.fcntl.rst
deleted file mode 100644
--- a/pypy/doc/config/objspace.usemodules.fcntl.rst
+++ /dev/null
@@ -1,2 +0,0 @@
-Use the 'fcntl' module.
-This module is expected to be fully working.
diff --git a/pypy/doc/config/objspace.disable_call_speedhacks.rst b/pypy/doc/config/objspace.disable_call_speedhacks.rst
deleted file mode 100644
--- a/pypy/doc/config/objspace.disable_call_speedhacks.rst
+++ /dev/null
@@ -1,2 +0,0 @@
-disable the speed hacks that the interpreter normally does. Usually you don't
-want to set this to False, but some object spaces require it.
diff --git a/pypy/doc/config/objspace.usemodules.gc.rst b/pypy/doc/config/objspace.usemodules.gc.txt
copy from pypy/doc/config/objspace.usemodules.gc.rst
copy to pypy/doc/config/objspace.usemodules.gc.txt
diff --git a/pypy/doc/config/objspace.std.withsmalllong.rst b/pypy/doc/config/objspace.std.withsmalllong.txt
copy from pypy/doc/config/objspace.std.withsmalllong.rst
copy to pypy/doc/config/objspace.std.withsmalllong.txt
diff --git a/pypy/doc/config/objspace.nofaking.rst b/pypy/doc/config/objspace.nofaking.rst
deleted file mode 100644
--- a/pypy/doc/config/objspace.nofaking.rst
+++ /dev/null
@@ -1,7 +0,0 @@
-This options prevents the automagic borrowing of implementations of
-modules and types not present in PyPy from CPython.
-
-As such, it is required when translating, as then there is no CPython
-to borrow from. For running py.py it is useful for testing the
-implementation of modules like "posix", but it makes everything even
-slower than it is already.
diff --git a/pypy/doc/config/translation.gctransformer.rst b/pypy/doc/config/translation.gctransformer.txt
copy from pypy/doc/config/translation.gctransformer.rst
copy to pypy/doc/config/translation.gctransformer.txt
diff --git a/pypy/doc/config/translation.backend.rst b/pypy/doc/config/translation.backend.txt
copy from pypy/doc/config/translation.backend.rst
copy to pypy/doc/config/translation.backend.txt
diff --git a/pypy/doc/config/translation.backendopt.really_remove_asserts.rst b/pypy/doc/config/translation.backendopt.really_remove_asserts.txt
copy from pypy/doc/config/translation.backendopt.really_remove_asserts.rst
copy to pypy/doc/config/translation.backendopt.really_remove_asserts.txt
diff --git a/pypy/doc/config/objspace.usemodules.exceptions.rst b/pypy/doc/config/objspace.usemodules.exceptions.rst
deleted file mode 100644
--- a/pypy/doc/config/objspace.usemodules.exceptions.rst
+++ /dev/null
@@ -1,2 +0,0 @@
-Use the 'exceptions' module.
-This module is essential, included by default and should not be removed.
diff --git a/pypy/doc/config/objspace.std.withstrjoin.rst b/pypy/doc/config/objspace.std.withstrjoin.rst
deleted file mode 100644
--- a/pypy/doc/config/objspace.std.withstrjoin.rst
+++ /dev/null
@@ -1,7 +0,0 @@
-Enable "string join" objects.
-
-See the page about `Standard Interpreter Optimizations`_ for more details.
-
-.. _`Standard Interpreter Optimizations`: ../interpreter-optimizations.html#string-join-objects
-
-
diff --git a/pypy/doc/config/translation.backendopt.clever_malloc_removal.rst b/pypy/doc/config/translation.backendopt.clever_malloc_removal.txt
copy from pypy/doc/config/translation.backendopt.clever_malloc_removal.rst
copy to pypy/doc/config/translation.backendopt.clever_malloc_removal.txt
diff --git a/pypy/doc/config/objspace.usemodules.gc.rst b/pypy/doc/config/objspace.usemodules.gc.rst
deleted file mode 100644
--- a/pypy/doc/config/objspace.usemodules.gc.rst
+++ /dev/null
@@ -1,5 +0,0 @@
-Use the 'gc' module.
-This module is expected to be working and is included by default.
-Note that since the gc module is highly implementation specific, it contains
-only the ``collect`` function in PyPy, which forces a collection when compiled
-with the framework or with Boehm.
diff --git a/pypy/doc/config/objspace.usemodules.micronumpy.rst b/pypy/doc/config/objspace.usemodules.micronumpy.rst
deleted file mode 100644
--- a/pypy/doc/config/objspace.usemodules.micronumpy.rst
+++ /dev/null
@@ -1,3 +0,0 @@
-Use the micronumpy module.
-This module provides a very basic numpy-like interface. Major use-case
-is to show how jit scales for other code.
diff --git a/pypy/doc/config/translation.log.rst b/pypy/doc/config/translation.log.rst
deleted file mode 100644
--- a/pypy/doc/config/translation.log.rst
+++ /dev/null
@@ -1,5 +0,0 @@
-Include debug prints in the translation.
-
-These must be enabled by setting the PYPYLOG environment variable.
-The exact set of features supported by PYPYLOG is described in
-pypy/translation/c/src/debug.h.
diff --git a/pypy/doc/config/objspace.usemodules.rbench.rst b/pypy/doc/config/objspace.usemodules.rbench.rst
deleted file mode 100644
--- a/pypy/doc/config/objspace.usemodules.rbench.rst
+++ /dev/null
@@ -1,4 +0,0 @@
-Use the built-in 'rbench' module.
-This module contains geninterpreted versions of pystone and richards,
-so it is useful to measure the interpretation overhead of the various
-pypy-\*.
diff --git a/pypy/doc/config/objspace.usemodules.__builtin__.rst b/pypy/doc/config/objspace.usemodules.__builtin__.txt
copy from pypy/doc/config/objspace.usemodules.__builtin__.rst
copy to pypy/doc/config/objspace.usemodules.__builtin__.txt
diff --git a/pypy/doc/config/objspace.std.withstrbuf.rst b/pypy/doc/config/objspace.std.withstrbuf.rst
deleted file mode 100644
--- a/pypy/doc/config/objspace.std.withstrbuf.rst
+++ /dev/null
@@ -1,4 +0,0 @@
-Enable "string buffer" objects.
-
-Similar to "string join" objects, but using a StringBuilder to represent
-a string built by repeated application of ``+=``.
diff --git a/pypy/doc/config/translation.compilerflags.rst b/pypy/doc/config/translation.compilerflags.txt
copy from pypy/doc/config/translation.compilerflags.rst
copy to pypy/doc/config/translation.compilerflags.txt
diff --git a/pypy/doc/config/objspace.usemodules.cmath.rst b/pypy/doc/config/objspace.usemodules.cmath.txt
copy from pypy/doc/config/objspace.usemodules.cmath.rst
copy to pypy/doc/config/objspace.usemodules.cmath.txt
diff --git a/pypy/doc/config/objspace.usemodules._bisect.rst b/pypy/doc/config/objspace.usemodules._bisect.txt
copy from pypy/doc/config/objspace.usemodules._bisect.rst
copy to pypy/doc/config/objspace.usemodules._bisect.txt
diff --git a/pypy/doc/config/translation.no__thread.rst b/pypy/doc/config/translation.no__thread.txt
copy from pypy/doc/config/translation.no__thread.rst
copy to pypy/doc/config/translation.no__thread.txt
diff --git a/pypy/doc/config/translation.noprofopt.rst b/pypy/doc/config/translation.noprofopt.rst
deleted file mode 100644
diff --git a/pypy/doc/config/objspace.usemodules._minimal_curses.rst b/pypy/doc/config/objspace.usemodules._minimal_curses.rst
deleted file mode 100644
--- a/pypy/doc/config/objspace.usemodules._minimal_curses.rst
+++ /dev/null
@@ -1,2 +0,0 @@
-Use the '_curses' module.
-This module is just a stub. It only implements a few functions.
diff --git a/pypy/doc/config/objspace.opcodes.CALL_LIKELY_BUILTIN.rst b/pypy/doc/config/objspace.opcodes.CALL_LIKELY_BUILTIN.rst
deleted file mode 100644
--- a/pypy/doc/config/objspace.opcodes.CALL_LIKELY_BUILTIN.rst
+++ /dev/null
@@ -1,12 +0,0 @@
-Introduce a new opcode called ``CALL_LIKELY_BUILTIN``. It is used when something
-is called, that looks like a builtin function (but could in reality be shadowed
-by a name in the module globals). For all module globals dictionaries it is
-then tracked which builtin name is shadowed in this module. If the
-``CALL_LIKELY_BUILTIN`` opcode is executed, it is checked whether the builtin is
-shadowed. If not, the corresponding builtin is called. Otherwise the object that
-is shadowing it is called instead. If no shadowing is happening, this saves two
-dictionary lookups on calls to builtins.
-
-For more information, see the section in `Standard Interpreter Optimizations`_.
-
-.. _`Standard Interpreter Optimizations`: ../interpreter-optimizations.html#call-likely-builtin
diff --git a/pypy/doc/config/objspace.usemodules.symbol.rst b/pypy/doc/config/objspace.usemodules.symbol.rst
deleted file mode 100644
--- a/pypy/doc/config/objspace.usemodules.symbol.rst
+++ /dev/null
@@ -1,2 +0,0 @@
-Use the 'symbol' module.
-This module is expected to be working and is included by default.
diff --git a/pypy/doc/config/translation.backendopt.storesink.rst b/pypy/doc/config/translation.backendopt.storesink.txt
copy from pypy/doc/config/translation.backendopt.storesink.rst
copy to pypy/doc/config/translation.backendopt.storesink.txt
diff --git a/pypy/doc/config/translation.cli.rst b/pypy/doc/config/translation.cli.rst
deleted file mode 100644
--- a/pypy/doc/config/translation.cli.rst
+++ /dev/null
@@ -1,1 +0,0 @@
-.. intentionally empty
diff --git a/pypy/doc/config/translation.backendopt.remove_asserts.rst b/pypy/doc/config/translation.backendopt.remove_asserts.txt
copy from pypy/doc/config/translation.backendopt.remove_asserts.rst
copy to pypy/doc/config/translation.backendopt.remove_asserts.txt
diff --git a/pypy/doc/config/translation.cli.rst b/pypy/doc/config/translation.cli.txt
copy from pypy/doc/config/translation.cli.rst
copy to pypy/doc/config/translation.cli.txt
diff --git a/pypy/doc/config/translation.backendopt.none.rst b/pypy/doc/config/translation.backendopt.none.rst
deleted file mode 100644
--- a/pypy/doc/config/translation.backendopt.none.rst
+++ /dev/null
@@ -1,1 +0,0 @@
-Do not run any backend optimizations.
diff --git a/pypy/doc/config/objspace.std.optimized_comparison_op.rst b/pypy/doc/config/objspace.std.optimized_comparison_op.rst
deleted file mode 100644
--- a/pypy/doc/config/objspace.std.optimized_comparison_op.rst
+++ /dev/null
@@ -1,1 +0,0 @@
-Optimize the comparison of two integers a bit.
diff --git a/pypy/doc/config/objspace.usemodules._testing.rst b/pypy/doc/config/objspace.usemodules._testing.txt
copy from pypy/doc/config/objspace.usemodules._testing.rst
copy to pypy/doc/config/objspace.usemodules._testing.txt
diff --git a/pypy/doc/config/translation.backendopt.profile_based_inline.rst b/pypy/doc/config/translation.backendopt.profile_based_inline.txt
copy from pypy/doc/config/translation.backendopt.profile_based_inline.rst
copy to pypy/doc/config/translation.backendopt.profile_based_inline.txt
diff --git a/pypy/doc/config/objspace.geninterp.rst b/pypy/doc/config/objspace.geninterp.rst
deleted file mode 100644
--- a/pypy/doc/config/objspace.geninterp.rst
+++ /dev/null
@@ -1,4 +0,0 @@
-This option enables `geninterp`_. This will usually make the PyPy interpreter
-significantly faster (but also a bit bigger).
-
-.. _`geninterp`: ../geninterp.html
diff --git a/pypy/doc/config/objspace.usemodules.zipimport.rst b/pypy/doc/config/objspace.usemodules.zipimport.rst
deleted file mode 100644
--- a/pypy/doc/config/objspace.usemodules.zipimport.rst
+++ /dev/null
@@ -1,3 +0,0 @@
-This module implements zipimport mechanism described
-in PEP 302. It's supposed to work and translate, so it's included
-by default
\ No newline at end of file
diff --git a/pypy/doc/config/objspace.opcodes.CALL_METHOD.rst b/pypy/doc/config/objspace.opcodes.CALL_METHOD.rst
deleted file mode 100644
--- a/pypy/doc/config/objspace.opcodes.CALL_METHOD.rst
+++ /dev/null
@@ -1,10 +0,0 @@
-Enable a pair of bytecodes that speed up method calls.
-See ``pypy.interpreter.callmethod`` for a description.
-
-The goal is to avoid creating the bound method object in the common
-case. So far, this only works for calls with no keyword, no ``*arg``
-and no ``**arg`` but it would be easy to extend.
-
-For more information, see the section in `Standard Interpreter Optimizations`_.
-
-.. _`Standard Interpreter Optimizations`: ../interpreter-optimizations.html#lookup-method-call-method
diff --git a/pypy/doc/config/objspace.usemodules.marshal.rst b/pypy/doc/config/objspace.usemodules.marshal.rst
deleted file mode 100644
--- a/pypy/doc/config/objspace.usemodules.marshal.rst
+++ /dev/null
@@ -1,2 +0,0 @@
-Use the 'marshal' module.
-This module is expected to be working and is included by default.
diff --git a/pypy/doc/config/objspace.std.withtproxy.rst b/pypy/doc/config/objspace.std.withtproxy.rst
deleted file mode 100644
--- a/pypy/doc/config/objspace.std.withtproxy.rst
+++ /dev/null
@@ -1,3 +0,0 @@
-Enable `transparent proxies`_.
-
-.. _`transparent proxies`: ../objspace-proxies.html#tproxy
diff --git a/pypy/doc/config/objspace.usemodules._codecs.rst b/pypy/doc/config/objspace.usemodules._codecs.rst
deleted file mode 100644
--- a/pypy/doc/config/objspace.usemodules._codecs.rst
+++ /dev/null
@@ -1,2 +0,0 @@
-Use the '_codecs' module.
-Used by the 'codecs' standard lib module. This module is expected to be working and is included by default.
diff --git a/pypy/doc/config/translation.backendopt.merge_if_blocks.rst b/pypy/doc/config/translation.backendopt.merge_if_blocks.rst
deleted file mode 100644
--- a/pypy/doc/config/translation.backendopt.merge_if_blocks.rst
+++ /dev/null
@@ -1,26 +0,0 @@
-This optimization converts parts of flow graphs that result from
-chains of ifs and elifs like this into merged blocks.
-
-By default flow graphing this kind of code::
-
- if x == 0:
- f()
- elif x == 1:
- g()
- elif x == 4:
- h()
- else:
- j()
-
-will result in a chain of blocks with two exits, somewhat like this:
-
-.. image:: unmergedblocks.png
-
-(reflecting how Python would interpret this code). Running this
-optimization will transform the block structure to contain a single
-"choice block" with four exits:
-
-.. image:: mergedblocks.png
-
-This can then be turned into a switch by the C backend, allowing the C
-compiler to produce more efficient code.
diff --git a/pypy/doc/config/translation.backendopt.raisingop2direct_call.rst b/pypy/doc/config/translation.backendopt.raisingop2direct_call.rst
deleted file mode 100644
--- a/pypy/doc/config/translation.backendopt.raisingop2direct_call.rst
+++ /dev/null
@@ -1,3 +0,0 @@
-Internal option. Transformation required by the LLVM backend.
-
-.. internal
diff --git a/pypy/doc/config/translation.log.rst b/pypy/doc/config/translation.log.txt
copy from pypy/doc/config/translation.log.rst
copy to pypy/doc/config/translation.log.txt
diff --git a/pypy/doc/config/objspace.usemodules.rbench.rst b/pypy/doc/config/objspace.usemodules.rbench.txt
copy from pypy/doc/config/objspace.usemodules.rbench.rst
copy to pypy/doc/config/objspace.usemodules.rbench.txt
diff --git a/pypy/doc/config/objspace.usemodules._file.rst b/pypy/doc/config/objspace.usemodules._file.rst
deleted file mode 100644
--- a/pypy/doc/config/objspace.usemodules._file.rst
+++ /dev/null
@@ -1,4 +0,0 @@
-Use the '_file' module. It is an internal module that contains helper
-functionality for the builtin ``file`` type.
-
-.. internal
diff --git a/pypy/doc/config/objspace.usemodules.pypyjit.rst b/pypy/doc/config/objspace.usemodules.pypyjit.rst
deleted file mode 100644
--- a/pypy/doc/config/objspace.usemodules.pypyjit.rst
+++ /dev/null
@@ -1,1 +0,0 @@
-Use the 'pypyjit' module.
diff --git a/pypy/doc/config/translation.secondaryentrypoints.rst b/pypy/doc/config/translation.secondaryentrypoints.rst
deleted file mode 100644
--- a/pypy/doc/config/translation.secondaryentrypoints.rst
+++ /dev/null
@@ -1,1 +0,0 @@
-Enable secondary entrypoints support list. Needed for cpyext module.
diff --git a/pypy/doc/config/translation.dump_static_data_info.rst b/pypy/doc/config/translation.dump_static_data_info.txt
copy from pypy/doc/config/translation.dump_static_data_info.rst
copy to pypy/doc/config/translation.dump_static_data_info.txt
diff --git a/pypy/doc/config/objspace.usemodules.zlib.rst b/pypy/doc/config/objspace.usemodules.zlib.txt
copy from pypy/doc/config/objspace.usemodules.zlib.rst
copy to pypy/doc/config/objspace.usemodules.zlib.txt
diff --git a/pypy/doc/config/translation.backendopt.inline_heuristic.rst b/pypy/doc/config/translation.backendopt.inline_heuristic.txt
copy from pypy/doc/config/translation.backendopt.inline_heuristic.rst
copy to pypy/doc/config/translation.backendopt.inline_heuristic.txt
diff --git a/pypy/doc/config/objspace.usemodules.symbol.rst b/pypy/doc/config/objspace.usemodules.symbol.txt
copy from pypy/doc/config/objspace.usemodules.symbol.rst
copy to pypy/doc/config/objspace.usemodules.symbol.txt
diff --git a/pypy/doc/config/translation.backendopt.really_remove_asserts.rst b/pypy/doc/config/translation.backendopt.really_remove_asserts.rst
deleted file mode 100644
diff --git a/pypy/doc/config/translation.make_jobs.rst b/pypy/doc/config/translation.make_jobs.rst
deleted file mode 100644
--- a/pypy/doc/config/translation.make_jobs.rst
+++ /dev/null
@@ -1,1 +0,0 @@
-Specify number of make jobs for make command.
diff --git a/pypy/doc/config/objspace.rst b/pypy/doc/config/objspace.rst
deleted file mode 100644
--- a/pypy/doc/config/objspace.rst
+++ /dev/null
@@ -1,1 +0,0 @@
-.. intentionally empty
diff --git a/pypy/doc/config/objspace.usemodules.rctime.rst b/pypy/doc/config/objspace.usemodules.rctime.txt
copy from pypy/doc/config/objspace.usemodules.rctime.rst
copy to pypy/doc/config/objspace.usemodules.rctime.txt
diff --git a/pypy/doc/config/objspace.usemodules._sre.rst b/pypy/doc/config/objspace.usemodules._sre.txt
copy from pypy/doc/config/objspace.usemodules._sre.rst
copy to pypy/doc/config/objspace.usemodules._sre.txt
diff --git a/pypy/doc/config/objspace.nofaking.rst b/pypy/doc/config/objspace.nofaking.txt
copy from pypy/doc/config/objspace.nofaking.rst
copy to pypy/doc/config/objspace.nofaking.txt
diff --git a/pypy/doc/config/translation.backendopt.clever_malloc_removal.rst b/pypy/doc/config/translation.backendopt.clever_malloc_removal.rst
deleted file mode 100644
--- a/pypy/doc/config/translation.backendopt.clever_malloc_removal.rst
+++ /dev/null
@@ -1,10 +0,0 @@
-Try to inline flowgraphs based on whether doing so would enable malloc
-removal (:config:`translation.backendopt.mallocs`.) by eliminating
-calls that result in escaping. This is an experimental optimization,
-also right now some eager inlining is necessary for helpers doing
-malloc itself to be inlined first for this to be effective.
-This option enable also an extra subsequent malloc removal phase.
-
-Callee flowgraphs are considered candidates based on a weight heuristic like
-for basic inlining. (see :config:`translation.backendopt.inline`,
-:config:`translation.backendopt.clever_malloc_removal_threshold` ).
diff --git a/pypy/doc/config/objspace.usemodules.sys.rst b/pypy/doc/config/objspace.usemodules.sys.rst
deleted file mode 100644
--- a/pypy/doc/config/objspace.usemodules.sys.rst
+++ /dev/null
@@ -1,2 +0,0 @@
-Use the 'sys' module.
-This module is essential, included by default and should not be removed.
diff --git a/pypy/doc/config/objspace.usemodules._collections.rst b/pypy/doc/config/objspace.usemodules._collections.txt
copy from pypy/doc/config/objspace.usemodules._collections.rst
copy to pypy/doc/config/objspace.usemodules._collections.txt
diff --git a/pypy/doc/config/translation.backendopt.inline.rst b/pypy/doc/config/translation.backendopt.inline.txt
copy from pypy/doc/config/translation.backendopt.inline.rst
copy to pypy/doc/config/translation.backendopt.inline.txt
diff --git a/pypy/doc/config/objspace.std.prebuiltintfrom.rst b/pypy/doc/config/objspace.std.prebuiltintfrom.rst
deleted file mode 100644
--- a/pypy/doc/config/objspace.std.prebuiltintfrom.rst
+++ /dev/null
@@ -1,1 +0,0 @@
-see :config:`objspace.std.withprebuiltint`.
diff --git a/pypy/doc/config/translation.countmallocs.rst b/pypy/doc/config/translation.countmallocs.rst
deleted file mode 100644
--- a/pypy/doc/config/translation.countmallocs.rst
+++ /dev/null
@@ -1,4 +0,0 @@
-Internal; used by some of the C backend tests to check that the number of
-allocations matches the number of frees.
-
-.. internal
diff --git a/pypy/doc/config/objspace.usemodules._io.rst b/pypy/doc/config/objspace.usemodules._io.txt
copy from pypy/doc/config/objspace.usemodules._io.rst
copy to pypy/doc/config/objspace.usemodules._io.txt
diff --git a/pypy/doc/config/objspace.usemodules._winreg.rst b/pypy/doc/config/objspace.usemodules._winreg.rst
deleted file mode 100644
--- a/pypy/doc/config/objspace.usemodules._winreg.rst
+++ /dev/null
@@ -1,2 +0,0 @@
-Use the built-in '_winreg' module, provides access to the Windows registry.
-This module is expected to be working and is included by default on Windows.
diff --git a/pypy/doc/config/objspace.usemodules.clr.rst b/pypy/doc/config/objspace.usemodules.clr.txt
copy from pypy/doc/config/objspace.usemodules.clr.rst
copy to pypy/doc/config/objspace.usemodules.clr.txt
diff --git a/pypy/doc/config/translation.jit_ffi.rst b/pypy/doc/config/translation.jit_ffi.rst
deleted file mode 100644
--- a/pypy/doc/config/translation.jit_ffi.rst
+++ /dev/null
@@ -1,1 +0,0 @@
-Internal option: enable OptFfiCall in the jit optimizations.
diff --git a/pypy/doc/config/objspace.usemodules._pickle_support.rst b/pypy/doc/config/objspace.usemodules._pickle_support.txt
copy from pypy/doc/config/objspace.usemodules._pickle_support.rst
copy to pypy/doc/config/objspace.usemodules._pickle_support.txt
diff --git a/pypy/doc/config/translation.verbose.rst b/pypy/doc/config/translation.verbose.rst
deleted file mode 100644
--- a/pypy/doc/config/translation.verbose.rst
+++ /dev/null
@@ -1,1 +0,0 @@
-Print some more information during translation.
diff --git a/pypy/doc/config/objspace.usemodules.math.rst b/pypy/doc/config/objspace.usemodules.math.txt
copy from pypy/doc/config/objspace.usemodules.math.rst
copy to pypy/doc/config/objspace.usemodules.math.txt
diff --git a/pypy/doc/config/translation.compilerflags.rst b/pypy/doc/config/translation.compilerflags.rst
deleted file mode 100644
--- a/pypy/doc/config/translation.compilerflags.rst
+++ /dev/null
@@ -1,1 +0,0 @@
-Experimental. Specify extra flags to pass to the C compiler.
diff --git a/pypy/doc/config/objspace.std.withsmallint.rst b/pypy/doc/config/objspace.std.withsmallint.rst
deleted file mode 100644
--- a/pypy/doc/config/objspace.std.withsmallint.rst
+++ /dev/null
@@ -1,6 +0,0 @@
-Use "tagged pointers" to represent small enough integer values: Integers that
-fit into 31 bits (respective 63 bits on 64 bit machines) are not represented by
-boxing them in an instance of ``W_IntObject``. Instead they are represented as a
-pointer having the lowest bit set and the rest of the bits used to store the
-value of the integer. This gives a small speedup for integer operations as well
-as better memory behaviour.
diff --git a/pypy/tool/rest/rst.py b/pypy/tool/rest/rst.py
--- a/pypy/tool/rest/rst.py
+++ b/pypy/tool/rest/rst.py
@@ -389,18 +389,14 @@
indent = ' '
def __init__(self, name, *args, **options):
self.name = name
- self.content = options.pop('content', [])
- children = list(args)
- super(Directive, self).__init__(*children)
+ self.content = args
+ super(Directive, self).__init__()
self.options = options
def text(self):
# XXX not very pretty...
- namechunksize = len(self.name) + 2
- self.children.insert(0, Text('X' * namechunksize))
- txt = super(Directive, self).text()
- txt = '.. %s::%s' % (self.name, txt[namechunksize + 3:],)
- options = '\n'.join([' :%s: %s' % (k, v) for (k, v) in
+ txt = '.. %s::' % (self.name,)
+ options = '\n'.join([' :%s: %s' % (k, v) for (k, v) in
self.options.iteritems()])
if options:
txt += '\n%s' % (options,)
@@ -408,10 +404,7 @@
if self.content:
txt += '\n'
for item in self.content:
- assert item.parentclass == Rest, 'only top-level items allowed'
- assert not item.indent
- item.indent = ' '
- txt += '\n' + item.text()
+ txt += '\n ' + item
return txt
diff --git a/pypy/doc/config/translation.sandbox.rst b/pypy/doc/config/translation.sandbox.txt
copy from pypy/doc/config/translation.sandbox.rst
copy to pypy/doc/config/translation.sandbox.txt
diff --git a/pypy/doc/config/translation.gctransformer.rst b/pypy/doc/config/translation.gctransformer.rst
deleted file mode 100644
--- a/pypy/doc/config/translation.gctransformer.rst
+++ /dev/null
@@ -1,1 +0,0 @@
-internal option
diff --git a/pypy/doc/config/objspace.usemodules.binascii.rst b/pypy/doc/config/objspace.usemodules.binascii.rst
deleted file mode 100644
--- a/pypy/doc/config/objspace.usemodules.binascii.rst
+++ /dev/null
@@ -1,1 +0,0 @@
-Use the RPython 'binascii' module.
diff --git a/pypy/doc/config/translation.backendopt.stack_optimization.rst b/pypy/doc/config/translation.backendopt.stack_optimization.txt
copy from pypy/doc/config/translation.backendopt.stack_optimization.rst
copy to pypy/doc/config/translation.backendopt.stack_optimization.txt
diff --git a/pypy/doc/config/objspace.std.rst b/pypy/doc/config/objspace.std.txt
copy from pypy/doc/config/objspace.std.rst
copy to pypy/doc/config/objspace.std.txt
diff --git a/pypy/doc/config/objspace.usemodules.micronumpy.rst b/pypy/doc/config/objspace.usemodules.micronumpy.txt
copy from pypy/doc/config/objspace.usemodules.micronumpy.rst
copy to pypy/doc/config/objspace.usemodules.micronumpy.txt
diff --git a/pypy/doc/config/objspace.usemodules.thread.rst b/pypy/doc/config/objspace.usemodules.thread.rst
deleted file mode 100644
--- a/pypy/doc/config/objspace.usemodules.thread.rst
+++ /dev/null
@@ -1,1 +0,0 @@
-Use the 'thread' module.
diff --git a/pypy/doc/config/objspace.usemodules.mmap.rst b/pypy/doc/config/objspace.usemodules.mmap.rst
deleted file mode 100644
--- a/pypy/doc/config/objspace.usemodules.mmap.rst
+++ /dev/null
@@ -1,2 +0,0 @@
-Use the 'mmap' module.
-This module is expected to be fully working.
diff --git a/pypy/doc/config/objspace.std.withstrbuf.rst b/pypy/doc/config/objspace.std.withstrbuf.txt
copy from pypy/doc/config/objspace.std.withstrbuf.rst
copy to pypy/doc/config/objspace.std.withstrbuf.txt
diff --git a/pypy/doc/discussion/outline-external-ootype.rst b/pypy/doc/discussion/outline-external-ootype.rst
--- a/pypy/doc/discussion/outline-external-ootype.rst
+++ b/pypy/doc/discussion/outline-external-ootype.rst
@@ -1,24 +1,10 @@
-.. XXX, anto, can this be killed?
-
Some discussion about external objects in ootype
================================================
-Current approaches:
-
-* BasicExternal, used for js backend
+Current approach:
* SomeCliXxx for .NET backend
-BasicExternal
--------------
-
-* Is using types to make rpython happy (ie, every single method or field
- is hardcoded)
-
-* Supports callbacks by SomeGenericCallable
-
-* Supports fields, also with callable fields
-
SomeCliXxx
----------
@@ -28,11 +14,11 @@
* Supports static methods
-Would be extremely cool to have just one approach instead of two,
-so here are some notes:
+Would be extremely cool to generalize the approach to be useful also for the
+JVM backend. Here are some notes:
* There should be one mechanism, factored out nicely out of any backend,
- to support any possible backend (cli, js, jvm for now).
+ to support any possible backend (cli, jvm for now).
* This approach might be eventually extended by a backend itself, but
as much as possible code should be factored out.
@@ -48,24 +34,22 @@
================================
The goal of the task is to let RPython program access "external
-objects" which are available in the target platform; these include:
+entities" which are available in the target platform; these include:
- external classes (e.g. for .NET: System.Collections.ArrayList)
- - external instances (e.g. for js: window, window.document)
+ - external prebuilt instances (e.g. for .NET: typeof(System.Console))
- - external functions? (they are not needed for .NET and JVM, maybe
- for js?)
-
-External objects should behave as much as possible as "internal
-objects".
+External entities should behave as much as possible as "internal
+entities".
Moreover, we want to preserve the possibility of *testing* RPython
programs on top of CPython if possible. For example, it should be
possible to RPython programs using .NET external objects using
-PythonNet; probably there is something similar for JVM, but not for
-JS as I know.
+PythonNet; for JVM, there are JPype_ and JTool_, to be investigated:
+.. _JPype: http://jpype.sourceforge.net/
+.. _JTool: http://wiki.europython.eu/Talks/Jtool%20Java%20In%20The%20Python%20Vm
How to represent types
----------------------
@@ -126,11 +110,6 @@
and JVM the job can be easily automatized, since the objects have got
precise signatures.
-For JS, signatures must be written by hand, so we must provide a
-convenient syntax for it; I think it should be possible to use the
-current syntax and write a tool which translates it to low-level
-types.
-
RPython interface
-----------------
@@ -148,9 +127,8 @@
- access to static methods: return an object which will be annotated
as SomeExternalStaticMeth.
-Instances are annotated as SomeExternalInstance. Prebuilt external
-objects (such as JS's window.document) are annotated as
-SomeExternalInstance(const=...).
+Instances are annotated as SomeExternalInstance. Prebuilt external objects are
+annotated as SomeExternalInstance(const=...).
Open issues
-----------
@@ -181,18 +159,12 @@
It would be nice to allow programmers to inherit from an external
class. Not sure about the implications, though.
-Callbacks
-~~~~~~~~~
-
-I know that they are an issue for JS, but I don't know how they are
-currently implemented.
-
Special methods/properties
~~~~~~~~~~~~~~~~~~~~~~~~~~
In .NET there are special methods that can be accessed using a special
syntax, for example indexer or properties. It would be nice to have in
-RPython the same syntax as C#.
+RPython the same syntax as C#, although we can live without that.
Implementation details
diff --git a/pypy/doc/config/translation.backendopt.rst b/pypy/doc/config/translation.backendopt.txt
copy from pypy/doc/config/translation.backendopt.rst
copy to pypy/doc/config/translation.backendopt.txt
diff --git a/pypy/doc/config/objspace.std.withmethodcachecounter.rst b/pypy/doc/config/objspace.std.withmethodcachecounter.rst
deleted file mode 100644
--- a/pypy/doc/config/objspace.std.withmethodcachecounter.rst
+++ /dev/null
@@ -1,1 +0,0 @@
-Testing/debug option for :config:`objspace.std.withmethodcache`.
diff --git a/pypy/doc/config/objspace.usemodules.rctime.rst b/pypy/doc/config/objspace.usemodules.rctime.rst
deleted file mode 100644
--- a/pypy/doc/config/objspace.usemodules.rctime.rst
+++ /dev/null
@@ -1,7 +0,0 @@
-Use the 'rctime' module.
-
-'rctime' is our `rffi`_ based implementation of the builtin 'time' module.
-It supersedes the less complete :config:`objspace.usemodules.time`,
-at least for C-like targets (the C and LLVM backends).
-
-.. _`rffi`: ../rffi.html
diff --git a/pypy/doc/config/objspace.usemodules._sha.rst b/pypy/doc/config/objspace.usemodules._sha.txt
copy from pypy/doc/config/objspace.usemodules._sha.rst
copy to pypy/doc/config/objspace.usemodules._sha.txt
diff --git a/pypy/doc/config/objspace.usemodules.time.rst b/pypy/doc/config/objspace.usemodules.time.txt
copy from pypy/doc/config/objspace.usemodules.time.rst
copy to pypy/doc/config/objspace.usemodules.time.txt
diff --git a/pypy/doc/config/objspace.translationmodules.rst b/pypy/doc/config/objspace.translationmodules.txt
copy from pypy/doc/config/objspace.translationmodules.rst
copy to pypy/doc/config/objspace.translationmodules.txt
diff --git a/pypy/doc/config/translation.backendopt.inline_threshold.rst b/pypy/doc/config/translation.backendopt.inline_threshold.txt
copy from pypy/doc/config/translation.backendopt.inline_threshold.rst
copy to pypy/doc/config/translation.backendopt.inline_threshold.txt
diff --git a/pypy/doc/config/translation.backendopt.inline_heuristic.rst b/pypy/doc/config/translation.backendopt.inline_heuristic.rst
deleted file mode 100644
--- a/pypy/doc/config/translation.backendopt.inline_heuristic.rst
+++ /dev/null
@@ -1,4 +0,0 @@
-Internal option. Switch to a different weight heuristic for inlining.
-This is for basic inlining (:config:`translation.backendopt.inline`).
-
-.. internal
diff --git a/pypy/doc/config/translation.verbose.rst b/pypy/doc/config/translation.verbose.txt
copy from pypy/doc/config/translation.verbose.rst
copy to pypy/doc/config/translation.verbose.txt
diff --git a/pypy/doc/config/translation.secondaryentrypoints.rst b/pypy/doc/config/translation.secondaryentrypoints.txt
copy from pypy/doc/config/translation.secondaryentrypoints.rst
copy to pypy/doc/config/translation.secondaryentrypoints.txt
diff --git a/pypy/doc/config/objspace.lonepycfiles.rst b/pypy/doc/config/objspace.lonepycfiles.txt
copy from pypy/doc/config/objspace.lonepycfiles.rst
copy to pypy/doc/config/objspace.lonepycfiles.txt
diff --git a/pypy/doc/config/objspace.usemodules.oracle.rst b/pypy/doc/config/objspace.usemodules.oracle.rst
deleted file mode 100644
--- a/pypy/doc/config/objspace.usemodules.oracle.rst
+++ /dev/null
@@ -1,2 +0,0 @@
-Use the 'oracle' module.
-This module is off by default, requires oracle client installed.
diff --git a/pypy/doc/config/translation.cli.trace_calls.rst b/pypy/doc/config/translation.cli.trace_calls.txt
copy from pypy/doc/config/translation.cli.trace_calls.rst
copy to pypy/doc/config/translation.cli.trace_calls.txt
diff --git a/pypy/doc/config/objspace.usemodules.struct.rst b/pypy/doc/config/objspace.usemodules.struct.txt
copy from pypy/doc/config/objspace.usemodules.struct.rst
copy to pypy/doc/config/objspace.usemodules.struct.txt
diff --git a/pypy/tool/rest/rest.py b/pypy/tool/rest/rest.py
--- a/pypy/tool/rest/rest.py
+++ b/pypy/tool/rest/rest.py
@@ -10,14 +10,12 @@
pass
def convert_rest_html(source, source_path, stylesheet=None, encoding='latin1'):
- from pypy.tool.rest import directive
""" return html latin1-encoded document for the given input.
source a ReST-string
sourcepath where to look for includes (basically)
stylesheet path (to be used if any)
"""
from docutils.core import publish_string
- directive.set_backend_and_register_directives("html")
kwargs = {
'stylesheet' : stylesheet,
'stylesheet_path': None,
diff --git a/pypy/doc/config/objspace.usemodules._collections.rst b/pypy/doc/config/objspace.usemodules._collections.rst
deleted file mode 100644
--- a/pypy/doc/config/objspace.usemodules._collections.rst
+++ /dev/null
@@ -1,2 +0,0 @@
-Use the '_collections' module.
-Used by the 'collections' standard lib module. This module is expected to be working and is included by default.
diff --git a/pypy/doc/config/objspace.usemodules._testing.rst b/pypy/doc/config/objspace.usemodules._testing.rst
deleted file mode 100644
--- a/pypy/doc/config/objspace.usemodules._testing.rst
+++ /dev/null
@@ -1,3 +0,0 @@
-Use the '_testing' module. This module exists only for PyPy own testing purposes.
-
-This module is expected to be working and is included by default.
diff --git a/pypy/doc/config/generate.py b/pypy/doc/config/generate.py
--- a/pypy/doc/config/generate.py
+++ b/pypy/doc/config/generate.py
@@ -1,15 +1,48 @@
import autopath
import py
-from pypy.config import pypyoption, translationoption, config
+from pypy.config import pypyoption, translationoption, config, makerestdoc
from pypy.doc.config.confrest import all_optiondescrs
+all_optiondescrs = [pypyoption.pypy_optiondescription,
+ translationoption.translation_optiondescription,
+ ]
+start_to_descr = dict([(descr._name, descr) for descr in all_optiondescrs])
+
+def make_rst(basename):
+ txtpath = thisdir.join(basename)
+ txtpath.ensure()
+ rstpath = txtpath.new(ext=".rst")
+
+ fullpath = txtpath.purebasename
+ start = fullpath.split(".")[0]
+ path = fullpath.rsplit(".", 1)[0]
+ basedescr = start_to_descr.get(start)
+ if basedescr is None:
+ return
+ if fullpath.count(".") == 0:
+ descr = basedescr
+ path = ""
+ else:
+ conf = config.Config(basedescr)
+ subconf, step = conf._cfgimpl_get_home_by_path(
+ fullpath.split(".", 1)[1])
+ descr = getattr(subconf._cfgimpl_descr, step)
+ text = unicode(descr.make_rest_doc(path).text())
+ if txtpath.check(file=True):
+ content = txtpath.read()
+ if content:
+ text += "\n\n"
+ text = u"%s\n\n%s" % (text, unicode(txtpath.read(), "utf-8"))
+ rstpath.write(text.encode("utf-8"))
+
+
thisdir = py.path.local(__file__).dirpath()
for descr in all_optiondescrs:
prefix = descr._name
c = config.Config(descr)
- thisdir.join(prefix + ".rst").ensure()
+ thisdir.join(prefix + ".txt").ensure()
+ make_rst(prefix + ".txt")
for p in c.getpaths(include_groups=True):
- basename = prefix + "." + p + ".rst"
- f = thisdir.join(basename)
- f.ensure()
+ basename = prefix + "." + p + ".txt"
+ make_rst(basename)
diff --git a/pypy/doc/config/objspace.usemodules._weakref.rst b/pypy/doc/config/objspace.usemodules._weakref.txt
copy from pypy/doc/config/objspace.usemodules._weakref.rst
copy to pypy/doc/config/objspace.usemodules._weakref.txt
diff --git a/pypy/doc/config/objspace.usemodules.struct.rst b/pypy/doc/config/objspace.usemodules.struct.rst
deleted file mode 100644
--- a/pypy/doc/config/objspace.usemodules.struct.rst
+++ /dev/null
@@ -1,5 +0,0 @@
-Use the built-in 'struct' module.
-This module is expected to be working and is included by default.
-There is also a pure Python version in lib_pypy which is used
-if the built-in is disabled, but it is several orders of magnitude
-slower.
diff --git a/pypy/doc/config/translation.cli.trace_calls.rst b/pypy/doc/config/translation.cli.trace_calls.rst
deleted file mode 100644
--- a/pypy/doc/config/translation.cli.trace_calls.rst
+++ /dev/null
@@ -1,3 +0,0 @@
-Internal. Debugging aid for the CLI backend.
-
-.. internal
diff --git a/pypy/doc/config/objspace.std.withstrslice.rst b/pypy/doc/config/objspace.std.withstrslice.rst
deleted file mode 100644
--- a/pypy/doc/config/objspace.std.withstrslice.rst
+++ /dev/null
@@ -1,7 +0,0 @@
-Enable "string slice" objects.
-
-See the page about `Standard Interpreter Optimizations`_ for more details.
-
-.. _`Standard Interpreter Optimizations`: ../interpreter-optimizations.html#string-slice-objects
-
-
diff --git a/pypy/doc/config/translation.dump_static_data_info.rst b/pypy/doc/config/translation.dump_static_data_info.rst
deleted file mode 100644
--- a/pypy/doc/config/translation.dump_static_data_info.rst
+++ /dev/null
@@ -1,3 +0,0 @@
-Dump information about static prebuilt constants, to the file
-TARGETNAME.staticdata.info in the /tmp/usession-... directory. This file can
-be later inspected using the script ``bin/reportstaticdata.py``.
diff --git a/pypy/doc/config/objspace.allworkingmodules.rst b/pypy/doc/config/objspace.allworkingmodules.rst
deleted file mode 100644
--- a/pypy/doc/config/objspace.allworkingmodules.rst
+++ /dev/null
@@ -1,6 +0,0 @@
-This option enables the usage of all modules that are known to be working well
-and that translate without problems.
-
-Note that this option defaults to True (except when running
-``py.py`` because it takes a long time to start). To force it
-to False, use ``--no-allworkingmodules``.
diff --git a/pypy/doc/config/objspace.opcodes.CALL_METHOD.rst b/pypy/doc/config/objspace.opcodes.CALL_METHOD.txt
copy from pypy/doc/config/objspace.opcodes.CALL_METHOD.rst
copy to pypy/doc/config/objspace.opcodes.CALL_METHOD.txt
diff --git a/pypy/doc/config/objspace.opcodes.CALL_LIKELY_BUILTIN.rst b/pypy/doc/config/objspace.opcodes.CALL_LIKELY_BUILTIN.txt
copy from pypy/doc/config/objspace.opcodes.CALL_LIKELY_BUILTIN.rst
copy to pypy/doc/config/objspace.opcodes.CALL_LIKELY_BUILTIN.txt
diff --git a/pypy/doc/config/translation.sandbox.rst b/pypy/doc/config/translation.sandbox.rst
deleted file mode 100644
--- a/pypy/doc/config/translation.sandbox.rst
+++ /dev/null
@@ -1,15 +0,0 @@
-Generate a special fully-sandboxed executable.
-
-The fully-sandboxed executable cannot be run directly, but
-only as a subprocess of an outer "controlling" process. The
-sandboxed process is "safe" in the sense that it doesn't do
-any library or system call - instead, whenever it would like
-to perform such an operation, it marshals the operation name
-and the arguments to its stdout and it waits for the
-marshalled result on its stdin. This controller process must
-handle these operation requests, in any way it likes, allowing
-full virtualization.
-
-For examples of controller processes, see
-``pypy/translator/sandbox/interact.py`` and
-``pypy/translator/sandbox/pypy_interact.py``.
diff --git a/pypy/doc/config/objspace.usemodules.bz2.rst b/pypy/doc/config/objspace.usemodules.bz2.txt
copy from pypy/doc/config/objspace.usemodules.bz2.rst
copy to pypy/doc/config/objspace.usemodules.bz2.txt
diff --git a/pypy/doc/config/translation.rweakref.rst b/pypy/doc/config/translation.rweakref.txt
copy from pypy/doc/config/translation.rweakref.rst
copy to pypy/doc/config/translation.rweakref.txt
diff --git a/pypy/doc/config/objspace.std.withstrslice.rst b/pypy/doc/config/objspace.std.withstrslice.txt
copy from pypy/doc/config/objspace.std.withstrslice.rst
copy to pypy/doc/config/objspace.std.withstrslice.txt
diff --git a/pypy/doc/config/objspace.std.withprebuiltint.rst b/pypy/doc/config/objspace.std.withprebuiltint.txt
copy from pypy/doc/config/objspace.std.withprebuiltint.rst
copy to pypy/doc/config/objspace.std.withprebuiltint.txt
diff --git a/pypy/doc/config/translation.backendopt.profile_based_inline_threshold.rst b/pypy/doc/config/translation.backendopt.profile_based_inline_threshold.rst
deleted file mode 100644
--- a/pypy/doc/config/translation.backendopt.profile_based_inline_threshold.rst
+++ /dev/null
@@ -1,2 +0,0 @@
-Weight threshold used to decide whether to inline flowgraphs.
-This is for profile-based inlining (:config:`translation.backendopt.profile_based_inline`).
diff --git a/pypy/doc/config/translation.withsmallfuncsets.rst b/pypy/doc/config/translation.withsmallfuncsets.txt
copy from pypy/doc/config/translation.withsmallfuncsets.rst
copy to pypy/doc/config/translation.withsmallfuncsets.txt
diff --git a/pypy/doc/config/translation.gc.rst b/pypy/doc/config/translation.gc.rst
deleted file mode 100644
--- a/pypy/doc/config/translation.gc.rst
+++ /dev/null
@@ -1,13 +0,0 @@
-Choose the Garbage Collector used by the translated program:
-
- - "ref": reference counting. Takes very long to translate and the result is
- slow.
-
- - "marksweep": naive mark & sweep.
-
- - "semispace": a copying semi-space GC.
-
- - "generation": a generational GC using the semi-space GC for the
- older generation.
-
- - "boehm": use the Boehm conservative GC.
diff --git a/pypy/doc/config/translation.gc.rst b/pypy/doc/config/translation.gc.txt
copy from pypy/doc/config/translation.gc.rst
copy to pypy/doc/config/translation.gc.txt
diff --git a/pypy/doc/config/objspace.usemodules.imp.rst b/pypy/doc/config/objspace.usemodules.imp.txt
copy from pypy/doc/config/objspace.usemodules.imp.rst
copy to pypy/doc/config/objspace.usemodules.imp.txt
diff --git a/pypy/doc/config/objspace.usemodules.bz2.rst b/pypy/doc/config/objspace.usemodules.bz2.rst
deleted file mode 100644
--- a/pypy/doc/config/objspace.usemodules.bz2.rst
+++ /dev/null
@@ -1,2 +0,0 @@
-Use the 'bz2' module.
-This module is expected to be working and is included by default.
diff --git a/pypy/doc/config/translation.shared.rst b/pypy/doc/config/translation.shared.txt
copy from pypy/doc/config/translation.shared.rst
copy to pypy/doc/config/translation.shared.txt
diff --git a/pypy/doc/config/objspace.usemodules.pypyjit.rst b/pypy/doc/config/objspace.usemodules.pypyjit.txt
copy from pypy/doc/config/objspace.usemodules.pypyjit.rst
copy to pypy/doc/config/objspace.usemodules.pypyjit.txt
diff --git a/pypy/doc/config/objspace.usemodules._file.rst b/pypy/doc/config/objspace.usemodules._file.txt
copy from pypy/doc/config/objspace.usemodules._file.rst
copy to pypy/doc/config/objspace.usemodules._file.txt
diff --git a/pypy/doc/config/objspace.usemodules.unicodedata.rst b/pypy/doc/config/objspace.usemodules.unicodedata.rst
deleted file mode 100644
--- a/pypy/doc/config/objspace.usemodules.unicodedata.rst
+++ /dev/null
@@ -1,2 +0,0 @@
-Use the 'unicodedata' module.
-This module is expected to be fully working.
diff --git a/pypy/doc/config/translation.type_system.rst b/pypy/doc/config/translation.type_system.rst
deleted file mode 100644
--- a/pypy/doc/config/translation.type_system.rst
+++ /dev/null
@@ -1,4 +0,0 @@
-Which type system to use when rtyping_. This option should not be set
-explicitly.
-
-.. _rtyping: ../rtyper.html
diff --git a/pypy/doc/config/objspace.usemodules._ffi.rst b/pypy/doc/config/objspace.usemodules._ffi.txt
copy from pypy/doc/config/objspace.usemodules._ffi.rst
copy to pypy/doc/config/objspace.usemodules._ffi.txt
diff --git a/pypy/doc/config/translation.jit.rst b/pypy/doc/config/translation.jit.txt
copy from pypy/doc/config/translation.jit.rst
copy to pypy/doc/config/translation.jit.txt
diff --git a/pypy/doc/config/objspace.logbytecodes.rst b/pypy/doc/config/objspace.logbytecodes.rst
deleted file mode 100644
--- a/pypy/doc/config/objspace.logbytecodes.rst
+++ /dev/null
@@ -1,3 +0,0 @@
-Internal option.
-
-.. internal
diff --git a/pypy/doc/config/objspace.usemodules.__builtin__.rst b/pypy/doc/config/objspace.usemodules.__builtin__.rst
deleted file mode 100644
--- a/pypy/doc/config/objspace.usemodules.__builtin__.rst
+++ /dev/null
@@ -1,2 +0,0 @@
-Use the '__builtin__' module.
-This module is essential, included by default and should not be removed.
diff --git a/pypy/doc/config/objspace.usemodules._bisect.rst b/pypy/doc/config/objspace.usemodules._bisect.rst
deleted file mode 100644
--- a/pypy/doc/config/objspace.usemodules._bisect.rst
+++ /dev/null
@@ -1,4 +0,0 @@
-Use the '_bisect' module.
-Used, optionally, by the 'bisect' standard lib module. This module is expected to be working and is included by default.
-
-
diff --git a/pypy/doc/config/translation.insist.rst b/pypy/doc/config/translation.insist.rst
deleted file mode 100644
--- a/pypy/doc/config/translation.insist.rst
+++ /dev/null
@@ -1,4 +0,0 @@
-Don't stop on the first `rtyping`_ error. Instead, try to rtype as much as
-possible and show the collected error messages in the end.
-
-.. _`rtyping`: ../rtyper.html
diff --git a/pypy/doc/config/objspace.usemodules.exceptions.rst b/pypy/doc/config/objspace.usemodules.exceptions.txt
copy from pypy/doc/config/objspace.usemodules.exceptions.rst
copy to pypy/doc/config/objspace.usemodules.exceptions.txt
diff --git a/pypy/doc/config/objspace.usepycfiles.rst b/pypy/doc/config/objspace.usepycfiles.rst
deleted file mode 100644
--- a/pypy/doc/config/objspace.usepycfiles.rst
+++ /dev/null
@@ -1,4 +0,0 @@
-If this option is used, then PyPy imports and generates "pyc" files in the
-same way as CPython. This is true by default and there is not much reason
-to turn it off nowadays. If off, PyPy never produces "pyc" files and
-ignores any "pyc" file that might already be present.
diff --git a/pypy/doc/config/objspace.usemodules.cpyext.rst b/pypy/doc/config/objspace.usemodules.cpyext.rst
deleted file mode 100644
--- a/pypy/doc/config/objspace.usemodules.cpyext.rst
+++ /dev/null
@@ -1,1 +0,0 @@
-Use (experimental) cpyext module, that tries to load and run CPython extension modules
diff --git a/pypy/doc/config/translation.profopt.rst b/pypy/doc/config/translation.profopt.txt
copy from pypy/doc/config/translation.profopt.rst
copy to pypy/doc/config/translation.profopt.txt
diff --git a/pypy/doc/config/objspace.usemodules._ffi.rst b/pypy/doc/config/objspace.usemodules._ffi.rst
deleted file mode 100644
--- a/pypy/doc/config/objspace.usemodules._ffi.rst
+++ /dev/null
@@ -1,1 +0,0 @@
-Applevel interface to libffi. It is more high level than _rawffi, and most importantly it is JIT friendly
diff --git a/pypy/doc/config/translation.backendopt.inline_threshold.rst b/pypy/doc/config/translation.backendopt.inline_threshold.rst
deleted file mode 100644
--- a/pypy/doc/config/translation.backendopt.inline_threshold.rst
+++ /dev/null
@@ -1,2 +0,0 @@
-Weight threshold used to decide whether to inline flowgraphs.
-This is for basic inlining (:config:`translation.backendopt.inline`).
diff --git a/pypy/doc/config/objspace.std.withdictmeasurement.rst b/pypy/doc/config/objspace.std.withdictmeasurement.txt
copy from pypy/doc/config/objspace.std.withdictmeasurement.rst
copy to pypy/doc/config/objspace.std.withdictmeasurement.txt
diff --git a/pypy/doc/config/objspace.usemodules._stackless.rst b/pypy/doc/config/objspace.usemodules._stackless.rst
deleted file mode 100644
--- a/pypy/doc/config/objspace.usemodules._stackless.rst
+++ /dev/null
@@ -1,6 +0,0 @@
-Use the '_stackless' module.
-
-Exposes the `stackless` primitives, and also implies a stackless build.
-See also :config:`translation.stackless`.
-
-.. _`stackless`: ../stackless.html
diff --git a/pypy/doc/config/objspace.std.mutable_builtintypes.rst b/pypy/doc/config/objspace.std.mutable_builtintypes.rst
deleted file mode 100644
--- a/pypy/doc/config/objspace.std.mutable_builtintypes.rst
+++ /dev/null
@@ -1,1 +0,0 @@
-Allow modification of builtin types. Disabled by default.
diff --git a/pypy/doc/config/objspace.logbytecodes.rst b/pypy/doc/config/objspace.logbytecodes.txt
copy from pypy/doc/config/objspace.logbytecodes.rst
copy to pypy/doc/config/objspace.logbytecodes.txt
diff --git a/pypy/doc/config/translation.backendopt.storesink.rst b/pypy/doc/config/translation.backendopt.storesink.rst
deleted file mode 100644
--- a/pypy/doc/config/translation.backendopt.storesink.rst
+++ /dev/null
@@ -1,1 +0,0 @@
-Store sinking optimization. On by default.
diff --git a/pypy/doc/config/translation.thread.rst b/pypy/doc/config/translation.thread.rst
deleted file mode 100644
--- a/pypy/doc/config/translation.thread.rst
+++ /dev/null
@@ -1,2 +0,0 @@
-Enable threading. The only target where this has visible effect is PyPy (this
-also enables the ``thread`` module then).
diff --git a/pypy/doc/config/translation.no__thread.rst b/pypy/doc/config/translation.no__thread.rst
deleted file mode 100644
--- a/pypy/doc/config/translation.no__thread.rst
+++ /dev/null
@@ -1,4 +0,0 @@
-Don't use gcc __thread attribute for fast thread local storage
-implementation . Increases the chance that moving the resulting
-executable to another same processor Linux machine will work. (see
-:config:`translation.vanilla`).
diff --git a/pypy/doc/config/objspace.usemodules.cmath.rst b/pypy/doc/config/objspace.usemodules.cmath.rst
deleted file mode 100644
--- a/pypy/doc/config/objspace.usemodules.cmath.rst
+++ /dev/null
@@ -1,2 +0,0 @@
-Use the 'cmath' module.
-This module is expected to be working and is included by default.
More information about the Pypy-commit
mailing list