[pypy-svn] r67043 - in pypy/branch/pyjitpl5/pypy/jit/backend: . test test/loopdata

[benjamin at codespeak.net]

Author: benjamin
Date: Thu Aug 20 18:08:01 2009
New Revision: 67043

Modified:
   pypy/branch/pyjitpl5/pypy/jit/backend/loopparser.py
   pypy/branch/pyjitpl5/pypy/jit/backend/test/loopdata/simple.ops
   pypy/branch/pyjitpl5/pypy/jit/backend/test/test_loopparser.py
Log:
support negative values correctly

Modified: pypy/branch/pyjitpl5/pypy/jit/backend/loopparser.py
==============================================================================
--- pypy/branch/pyjitpl5/pypy/jit/backend/loopparser.py	(original)
+++ pypy/branch/pyjitpl5/pypy/jit/backend/loopparser.py	Thu Aug 20 18:08:01 2009
@@ -128,7 +128,7 @@
 }
 
 
-_arg_finder = re.compile(r"(..)\((\d+),(\d+)\)")
+_arg_finder = re.compile(r"(..)\((\d+),(-?\d+)\)")
 
 class Parser(object):
 

Modified: pypy/branch/pyjitpl5/pypy/jit/backend/test/loopdata/simple.ops
==============================================================================
--- pypy/branch/pyjitpl5/pypy/jit/backend/test/loopdata/simple.ops	(original)
+++ pypy/branch/pyjitpl5/pypy/jit/backend/test/loopdata/simple.ops	Thu Aug 20 18:08:01 2009
@@ -4,7 +4,7 @@
   => bi(3,24)
 2:int_sub bi(1,4),ci(4,1)
   => bi(5,3)
-3:int_gt bi(5,3),ci(6,0)
+3:int_gt bi(5,3),ci(6,-42)
   => bi(7,1)
 4:guard_true bi(7,1)
   BEGIN(0)

Modified: pypy/branch/pyjitpl5/pypy/jit/backend/test/test_loopparser.py
==============================================================================
--- pypy/branch/pyjitpl5/pypy/jit/backend/test/test_loopparser.py	(original)
+++ pypy/branch/pyjitpl5/pypy/jit/backend/test/test_loopparser.py	Thu Aug 20 18:08:01 2009
@@ -37,6 +37,7 @@
         assert isinstance(topblock.operations[2].args[1], ConstInt)
         assert topblock.operations[2].args[1].value == 1
         assert topblock.operations[2].result is topblock.operations[3].args[0]
+        assert topblock.operations[3].args[1].value == -42
 
     def test_two_paths(self):
         loops = self.parse("two_paths.ops")