[pypy-svn] r24887 - pypy/dist/pypy/objspace/test
auc at codespeak.net
auc at codespeak.net
Thu Mar 23 16:57:51 CET 2006
Author: auc
Date: Thu Mar 23 16:57:50 2006
New Revision: 24887
Modified:
pypy/dist/pypy/objspace/test/test_logicobjspace.py
Log:
updated logic objspace test
Modified: pypy/dist/pypy/objspace/test/test_logicobjspace.py
==============================================================================
--- pypy/dist/pypy/objspace/test/test_logicobjspace.py (original)
+++ pypy/dist/pypy/objspace/test/test_logicobjspace.py Thu Mar 23 16:57:50 2006
@@ -1,31 +1,24 @@
from pypy.conftest import gettestobjspace
+class UnificationFailure(Exception): pass
+
class AppTest_Logic(object):
def setup_class(cls):
cls.space = gettestobjspace('logic')
- def test_simple_bind(self):
+ def test_bind_var_val(self):
X = newvar()
assert is_free(X)
+ assert not is_bound(X)
bind(X, 1)
assert type(X) == int
+ assert not is_free(X)
assert is_bound(X)
assert is_bound(1)
- raises(TypeError, bind, 1, 2)
-
- def test_setitem_bind(self):
- x = newvar()
- d = {5: x}
- d[6] = x
- d[7] = []
- d[7].append(x)
- y = d[5], d[6], d.values(), d.items()
- for x in [d[5], d[6], d[7][0]]:
- assert is_free(d[5])
- bind(x, 1)
- for x in [d[5], d[6], d[7][0]]:
- assert is_bound(d[5])
+ # FIXME : propagate proper
+ # FailureException
+ raises(Exception, bind, X, 2)
def test_bind_to_self(self):
X = newvar()
@@ -34,45 +27,34 @@
bind(X, 1)
assert X == 1
- def test_bind_aliased(self):
+ def test_unify_to_self(self):
+ X = newvar()
+ assert is_free(X)
+ unify(X, X)
+ unify(X, 1)
+ assert X == 1
+
+ def test_bind_alias(self):
X = newvar()
Y = newvar()
bind(X, Y)
+ assert is_alias(X, Y)
+ assert is_alias(X, Y)
bind(X, 1)
+ # what about is_alias, then ?
assert X == 1
assert Y == 1
- def test_unbound_unification_long(self):
- l = [newvar() for i in range(40)]
- for i in range(39):
- bind(l[i], l[i + 1])
- bind(l[20], 1)
- for i in range(40):
- assert l[i] == 1
-
- def test_use_unbound_var(self):
- X = newvar()
- def f(x):
- return x + 1
- raises(RuntimeError, f, X)
-
-
- def test_eq_unifies_simple(self):
+ def test_unify_alias(self):
X = newvar()
Y = newvar()
unify(X, Y)
+ assert is_alias(X, Y)
+ assert is_alias(X, Y)
unify(X, 1)
+ # what about is_alias, then ?
assert X == 1
- assert is_bound(Y)
assert Y == 1
- assert X == Y
-
- def test_ne_of_unified_unbound_vars(self):
- X = newvar()
- Y = newvar()
- unify(X, Y)
- assert X == Y
- assert not X != Y
def test_cmp(self):
X = newvar()
@@ -88,50 +70,107 @@
def test_is(self):
X = newvar()
+ Y = newvar()
x = 1
assert 1 is 1
assert not(2 is 1)
assert X is X
+ assert X is X
bind(X, x)
- assert X == 1
+ bind(Y, X)
+ assert X is 1
+ assert 1 is X
+ assert Y is X
+ assert X is X
assert X is x
assert not(X is 2)
- def test_unify_free(self):
- X, Y = newvar(), newvar()
+ def test_setitem_bind(self):
+ x = newvar()
+ d = {5: x}
+ d[6] = x
+ d[7] = []
+ d[7].append(x)
+ y = d[5], d[6], d.values(), d.items()
+ for x in [d[5], d[6], d[7][0]]:
+ assert is_free(d[5])
+ bind(x, 1)
+ for x in [d[5], d[6], d[7][0]]:
+ assert is_bound(d[5])
+
+ def test_unbound_unification_long(self):
+ l = [newvar() for i in range(40)]
+ for i in range(39):
+ bind(l[i], l[i + 1])
+ bind(l[20], 1)
+ for i in range(40):
+ assert l[i] == 1
+
+ def test_use_unbound_var(self):
+ X = newvar()
+ def f(x):
+ return x + 1
+ raises(RuntimeError, f, X)
+
+ def test_eq_unifies_simple(self):
+ X = newvar()
+ Y = newvar()
unify(X, Y)
- assert X == Y
+ assert is_alias(Y, X)
unify(X, 1)
assert X == 1
+ assert is_bound(Y)
assert Y == 1
-
-
+ assert X is Y
+ assert X == Y
+
+ def test_ne_of_unified_unbound_vars(self):
+ X = newvar()
+ Y = newvar()
+ unify(X, Y)
+ assert is_free(X)
+ assert is_free(Y)
+ assert is_alias(X, Y)
+ assert X == Y
+ assert not X != Y
+
+ def test_unify_list(self):
+ X = newvar()
+ x = (newvar(), newvar())
+ unify(X, x)
+ unify(X[1], (newvar(), newvar()))
+ assert is_bound(X)
+ assert X == x
+ assert X[1] == x[1]
+ unify(X, (1, (2, None)))
+ assert X == (1, (2, None))
+ raises(Exception, unify, X, (1, 2))
class AppTest_LogicThreads(object):
def setup_class(cls):
cls.space = gettestobjspace('logic')
-
- def notest_eager_producer_consummer(self):
+ def test_eager_producer_consummer(self):
def generate(n, limit):
print "generate", n, limit
if n < limit:
return (n, generate(n + 1, limit))
- return (None, None)
+ return None
def sum(L, a):
print "sum", a
- head, Tail = newvar(), newvar()
- unify(L, (head, Tail))
- if head != None:
- return sum(Tail, head + a)
- return a
+ Head, Tail = newvar(), newvar()
+ unify(L, (Head, Tail))
+ if Tail != None:
+ return sum(Tail, Head + a)
+ return a + Head
X = newvar()
S = newvar()
- unify(S, uthread(sum, X, 0))
+
+ bind(S, uthread(sum, X, 0))
unify(X, uthread(generate, 0, 10))
assert S == 45
More information about the Pypy-commit
mailing list