From: timv Date: Fri, 14 Jun 2013 22:48:40 +0000 (-0400) Subject: tiny tweaks. X-Git-Url: https://hydra-www.ietfng.org/gitweb/?a=commitdiff_plain;h=8d9f47b2e9f640c62c6760bbdd3abad89f751d9b;p=dyna2 tiny tweaks. --- diff --git a/src/Dyna/Backend/Python/load.py b/src/Dyna/Backend/Python/load.py index b860fb1..18b94f0 100644 --- a/src/Dyna/Backend/Python/load.py +++ b/src/Dyna/Backend/Python/load.py @@ -6,14 +6,12 @@ import cPickle from interpreter import Interpreter, foo, none + def main(): - #out = cPickle.dumps(interp) # XXX: - #interp2 = cPickle.loads(out) # XXX: - #interp2.repl() with file('save.pkl', 'r') as f: interp = cPickle.load(f) - interp.repl() + if __name__ == '__main__': main() diff --git a/src/Dyna/Backend/Python/save.py b/src/Dyna/Backend/Python/save.py index f954dd4..ed99a3c 100644 --- a/src/Dyna/Backend/Python/save.py +++ b/src/Dyna/Backend/Python/save.py @@ -6,8 +6,6 @@ import cPickle def main(interp): - #out = cPickle.dumps(interp) # XXX: - #interp2 = cPickle.loads(out) # XXX: - #interp2.repl() with file('save.pkl', 'wb') as f: cPickle.dump(interp, f) + print 'wrote', f.name diff --git a/src/Dyna/Backend/Python/term.py b/src/Dyna/Backend/Python/term.py index dd88c0c..da0bec7 100644 --- a/src/Dyna/Backend/Python/term.py +++ b/src/Dyna/Backend/Python/term.py @@ -200,8 +200,6 @@ def symbol(name): if __name__ == '__main__': - from utils import ip - [f,g,h] = map(symbol, ['f','g','h']) vs = [X,Y,Z] = map(symbol, ['X','Y','Z']) @@ -228,9 +226,7 @@ if __name__ == '__main__': test(f(X, Y), f("cat", 123)) test(f(X), f(X)) test(f(X), f(Y)) - - # TODO: this fails: - #test("", "") + test("abc", "abc") Z.value = 3 Y.value = Z