]> hydra-www.ietfng.org Git - dyna2/commitdiff
()
authorTim Vieira <tim.f.vieira@gmail.com>
Sat, 6 Jul 2013 19:15:27 +0000 (15:15 -0400)
committerTim Vieira <tim.f.vieira@gmail.com>
Sat, 6 Jul 2013 19:15:27 +0000 (15:15 -0400)
src/Dyna/Backend/Python/interpreter.py
src/Dyna/Backend/Python/repl.py

index fce690dd56e375ec99b747332253645a957064df..ab12b570097f0896e7e9fd338bff6e5c89557346 100644 (file)
@@ -197,7 +197,7 @@ class Interpreter(object):
                 c.agg_name = agg
                 for item in c.intern.itervalues():
                     assert item.aggregator is None
-                    item.aggregator = c.new_aggregator()
+                    item.aggregator = c.new_aggregator(item)
 
         assert self.agg_name[fn] == agg, (fn, self.agg_name[fn], agg)
 
index 8df3a3a8c38a3f8a6de5bee5a8166f4b4107c4e2..7ce7bbffb051aad91ac7af244348f57488e1e75c 100644 (file)
@@ -447,9 +447,9 @@ class REPL(cmd.Cmd, object):
         In our solution we see that `a` is true.
 
             > sol
-            a = true.
-            b = true.
-            c = true.
+            a.
+            b.
+            c.
 
         Now we want to find out why
 
@@ -557,7 +557,7 @@ class REPL(cmd.Cmd, object):
         self.interp.new_rules = set()
 
         try:
-            query = "$trace dict= _ is %s, &(%s)." % (q,q)
+            query = "$trace dict= _ is (%s), &(%s)." % (q,q)
 
             self.default(query, show_changed=False)
 
@@ -573,9 +573,10 @@ class REPL(cmd.Cmd, object):
 
             from post.trace import Tracer
             tracer = Tracer(self.interp)
+
             for item in results:
                 print
-                tracer(item)
+                tracer(todyna(item))
 
         finally:
             # cleanup: