[pypy-svn] r25491 - pypy/dist/pypy/objspace

[afayolle at codespeak.net]

Author: afayolle
Date: Fri Apr  7 13:03:06 2006
New Revision: 25491

Modified:
   pypy/dist/pypy/objspace/logic.py
Log:
expose constraint module

Modified: pypy/dist/pypy/objspace/logic.py
==============================================================================
--- pypy/dist/pypy/objspace/logic.py	(original)
+++ pypy/dist/pypy/objspace/logic.py	Fri Apr  7 13:03:06 2006
@@ -202,6 +202,7 @@
     return W_Var()
 app_newvar = gateway.interp2app(newvar)
 
+
 def wait__Root(space, w_obj):
     return w_obj
 
@@ -754,19 +755,20 @@
 
 
 #------ domains -----------------
-
 from pypy.objspace.constraint import domain 
 all_mms.update(domain.all_mms)
 
 W_FiniteDomain = domain.W_FiniteDomain
 
-#------ computation space -------
-
+#-------- computationspace --------------
 from pypy.objspace.constraint import computationspace
 all_mms.update(computationspace.all_mms)
 
 W_ComputationSpace = computationspace.W_ComputationSpace
 
+# ---- constraints
+from pypy.objspace.constraint import constraint
+
 #-- THE SPACE ---------------------------------------
 
 #class UnificationError(w_RuntimeError):
@@ -817,6 +819,10 @@
                   space.wrap(app_alias_of))
     space.setitem(space.builtin.w_dict, space.wrap('is_aliased'),
                   space.wrap(app_is_aliased))
+    space.setitem(space.builtin.w_dict, space.wrap('newspace'),
+                 space.wrap(computationspace.app_newspace))
+    space.setitem(space.builtin.w_dict, space.wrap('AllDistinct'),
+                 space.wrap(constraint.app_make_alldistinct))
     space.setitem(space.builtin.w_dict, space.wrap('bind'),
                  space.wrap(app_bind))
     space.setitem(space.builtin.w_dict, space.wrap('unify'),