[pypy-svn] r43585 - in pypy/dist/pypy: annotation/test interpreter jit/hintannotator jit/hintannotator/test jit/timeshifter jit/timeshifter/test jit/tl lang/automata lang/prolog module/pypyjit objspace/std rlib rpython rpython/lltypesystem translator/goal

[arigo at codespeak.net]

Author: arigo
Date: Wed May 23 18:00:33 2007
New Revision: 43585

Added:
   pypy/dist/pypy/annotation/test/test_annrpython.py
      - copied unchanged from r43584, pypy/dist/pypy/annotation/test/test_annrpython.py.merge.tmp
   pypy/dist/pypy/interpreter/baseobjspace.py
      - copied unchanged from r43584, pypy/dist/pypy/interpreter/baseobjspace.py.merge.tmp
   pypy/dist/pypy/interpreter/gateway.py
      - copied unchanged from r43584, pypy/branch/prolog-jit-experiments/pypy/interpreter/gateway.py
   pypy/dist/pypy/interpreter/pyframe.py
      - copied unchanged from r43584, pypy/branch/prolog-jit-experiments/pypy/interpreter/pyframe.py
   pypy/dist/pypy/interpreter/pyopcode.py
      - copied unchanged from r43584, pypy/branch/prolog-jit-experiments/pypy/interpreter/pyopcode.py
   pypy/dist/pypy/jit/hintannotator/annotator.py
      - copied unchanged from r43584, pypy/branch/prolog-jit-experiments/pypy/jit/hintannotator/annotator.py
   pypy/dist/pypy/jit/hintannotator/bookkeeper.py
      - copied unchanged from r43584, pypy/branch/prolog-jit-experiments/pypy/jit/hintannotator/bookkeeper.py
   pypy/dist/pypy/jit/hintannotator/policy.py
      - copied unchanged from r43584, pypy/branch/prolog-jit-experiments/pypy/jit/hintannotator/policy.py
   pypy/dist/pypy/jit/hintannotator/test/test_annotator.py
      - copied unchanged from r43584, pypy/dist/pypy/jit/hintannotator/test/test_annotator.py.merge.tmp
   pypy/dist/pypy/jit/timeshifter/hrtyper.py
      - copied unchanged from r43584, pypy/branch/prolog-jit-experiments/pypy/jit/timeshifter/hrtyper.py
   pypy/dist/pypy/jit/timeshifter/rtimeshift.py
      - copied unchanged from r43584, pypy/branch/prolog-jit-experiments/pypy/jit/timeshifter/rtimeshift.py
   pypy/dist/pypy/jit/timeshifter/test/test_frontend.py
      - copied unchanged from r43584, pypy/branch/prolog-jit-experiments/pypy/jit/timeshifter/test/test_frontend.py
   pypy/dist/pypy/jit/timeshifter/test/test_portal.py
      - copied unchanged from r43584, pypy/dist/pypy/jit/timeshifter/test/test_portal.py.merge.tmp
   pypy/dist/pypy/jit/timeshifter/test/test_promotion.py
      - copied unchanged from r43584, pypy/branch/prolog-jit-experiments/pypy/jit/timeshifter/test/test_promotion.py
   pypy/dist/pypy/jit/timeshifter/test/test_timeshift.py
      - copied unchanged from r43584, pypy/branch/prolog-jit-experiments/pypy/jit/timeshifter/test/test_timeshift.py
   pypy/dist/pypy/jit/timeshifter/test/test_vdict.py
      - copied unchanged from r43584, pypy/branch/prolog-jit-experiments/pypy/jit/timeshifter/test/test_vdict.py
   pypy/dist/pypy/jit/timeshifter/test/test_virtualizable.py
      - copied unchanged from r43584, pypy/branch/prolog-jit-experiments/pypy/jit/timeshifter/test/test_virtualizable.py
   pypy/dist/pypy/jit/timeshifter/test/test_vlist.py
      - copied unchanged from r43584, pypy/branch/prolog-jit-experiments/pypy/jit/timeshifter/test/test_vlist.py
   pypy/dist/pypy/jit/tl/
      - copied from r43584, pypy/branch/prolog-jit-experiments/pypy/jit/tl/
   pypy/dist/pypy/lang/automata/
      - copied from r43584, pypy/branch/prolog-jit-experiments/pypy/lang/automata/
   pypy/dist/pypy/lang/prolog/
      - copied from r43584, pypy/branch/prolog-jit-experiments/pypy/lang/prolog/
   pypy/dist/pypy/module/pypyjit/
      - copied from r43584, pypy/branch/prolog-jit-experiments/pypy/module/pypyjit/
   pypy/dist/pypy/objspace/std/multimethod.py
      - copied unchanged from r43584, pypy/branch/prolog-jit-experiments/pypy/objspace/std/multimethod.py
   pypy/dist/pypy/objspace/std/objspace.py
      - copied unchanged from r43584, pypy/branch/prolog-jit-experiments/pypy/objspace/std/objspace.py
   pypy/dist/pypy/objspace/std/typeobject.py
      - copied unchanged from r43584, pypy/branch/prolog-jit-experiments/pypy/objspace/std/typeobject.py
   pypy/dist/pypy/rlib/jit.py
      - copied unchanged from r43584, pypy/branch/prolog-jit-experiments/pypy/rlib/jit.py
   pypy/dist/pypy/rlib/objectmodel.py
      - copied unchanged from r43584, pypy/branch/prolog-jit-experiments/pypy/rlib/objectmodel.py
   pypy/dist/pypy/rpython/llinterp.py
      - copied unchanged from r43584, pypy/branch/prolog-jit-experiments/pypy/rpython/llinterp.py
   pypy/dist/pypy/rpython/lltypesystem/
      - copied from r43584, pypy/branch/prolog-jit-experiments/pypy/rpython/lltypesystem/
   pypy/dist/pypy/translator/goal/
      - copied from r43584, pypy/branch/prolog-jit-experiments/pypy/translator/goal/
Removed:
   pypy/dist/pypy/annotation/test/test_annrpython.py.merge.tmp
   pypy/dist/pypy/interpreter/baseobjspace.py.merge.tmp
   pypy/dist/pypy/jit/hintannotator/test/test_annotator.py.merge.tmp
   pypy/dist/pypy/jit/timeshifter/test/test_portal.py.merge.tmp
Log:
(cfbolz, arigo)

Merge the prolog-jit-experiments branch.