Commits

Alex Gaynor committed deab847

Removed yet more code and docs that were ootype specific.

Comments (0)

Files changed (9)

pypy/doc/config/translation.ootype.mangle.txt

-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.

pypy/doc/config/translation.ootype.txt

-This group contains options specific for ootypesystem.

pypy/doc/dir-reference.rst

-PyPy directory cross-reference 
+PyPy directory cross-reference
 ------------------------------
 
-Here is a fully referenced alphabetical two-level deep 
-directory overview of PyPy: 
+Here is a fully referenced alphabetical two-level deep
+directory overview of PyPy:
 
 =================================  ============================================
 Directory                          explanation/links
 ``doc/*/``                         other specific documentation topics or tools
 
 `pypy/interpreter/`_               `bytecode interpreter`_ and related objects
-                                   (frames, functions, modules,...) 
+                                   (frames, functions, modules,...)
 
 `pypy/interpreter/pyparser/`_      interpreter-level Python source parser
 
                                    via an AST representation
 
 `pypy/module/`_                    contains `mixed modules`_
-                                   implementing core modules with 
+                                   implementing core modules with
                                    both application and interpreter level code.
                                    Not all are finished and working.  Use
                                    the ``--withmod-xxx``
                                    objects and types
 
 `pypy/tool/`_                      various utilities and hacks used
-                                   from various places 
+                                   from various places
 
 `pypy/tool/algo/`_                 general-purpose algorithmic and mathematic
                                    tools
 
 
 `rpython/annotator/`_              `type inferencing code`_ for
-                                   `RPython`_ programs 
+                                   `RPython`_ programs
 
 `rpython/config/`_                 handles the numerous options for RPython
 
 `rpython/rlib/`_                   a `"standard library"`_ for RPython_
                                    programs
 
-`rpython/rtyper/`_                 the `RPython Typer`_ 
+`rpython/rtyper/`_                 the `RPython Typer`_
 
 `rpython/rtyper/lltypesystem/`_    the `low-level type system`_ for
                                    C-like backends
 
-`rpython/rtyper/ootypesystem/`_    the `object-oriented type system`_
-                                   for OO backends
-
 `rpython/memory/`_                 the `garbage collector`_ construction
                                    framework
 
 `rpython/translator/`_             translation_ backends and support code
 
-`rpython/translator/backendopt/`_  general optimizations that run before a 
+`rpython/translator/backendopt/`_  general optimizations that run before a
                                    backend generates code
 
 `rpython/translator/c/`_           the `GenC backend`_, producing C code
 `dotviewer/`_                      `graph viewer`_
 
 ``*/test/``                        many directories have a test subdirectory
-                                   containing test 
-                                   modules (see `Testing in PyPy`_) 
+                                   containing test
+                                   modules (see `Testing in PyPy`_)
 
 ``_cache/``                        holds cache files from various purposes
 =================================  ============================================
 
 .. _`bytecode interpreter`: interpreter.html
-.. _`Testing in PyPy`: coding-guide.html#testing-in-pypy 
-.. _`mixed modules`: coding-guide.html#mixed-modules 
-.. _`modules`: coding-guide.html#modules 
+.. _`Testing in PyPy`: coding-guide.html#testing-in-pypy
+.. _`mixed modules`: coding-guide.html#mixed-modules
+.. _`modules`: coding-guide.html#modules
 .. _`basil`: http://people.cs.uchicago.edu/~jriehl/BasilTalk.pdf
 .. _`object space`: objspace.html
-.. _FlowObjSpace: objspace.html#the-flow-object-space 
+.. _FlowObjSpace: objspace.html#the-flow-object-space
 .. _`transparent proxies`: objspace-proxies.html#tproxy
 .. _`Differences between PyPy and CPython`: cpython_differences.html
 .. _`What PyPy can do for your objects`: objspace-proxies.html
 .. _`Continulets and greenlets`: stackless.html
-.. _StdObjSpace: objspace.html#the-standard-object-space 
+.. _StdObjSpace: objspace.html#the-standard-object-space
 .. _`abstract interpretation`: http://en.wikipedia.org/wiki/Abstract_interpretation
