From d68cb3cb736e795b9479e51b6ecd1f0a3bd86cdd Mon Sep 17 00:00:00 2001 From: Tim Vieira Date: Sat, 6 Jul 2013 15:15:27 -0400 Subject: [PATCH] () --- src/Dyna/Backend/Python/interpreter.py | 2 +- src/Dyna/Backend/Python/repl.py | 11 ++++++----- 2 files changed, 7 insertions(+), 6 deletions(-) diff --git a/src/Dyna/Backend/Python/interpreter.py b/src/Dyna/Backend/Python/interpreter.py index fce690d..ab12b57 100644 --- a/src/Dyna/Backend/Python/interpreter.py +++ b/src/Dyna/Backend/Python/interpreter.py @@ -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) diff --git a/src/Dyna/Backend/Python/repl.py b/src/Dyna/Backend/Python/repl.py index 8df3a3a..7ce7bbf 100644 --- a/src/Dyna/Backend/Python/repl.py +++ b/src/Dyna/Backend/Python/repl.py @@ -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: -- 2.50.1