Author: Ronan Lamy <[email protected]>
Branch: less-stringly-ops
Changeset: r68276:8bfdeae1f646
Date: 2013-11-21 23:31 +0100
http://bitbucket.org/pypy/pypy/changeset/8bfdeae1f646/
Log: Update tests to use op.* instead of raw SpaceOperations
diff --git a/rpython/annotator/test/test_annrpython.py
b/rpython/annotator/test/test_annrpython.py
--- a/rpython/annotator/test/test_annrpython.py
+++ b/rpython/annotator/test/test_annrpython.py
@@ -15,6 +15,7 @@
from rpython.rlib.rarithmetic import r_singlefloat
from rpython.rlib import objectmodel
from rpython.flowspace.objspace import build_flow, FlowingError
+from rpython.flowspace.operation import op
from rpython.translator.test import snippet
@@ -69,12 +70,11 @@
return x+1
"""
x = Variable("x")
- result = Variable("result")
- op = SpaceOperation("add", [x, Constant(1)], result)
+ oper = op.add(x, Constant(1))
block = Block([x])
fun = FunctionGraph("f", block)
- block.operations.append(op)
- block.closeblock(Link([result], fun.returnblock))
+ block.operations.append(oper)
+ block.closeblock(Link([oper.result], fun.returnblock))
a = self.RPythonAnnotator()
a.addpendingblock(fun, fun.startblock, [annmodel.SomeInteger()])
a.complete()
@@ -90,20 +90,18 @@
"""
i1 = Variable("i1")
i2 = Variable("i2")
- i3 = Variable("i3")
- conditionres = Variable("conditionres")
- conditionop = SpaceOperation("gt", [i1, Constant(0)], conditionres)
- decop = SpaceOperation("add", [i2, Constant(-1)], i3)
+ conditionop = op.gt(i1, Constant(0))
+ decop = op.add(i2, Constant(-1))
headerblock = Block([i1])
whileblock = Block([i2])
fun = FunctionGraph("f", headerblock)
headerblock.operations.append(conditionop)
- headerblock.exitswitch = conditionres
+ headerblock.exitswitch = conditionop.result
headerblock.closeblock(Link([i1], fun.returnblock, False),
Link([i1], whileblock, True))
whileblock.operations.append(decop)
- whileblock.closeblock(Link([i3], headerblock))
+ whileblock.closeblock(Link([decop.result], headerblock))
a = self.RPythonAnnotator()
a.addpendingblock(fun, fun.startblock, [annmodel.SomeInteger()])
@@ -123,15 +121,12 @@
i1 = Variable("i1")
i2 = Variable("i2")
i3 = Variable("i3")
- i4 = Variable("i4")
sum2 = Variable("sum2")
sum3 = Variable("sum3")
- sum4 = Variable("sum4")
-
- conditionres = Variable("conditionres")
- conditionop = SpaceOperation("gt", [i2, Constant(0)], conditionres)
- decop = SpaceOperation("add", [i3, Constant(-1)], i4)
- addop = SpaceOperation("add", [i3, sum3], sum4)
+
+ conditionop = op.gt(i2, Constant(0))
+ decop = op.add(i3, Constant(-1))
+ addop = op.add(i3, sum3)
startblock = Block([i1])
headerblock = Block([i2, sum2])
whileblock = Block([i3, sum3])
@@ -139,12 +134,12 @@
fun = FunctionGraph("f", startblock)
startblock.closeblock(Link([i1, Constant(0)], headerblock))
headerblock.operations.append(conditionop)
- headerblock.exitswitch = conditionres
+ headerblock.exitswitch = conditionop.result
headerblock.closeblock(Link([sum2], fun.returnblock, False),
Link([i2, sum2], whileblock, True))
whileblock.operations.append(addop)
whileblock.operations.append(decop)
- whileblock.closeblock(Link([i4, sum4], headerblock))
+ whileblock.closeblock(Link([decop.result, addop.result], headerblock))
a = self.RPythonAnnotator()
a.addpendingblock(fun, fun.startblock, [annmodel.SomeInteger()])
_______________________________________________
pypy-commit mailing list
[email protected]
https://mail.python.org/mailman/listinfo/pypy-commit