-.. _`rpython`: coding-guide.html#rpython 
-.. _`type inferencing code`: translation.html#the-annotation-pass 
-.. _`RPython Typer`: translation.html#rpython-typer 
+.. _`rpython`: coding-guide.html#rpython
+.. _`type inferencing code`: translation.html#the-annotation-pass
+.. _`RPython Typer`: translation.html#rpython-typer
 .. _`testing methods`: coding-guide.html#testing-in-pypy
-.. _`translation`: translation.html 
-.. _`GenC backend`: translation.html#genc 
+.. _`translation`: translation.html
+.. _`GenC backend`: translation.html#genc
 .. _`py.py`: getting-started-python.html#the-py.py-interpreter
 .. _`translatorshell.py`: getting-started-dev.html#try-out-the-translator
 .. _JIT: jit/index.html

pypy/doc/discussions.rst

 
 
 .. toctree::
-	
+
 	discussion/finalizer-order.rst
 	discussion/howtoimplementpickling.rst
 	discussion/improve-rpython.rst

pypy/doc/glossary.rst

     backend
         Code generator that converts an `RPython
         <coding-guide.html#restricted-python>`__ program to a `target
-        language`_ using the :term:`RPython toolchain`. A backend uses either the
-        :term:`lltypesystem` or the :term:`ootypesystem`.
+        language`_ using the :term:`RPython toolchain`.
 
     compile-time
         In the context of the :term:`JIT`, compile time is when the JIT is

pypy/doc/rtyper.rst

         interpret_raises(IndexError, raise_exception, [42])
         interpret_raises(ValueError, raise_exception, [43])
 
-By default the ``interpret`` and ``interpret_raises`` functions use
-the low-level typesystem. If you want to use the object oriented one
-you have to set the ``type_system`` parameter to the string
-``'ootype'``::
-
-    def test_invert():
-        def f(x):
-            return ~x
-        res = interpret(f, [3], type_system='ootype')
-        assert res == ~3
-
 .. _annotator: translation.html#the-annotation-pass
 
 .. include:: _ref.txt

rpython/rtyper/lltypesystem/lltype.py

 
 def identityhash(p):
     """Returns the lltype-level hash of the given GcStruct.
-    Also works with most ootype objects.  Not for NULL.
-    See rlib.objectmodel.compute_identity_hash() for more
+    Not for NULL. See rlib.objectmodel.compute_identity_hash() for more
     information about the RPython-level meaning of this.
     """
     assert p

rpython/rtyper/rlist.py

     return l
 
 
-# return a nullptr() if lst is a list of pointers it, else None.  Note
-# that if we are using ootypesystem there are not pointers, so we
-# always return None.
+# return a nullptr() if lst is a list of pointers it, else None.
 def ll_null_item(lst):
     LIST = typeOf(lst)
     if isinstance(LIST, Ptr):
 
 def listItemType(lst):
     LIST = typeOf(lst)
-    if isinstance(LIST, Ptr):    # lltype
-        LIST = LIST.TO
-    return LIST.ITEM
+    return LIST.TO.ITEM
 
 
 @signature(types.any(), types.any(), types.int(), types.int(), types.int(), returns=types.none())
 def ll_arraycopy(source, dest, source_start, dest_start, length):
     SRCTYPE = typeOf(source)
-    if isinstance(SRCTYPE, Ptr):
-        # lltype
-        rgc.ll_arraycopy(source.ll_items(), dest.ll_items(),
-                         source_start, dest_start, length)
-    else:
-        # ootype -- XXX improve the case of array->array copy?
-        i = 0
-        while i < length:
-            item = source.ll_getitem_fast(source_start + i)
-            dest.ll_setitem_fast(dest_start + i, item)
-            i += 1
+    # lltype
+    rgc.ll_arraycopy(source.ll_items(), dest.ll_items(),
+                     source_start, dest_start, length)
 
 
 def ll_copy(RESLIST, l):

rpython/rtyper/rstr.py

 #  get flowed and annotated, mostly with SomePtr.
 #
 
-# this class contains low level helpers used both by lltypesystem and
-# ootypesystem; each typesystem should subclass it and add its own
-# primitives.
+# this class contains low level helpers used both by lltypesystem
 class AbstractLLHelpers:
     __metaclass__ = StaticMethods