[pypy-svn] r23848 - pypy/dist/pypy/lib/logic/computation_space

[auc at codespeak.net]

Author: auc
Date: Wed Mar  1 18:19:44 2006
New Revision: 23848

Modified:
   pypy/dist/pypy/lib/logic/computation_space/computationspace.py
Log:
twist to merge, until vars are per-space


Modified: pypy/dist/pypy/lib/logic/computation_space/computationspace.py
==============================================================================
--- pypy/dist/pypy/lib/logic/computation_space/computationspace.py	(original)
+++ pypy/dist/pypy/lib/logic/computation_space/computationspace.py	Wed Mar  1 18:19:44 2006
@@ -289,11 +289,15 @@
     def merge(self):
         """binds root vars to their singleton domains """
         assert self.status == Succeeded
-        for var in self.root.val:
-            var.bind(self.dom(var).get_values()[0])
+        # this can't work if we don't copy vars too
+        #for var in self.root.val:
+        #    var.bind(self.dom(var).get_values()[0])
         # shut down the distributor
         self.CHOOSE.bind(0)
-        return self.root.val
+        res = []
+        for var in self.root.val:
+            res.append(self.dom(var).get_values()[0])
+        return res
 
     def set_distributor(self, dist):
         self.distributor = dist