[pypy-svn] r46335 - in pypy/branch/merging: annotation annotation/test config interpreter jit/codegen module/_curses module/posix module/sys module/time objspace/flow rlib rlib/parsing rlib/rcairo/test rlib/test rpython rpython/lltypesystem rpython/lltypesystem/module rpython/lltypesystem/test rpython/memory/gctransform/test rpython/memory/test rpython/module rpython/numpy/test rpython/ootypesystem/module rpython/ootypesystem/test rpython/test rpython/tool rpython/tool/test translator translator/backendopt translator/c translator/c/src translator/c/test translator/cli translator/cli/src translator/cli/test translator/js/modules translator/jvm/test translator/llvm/test translator/oosupport/test_template translator/sandbox translator/test translator/tool

[arigo at codespeak.net]

Author: arigo
Date: Wed Sep  5 12:35:18 2007
New Revision: 46335

Added:
   pypy/branch/merging/annotation/binaryop.py
      - copied unchanged from r46334, pypy/branch/pypy-more-rtti-inprogress/annotation/binaryop.py
   pypy/branch/merging/annotation/signature.py
      - copied unchanged from r46334, pypy/branch/pypy-more-rtti-inprogress/annotation/signature.py
   pypy/branch/merging/annotation/test/
      - copied from r46334, pypy/branch/pypy-more-rtti-inprogress/annotation/test/
   pypy/branch/merging/config/translationoption.py
      - copied unchanged from r46334, pypy/branch/merging/config/translationoption.py.merge.tmp
   pypy/branch/merging/interpreter/
      - copied from r46334, pypy/branch/pypy-more-rtti-inprogress/interpreter/
   pypy/branch/merging/jit/codegen/
      - copied from r46334, pypy/branch/pypy-more-rtti-inprogress/jit/codegen/
   pypy/branch/merging/module/_curses/fficurses.py
      - copied unchanged from r46334, pypy/branch/pypy-more-rtti-inprogress/module/_curses/fficurses.py
   pypy/branch/merging/module/posix/
      - copied from r46334, pypy/branch/pypy-more-rtti-inprogress/module/posix/
   pypy/branch/merging/module/sys/
      - copied from r46334, pypy/branch/pypy-more-rtti-inprogress/module/sys/
   pypy/branch/merging/module/time/
      - copied from r46334, pypy/branch/pypy-more-rtti-inprogress/module/time/
   pypy/branch/merging/objspace/flow/objspace.py
      - copied unchanged from r46334, pypy/branch/merging/objspace/flow/objspace.py.merge.tmp
   pypy/branch/merging/rlib/_rsocket_rffi.py
      - copied unchanged from r46334, pypy/branch/pypy-more-rtti-inprogress/rlib/_rsocket_rffi.py
   pypy/branch/merging/rlib/parsing/
      - copied from r46334, pypy/branch/pypy-more-rtti-inprogress/rlib/parsing/
   pypy/branch/merging/rlib/rbigint.py
      - copied unchanged from r46334, pypy/branch/pypy-more-rtti-inprogress/rlib/rbigint.py
   pypy/branch/merging/rlib/rcairo/test/
      - copied from r46334, pypy/branch/pypy-more-rtti-inprogress/rlib/rcairo/test/
   pypy/branch/merging/rlib/rmarshal.py
      - copied unchanged from r46334, pypy/branch/pypy-more-rtti-inprogress/rlib/rmarshal.py
   pypy/branch/merging/rlib/test/
      - copied from r46334, pypy/branch/pypy-more-rtti-inprogress/rlib/test/
   pypy/branch/merging/rpython/annlowlevel.py
      - copied unchanged from r46334, pypy/branch/pypy-more-rtti-inprogress/rpython/annlowlevel.py
   pypy/branch/merging/rpython/controllerentry.py
      - copied unchanged from r46334, pypy/branch/pypy-more-rtti-inprogress/rpython/controllerentry.py
   pypy/branch/merging/rpython/extfunc.py
      - copied unchanged from r46334, pypy/branch/pypy-more-rtti-inprogress/rpython/extfunc.py
   pypy/branch/merging/rpython/extfuncregistry.py
      - copied unchanged from r46334, pypy/branch/pypy-more-rtti-inprogress/rpython/extfuncregistry.py
   pypy/branch/merging/rpython/extfunctable.py
      - copied unchanged from r46334, pypy/branch/pypy-more-rtti-inprogress/rpython/extfunctable.py
   pypy/branch/merging/rpython/llinterp.py
      - copied unchanged from r46334, pypy/branch/merging/rpython/llinterp.py.merge.tmp
   pypy/branch/merging/rpython/lltypesystem/ll2ctypes.py
      - copied unchanged from r46334, pypy/branch/pypy-more-rtti-inprogress/rpython/lltypesystem/ll2ctypes.py
   pypy/branch/merging/rpython/lltypesystem/lloperation.py
      - copied unchanged from r46334, pypy/branch/pypy-more-rtti-inprogress/rpython/lltypesystem/lloperation.py
   pypy/branch/merging/rpython/lltypesystem/lltype.py
      - copied unchanged from r46334, pypy/branch/merging/rpython/lltypesystem/lltype.py.merge.tmp
   pypy/branch/merging/rpython/lltypesystem/module/
      - copied from r46334, pypy/branch/pypy-more-rtti-inprogress/rpython/lltypesystem/module/
   pypy/branch/merging/rpython/lltypesystem/rffi.py
      - copied unchanged from r46334, pypy/branch/pypy-more-rtti-inprogress/rpython/lltypesystem/rffi.py
   pypy/branch/merging/rpython/lltypesystem/rstr.py
      - copied unchanged from r46334, pypy/branch/pypy-more-rtti-inprogress/rpython/lltypesystem/rstr.py
   pypy/branch/merging/rpython/lltypesystem/test/
      - copied from r46334, pypy/branch/pypy-more-rtti-inprogress/rpython/lltypesystem/test/
   pypy/branch/merging/rpython/memory/gctransform/test/test_refcounting.py
      - copied unchanged from r46334, pypy/branch/pypy-more-rtti-inprogress/rpython/memory/gctransform/test/test_refcounting.py
   pypy/branch/merging/rpython/memory/test/
      - copied from r46334, pypy/branch/pypy-more-rtti-inprogress/rpython/memory/test/
   pypy/branch/merging/rpython/module/
      - copied from r46334, pypy/branch/pypy-more-rtti-inprogress/rpython/module/
   pypy/branch/merging/rpython/numpy/test/test_array.py
      - copied unchanged from r46334, pypy/branch/merging/rpython/numpy/test/test_array.py.merge.tmp
   pypy/branch/merging/rpython/ootypesystem/module/
      - copied from r46334, pypy/branch/pypy-more-rtti-inprogress/rpython/ootypesystem/module/
   pypy/branch/merging/rpython/ootypesystem/test/test_bltann.py
      - copied unchanged from r46334, pypy/branch/pypy-more-rtti-inprogress/rpython/ootypesystem/test/test_bltann.py
   pypy/branch/merging/rpython/rbool.py
      - copied unchanged from r46334, pypy/branch/pypy-more-rtti-inprogress/rpython/rbool.py
   pypy/branch/merging/rpython/rbuiltin.py
      - copied unchanged from r46334, pypy/branch/pypy-more-rtti-inprogress/rpython/rbuiltin.py
   pypy/branch/merging/rpython/rcontrollerentry.py
      - copied unchanged from r46334, pypy/branch/pypy-more-rtti-inprogress/rpython/rcontrollerentry.py
   pypy/branch/merging/rpython/rfloat.py
      - copied unchanged from r46334, pypy/branch/pypy-more-rtti-inprogress/rpython/rfloat.py
   pypy/branch/merging/rpython/rint.py
      - copied unchanged from r46334, pypy/branch/pypy-more-rtti-inprogress/rpython/rint.py
   pypy/branch/merging/rpython/test/test_extfunc.py
      - copied unchanged from r46334, pypy/branch/pypy-more-rtti-inprogress/rpython/test/test_extfunc.py
   pypy/branch/merging/rpython/test/test_extfuncregister.py
      - copied unchanged from r46334, pypy/branch/pypy-more-rtti-inprogress/rpython/test/test_extfuncregister.py
   pypy/branch/merging/rpython/test/test_llann.py
      - copied unchanged from r46334, pypy/branch/pypy-more-rtti-inprogress/rpython/test/test_llann.py
   pypy/branch/merging/rpython/test/test_llinterp.py
      - copied unchanged from r46334, pypy/branch/merging/rpython/test/test_llinterp.py.merge.tmp
   pypy/branch/merging/rpython/test/test_nongc.py
      - copied unchanged from r46334, pypy/branch/pypy-more-rtti-inprogress/rpython/test/test_nongc.py
   pypy/branch/merging/rpython/test/test_rbuiltin.py
      - copied unchanged from r46334, pypy/branch/pypy-more-rtti-inprogress/rpython/test/test_rbuiltin.py
   pypy/branch/merging/rpython/test/test_rfloat.py
      - copied unchanged from r46334, pypy/branch/merging/rpython/test/test_rfloat.py.merge.tmp
   pypy/branch/merging/rpython/test/test_rptr.py
      - copied unchanged from r46334, pypy/branch/pypy-more-rtti-inprogress/rpython/test/test_rptr.py
   pypy/branch/merging/rpython/tool/genrffi.py
      - copied unchanged from r46334, pypy/branch/pypy-more-rtti-inprogress/rpython/tool/genrffi.py
   pypy/branch/merging/rpython/tool/mkrffi.py
      - copied unchanged from r46334, pypy/branch/pypy-more-rtti-inprogress/rpython/tool/mkrffi.py
   pypy/branch/merging/rpython/tool/rffi_platform.py
      - copied unchanged from r46334, pypy/branch/pypy-more-rtti-inprogress/rpython/tool/rffi_platform.py
   pypy/branch/merging/rpython/tool/rfficache.py
      - copied unchanged from r46334, pypy/branch/pypy-more-rtti-inprogress/rpython/tool/rfficache.py
   pypy/branch/merging/rpython/tool/test/
      - copied from r46334, pypy/branch/pypy-more-rtti-inprogress/rpython/tool/test/
   pypy/branch/merging/rpython/typesystem.py
      - copied unchanged from r46334, pypy/branch/pypy-more-rtti-inprogress/rpython/typesystem.py
   pypy/branch/merging/translator/backendopt/
      - copied from r46334, pypy/branch/pypy-more-rtti-inprogress/translator/backendopt/
   pypy/branch/merging/translator/c/database.py
      - copied unchanged from r46334, pypy/branch/pypy-more-rtti-inprogress/translator/c/database.py
   pypy/branch/merging/translator/c/extfunc.py
      - copied unchanged from r46334, pypy/branch/pypy-more-rtti-inprogress/translator/c/extfunc.py
   pypy/branch/merging/translator/c/funcgen.py
      - copied unchanged from r46334, pypy/branch/pypy-more-rtti-inprogress/translator/c/funcgen.py
   pypy/branch/merging/translator/c/genc.py
      - copied unchanged from r46334, pypy/branch/pypy-more-rtti-inprogress/translator/c/genc.py
   pypy/branch/merging/translator/c/node.py
      - copied unchanged from r46334, pypy/branch/pypy-more-rtti-inprogress/translator/c/node.py
   pypy/branch/merging/translator/c/src/float.h
      - copied unchanged from r46334, pypy/branch/pypy-more-rtti-inprogress/translator/c/src/float.h
   pypy/branch/merging/translator/c/src/ll_math.h
      - copied unchanged from r46334, pypy/branch/pypy-more-rtti-inprogress/translator/c/src/ll_math.h
   pypy/branch/merging/translator/c/src/ll_os.h
      - copied unchanged from r46334, pypy/branch/pypy-more-rtti-inprogress/translator/c/src/ll_os.h
   pypy/branch/merging/translator/c/src/stack.h
      - copied unchanged from r46334, pypy/branch/pypy-more-rtti-inprogress/translator/c/src/stack.h
   pypy/branch/merging/translator/c/src/support.h
      - copied unchanged from r46334, pypy/branch/pypy-more-rtti-inprogress/translator/c/src/support.h
   pypy/branch/merging/translator/c/src/thread.c
      - copied unchanged from r46334, pypy/branch/pypy-more-rtti-inprogress/translator/c/src/thread.c
   pypy/branch/merging/translator/c/src/thread_pthread.h
      - copied unchanged from r46334, pypy/branch/pypy-more-rtti-inprogress/translator/c/src/thread_pthread.h
   pypy/branch/merging/translator/c/test/test_extfunc.py
      - copied unchanged from r46334, pypy/branch/pypy-more-rtti-inprogress/translator/c/test/test_extfunc.py
   pypy/branch/merging/translator/c/test/test_genc.py
      - copied unchanged from r46334, pypy/branch/pypy-more-rtti-inprogress/translator/c/test/test_genc.py
   pypy/branch/merging/translator/c/test/test_lltyped.py
      - copied unchanged from r46334, pypy/branch/pypy-more-rtti-inprogress/translator/c/test/test_lltyped.py
   pypy/branch/merging/translator/cli/database.py
      - copied unchanged from r46334, pypy/branch/pypy-more-rtti-inprogress/translator/cli/database.py
   pypy/branch/merging/translator/cli/metavm.py
      - copied unchanged from r46334, pypy/branch/merging/translator/cli/metavm.py.merge.tmp
   pypy/branch/merging/translator/cli/opcodes.py
      - copied unchanged from r46334, pypy/branch/pypy-more-rtti-inprogress/translator/cli/opcodes.py
   pypy/branch/merging/translator/cli/src/ll_os.cs
      - copied unchanged from r46334, pypy/branch/pypy-more-rtti-inprogress/translator/cli/src/ll_os.cs
   pypy/branch/merging/translator/cli/src/pypylib.cs
      - copied unchanged from r46334, pypy/branch/merging/translator/cli/src/pypylib.cs.merge.tmp
   pypy/branch/merging/translator/cli/test/test_builtin.py
      - copied unchanged from r46334, pypy/branch/pypy-more-rtti-inprogress/translator/cli/test/test_builtin.py
   pypy/branch/merging/translator/js/modules/
      - copied from r46334, pypy/branch/pypy-more-rtti-inprogress/translator/js/modules/
   pypy/branch/merging/translator/jvm/test/test_cast.py
      - copied unchanged from r46334, pypy/branch/merging/translator/jvm/test/test_cast.py.merge.tmp
   pypy/branch/merging/translator/llvm/test/test_extfunc.py
      - copied unchanged from r46334, pypy/branch/pypy-more-rtti-inprogress/translator/llvm/test/test_extfunc.py
   pypy/branch/merging/translator/oosupport/test_template/cast.py
      - copied unchanged from r46334, pypy/branch/pypy-more-rtti-inprogress/translator/oosupport/test_template/cast.py
   pypy/branch/merging/translator/oosupport/test_template/operations.py
      - copied unchanged from r46334, pypy/branch/pypy-more-rtti-inprogress/translator/oosupport/test_template/operations.py
   pypy/branch/merging/translator/sandbox/
      - copied from r46334, pypy/branch/pypy-more-rtti-inprogress/translator/sandbox/
   pypy/branch/merging/translator/test/test_exceptiontransform.py
      - copied unchanged from r46334, pypy/branch/merging/translator/test/test_exceptiontransform.py.merge.tmp
   pypy/branch/merging/translator/tool/
      - copied from r46334, pypy/branch/pypy-more-rtti-inprogress/translator/tool/
   pypy/branch/merging/translator/translator.py
      - copied unchanged from r46334, pypy/branch/merging/translator/translator.py.merge.tmp
Removed:
   pypy/branch/merging/config/translationoption.py.merge.tmp
   pypy/branch/merging/objspace/flow/objspace.py.merge.tmp
   pypy/branch/merging/rpython/llinterp.py.merge.tmp
   pypy/branch/merging/rpython/lltypesystem/lltype.py.merge.tmp
   pypy/branch/merging/rpython/numpy/test/test_array.py.merge.tmp
   pypy/branch/merging/rpython/test/test_llinterp.py.merge.tmp
   pypy/branch/merging/rpython/test/test_rexternalobj.py
   pypy/branch/merging/rpython/test/test_rfloat.py.merge.tmp
   pypy/branch/merging/translator/c/src/ll_osdefs.h
   pypy/branch/merging/translator/cli/metavm.py.merge.tmp
   pypy/branch/merging/translator/cli/src/pypylib.cs.merge.tmp
   pypy/branch/merging/translator/jvm/test/test_cast.py.merge.tmp
   pypy/branch/merging/translator/test/test_exceptiontransform.py.merge.tmp
   pypy/branch/merging/translator/translator.py.merge.tmp
Log:
(arigo, antocuni around)

Finish merging the rffi branch into the "merging" branch.