[pypy-svn] r43584 - pypy/dist/pypy/jit/hintannotator/test

[arigo at codespeak.net]

Author: arigo
Date: Wed May 23 17:59:14 2007
New Revision: 43584

Added:
   pypy/dist/pypy/jit/hintannotator/test/test_annotator.py.merge.tmp
      - copied, changed from r43580, pypy/dist/pypy/jit/hintannotator/test/test_annotator.py
Log:
merging of http://codespeak.net/svn/pypy/branch/prolog-jit-experiments/pypy/jit/hintannotator/test/test_annotator.py
revisions 43364 to 43580:

    ------------------------------------------------------------------------
    r43556 | cfbolz | 2007-05-22 11:30:00 +0200 (Tue, 22 May 2007) | 3 lines
    
    factor out common parts of the PyrologHintAnnotatorPolicy and the
    PyPyHintAnnotatorPolicy
    
    ------------------------------------------------------------------------
    r43554 | cfbolz | 2007-05-22 11:12:33 +0200 (Tue, 22 May 2007) | 2 lines
    
    another missed import :-(
    
    ------------------------------------------------------------------------
    r43473 | cfbolz | 2007-05-18 14:06:41 +0200 (Fri, 18 May 2007) | 2 lines
    
    Allow functions to be manually marked as "pure".
    
    ------------------------------------------------------------------------
    r43366 | cfbolz | 2007-05-14 15:24:04 +0200 (Mon, 14 May 2007) | 5 lines
    
    Be afraid.  Very afraid.
    
    A branch to experiment with rewriting the Prolog interpreter to make it work
    with the JIT.
    
    ------------------------------------------------------------------------