update tests to reflect new output format.

diff --git a/examples/expected/dijkstra.py.out b/examples/expected/dijkstra.py.out
index 3199acae3919f9e6e447e562c17a88ad2c94624a..d0e62b5d99a3491edeaa9efe0c23fc465a7ecc7e 100644 (file)
--- a/examples/expected/dijkstra.py.out
+++ b/examples/expected/dijkstra.py.out
@@ -1,35 +1,35 @@
 
 Solution
 ========
-end => "MyHouse".
-goal => 2410.
-start => "FriendHouse".
+end = "MyHouse".
+goal = 2410.
+start = "FriendHouse".
 
 edge/2
 ======
-edge("BOS","JFK")         => 187.
-edge("BOS","MIA")         => 1258.
-edge("DFW","LAX")         => 1235.
-edge("DFW","ORD")         => 802.
-edge("FriendHouse","BOS") => 10.
-edge("JFK","DFW")         => 1391.
-edge("JFK","MIA")         => 1090.
-edge("JFK","SFO")         => 2582.
-edge("LAX","ORD")         => 1749.
-edge("MIA","DFW")         => 1121.
-edge("MIA","LAX")         => 2342.
-edge("ORD","DFW")         => 802.
-edge("ORD","MyHouse")     => 20.
+edge("BOS","JFK")         = 187.
+edge("BOS","MIA")         = 1258.
+edge("DFW","LAX")         = 1235.
+edge("DFW","ORD")         = 802.
+edge("FriendHouse","BOS") = 10.
+edge("JFK","DFW")         = 1391.
+edge("JFK","MIA")         = 1090.
+edge("JFK","SFO")         = 2582.
+edge("LAX","ORD")         = 1749.
+edge("MIA","DFW")         = 1121.
+edge("MIA","LAX")         = 2342.
+edge("ORD","DFW")         = 802.
+edge("ORD","MyHouse")     = 20.
 
 path/1
 ======
-path("BOS")         => 10.
-path("DFW")         => 1588.
-path("FriendHouse") => 0.
-path("JFK")         => 197.
-path("LAX")         => 2823.
-path("MIA")         => 1268.
-path("MyHouse")     => 2410.
-path("ORD")         => 2390.
-path("SFO")         => 2779.
+path("BOS")         = 10.
+path("DFW")         = 1588.
+path("FriendHouse") = 0.
+path("JFK")         = 197.
+path("LAX")         = 2823.
+path("MIA")         = 1268.
+path("MyHouse")     = 2410.
+path("ORD")         = 2390.
+path("SFO")         = 2779.
 

diff --git a/examples/expected/equalities.py.out b/examples/expected/equalities.py.out
index a9e299145ee29859754e209f0059d58b4e5dbf80..137d94f7631001e4310f07abab061e895371e549 100644 (file)
--- a/examples/expected/equalities.py.out
+++ b/examples/expected/equalities.py.out
@@ -1,11 +1,11 @@
 
 Solution
 ========
-a => 0.
-b => 0.
-by_evl_cross => true.
-by_evl_refl => true.
-by_is_0a => true.
-by_syn_cross => false.
-by_syn_refl => true.
+a = 0.
+b = 0.
+by_evl_cross = true.
+by_evl_refl = true.
+by_is_0a = true.
+by_syn_cross = false.
+by_syn_refl = true.
 

diff --git a/examples/expected/fib-limit.py.out b/examples/expected/fib-limit.py.out
index dddc39ec8be0fd7f24981060113fffc93eb886d6..436d23a929fac41b8dbca95cfc2a99f5f1a8debe 100644 (file)
--- a/examples/expected/fib-limit.py.out
+++ b/examples/expected/fib-limit.py.out
@@ -1,17 +1,17 @@
 
 Solution
 ========
-lim => 10.
+lim = 10.
 
 f/1
 ===
-f(1) => 1.
-f(2) => 1.
-f(3) => 2.
-f(4) => 3.
-f(5) => 5.
-f(6) => 8.
-f(7) => 13.
-f(8) => 21.
-f(9) => 34.
+f(1) = 1.
+f(2) = 1.
+f(3) = 2.
+f(4) = 3.
+f(5) = 5.
+f(6) = 8.
+f(7) = 13.
+f(8) = 21.
+f(9) = 34.
 

diff --git a/examples/expected/geom.py.out b/examples/expected/geom.py.out
index d8c8ed242e00e56deead550d88cfbe1815d477db..530c0eec7d42f8d7d758d9aad69a99d57bf8810a 100644 (file)
--- a/examples/expected/geom.py.out
+++ b/examples/expected/geom.py.out
@@ -1,5 +1,5 @@
 
 Solution
 ========
-a => 2.0.
+a = 2.0.
 

diff --git a/examples/expected/lists.py.out b/examples/expected/lists.py.out
index e5a61686dc434ad09a672de86fa02cb4e5c0ee80..a11297dd47af3a5801956862aa1434c611b6422e 100644 (file)
--- a/examples/expected/lists.py.out
+++ b/examples/expected/lists.py.out
@@ -1,13 +1,13 @@
 
 Solution
 ========
-a => [1, 2].
+a = [1, 2].
 
 f/1
 ===
-f([1, 2]) => true.
+f([1, 2]) = true.
 
 goal/1
 ======
-goal([2]) => true.
+goal([2]) = true.
 

diff --git a/examples/expected/matrixops.py.out b/examples/expected/matrixops.py.out
index 5060a88c8223f23a8d749f2f64c110e5eb7071b4..83e757e3ebf1545be10ab15ca7fc1212f57a2535 100644 (file)
--- a/examples/expected/matrixops.py.out
+++ b/examples/expected/matrixops.py.out
@@ -4,51 +4,51 @@ Solution
 
 cols/1
 ======
-cols(a) => 2.
-cols(b) => 3.
-cols(c) => 3.
+cols(a) = 2.
+cols(b) = 3.
+cols(c) = 3.
 
 m/3
 ===
-m(a,1,1) => 1.
-m(a,1,2) => 0.
-m(a,2,1) => 0.
-m(a,2,2) => 1.
-m(b,1,1) => 3.
-m(b,1,2) => 0.
-m(b,1,3) => 1.
-m(b,2,1) => 0.
-m(b,2,2) => 2.
-m(b,2,3) => 0.
-m(c,1,1) => 3.
-m(c,1,2) => 0.
-m(c,1,3) => 1.
-m(c,2,1) => 0.
-m(c,2,2) => 2.
-m(c,2,3) => 0.
+m(a,1,1) = 1.
+m(a,1,2) = 0.
+m(a,2,1) = 0.
+m(a,2,2) = 1.
+m(b,1,1) = 3.
+m(b,1,2) = 0.
+m(b,1,3) = 1.
+m(b,2,1) = 0.
+m(b,2,2) = 2.
+m(b,2,3) = 0.
+m(c,1,1) = 3.
+m(c,1,2) = 0.
+m(c,1,3) = 1.
+m(c,2,1) = 0.
+m(c,2,2) = 2.
+m(c,2,3) = 0.
 
 product/2
 =========
-product(a,b) => c.
+product(a,b) = c.
 
 rows/1
 ======
-rows(a) => 2.
-rows(b) => 2.
-rows(c) => 2.
+rows(a) = 2.
+rows(b) = 2.
+rows(c) = 2.
 
 shape/3
 =======
-shape(a,2,2) => true.
-shape(b,2,3) => true.
-shape(c,2,3) => true.
+shape(a,2,2) = true.
+shape(b,2,3) = true.
+shape(c,2,3) = true.
 
 times/4
 =======
-times(a,b,1,1) => 3.
-times(a,b,1,2) => 0.
-times(a,b,1,3) => 1.
-times(a,b,2,1) => 0.
-times(a,b,2,2) => 2.
-times(a,b,2,3) => 0.
+times(a,b,1,1) = 3.
+times(a,b,1,2) = 0.
+times(a,b,1,3) = 1.
+times(a,b,2,1) = 0.
+times(a,b,2,2) = 2.
+times(a,b,2,3) = 0.
 

diff --git a/examples/expected/papa2.py.out b/examples/expected/papa2.py.out
index 6a6f3ce4dd3c39a45f356a5b5a89045a9d05ddc3..2578b6bee05cddc3146d0baa27d05ccf2b00da70 100644 (file)
--- a/examples/expected/papa2.py.out
+++ b/examples/expected/papa2.py.out
@@ -1,74 +1,74 @@
 
 Solution
 ========
-best => pair(1,t("S",t("S",t("NP","Papa"),t("VP",t("VP",t("V","ate"),t("NP",t("Det","the"),t("N","caviar"))),t("PP",t("P","with"),t("NP",t("Det","a"),t("N","spoon"))))),".")).
-bestParse => t("S",t("S",t("NP","Papa"),t("VP",t("VP",t("V","ate"),t("NP",t("Det","the"),t("N","caviar"))),t("PP",t("P","with"),t("NP",t("Det","a"),t("N","spoon"))))),".").
-bestScore => 1.
-length => 8.
+best = pair(1,t("S",t("S",t("NP","Papa"),t("VP",t("VP",t("V","ate"),t("NP",t("Det","the"),t("N","caviar"))),t("PP",t("P","with"),t("NP",t("Det","a"),t("N","spoon"))))),".")).
+bestParse = t("S",t("S",t("NP","Papa"),t("VP",t("VP",t("V","ate"),t("NP",t("Det","the"),t("N","caviar"))),t("PP",t("P","with"),t("NP",t("Det","a"),t("N","spoon"))))),".").
+bestScore = 1.
+length = 8.
 
 goal/1
 ======
-goal(t("S",t("S",t("NP","Papa"),t("VP",t("V","ate"),t("NP",t("NP",t("Det","the"),t("N","caviar")),t("PP",t("P","with"),t("NP",t("Det","a"),t("N","spoon")))))),".")) => 1.
-goal(t("S",t("S",t("NP","Papa"),t("VP",t("VP",t("V","ate"),t("NP",t("Det","the"),t("N","caviar"))),t("PP",t("P","with"),t("NP",t("Det","a"),t("N","spoon"))))),".")) => 1.
+goal(t("S",t("S",t("NP","Papa"),t("VP",t("V","ate"),t("NP",t("NP",t("Det","the"),t("N","caviar")),t("PP",t("P","with"),t("NP",t("Det","a"),t("N","spoon")))))),".")) = 1.
+goal(t("S",t("S",t("NP","Papa"),t("VP",t("VP",t("V","ate"),t("NP",t("Det","the"),t("N","caviar"))),t("PP",t("P","with"),t("NP",t("Det","a"),t("N","spoon"))))),".")) = 1.
 
 phrase/4
 ========
-phrase(".",7,8,".")                      => 1.
-phrase("Det",2,3,t("Det","the"))         => 1.
-phrase("Det",5,6,t("Det","a"))           => 1.
-phrase("N",3,4,t("N","caviar"))          => 1.
-phrase("N",6,7,t("N","spoon"))           => 1.
-phrase("NP",0,1,t("NP","Papa"))          => 1.
-phrase("NP",2,4,t("NP",t("Det","the"),t("N","caviar"))) => 1.
-phrase("NP",2,7,t("NP",t("NP",t("Det","the"),t("N","caviar")),t("PP",t("P","with"),t("NP",t("Det","a"),t("N","spoon"))))) => 1.
-phrase("NP",5,7,t("NP",t("Det","a"),t("N","spoon"))) => 1.
-phrase("P",4,5,t("P","with"))            => 1.
-phrase("PP",4,7,t("PP",t("P","with"),t("NP",t("Det","a"),t("N","spoon")))) => 1.
-phrase("Papa",0,1,"Papa")                => 1.
-phrase("S",0,4,t("S",t("NP","Papa"),t("VP",t("V","ate"),t("NP",t("Det","the"),t("N","caviar"))))) => 1.
-phrase("S",0,7,t("S",t("NP","Papa"),t("VP",t("V","ate"),t("NP",t("NP",t("Det","the"),t("N","caviar")),t("PP",t("P","with"),t("NP",t("Det","a"),t("N","spoon"))))))) => 1.
-phrase("S",0,7,t("S",t("NP","Papa"),t("VP",t("VP",t("V","ate"),t("NP",t("Det","the"),t("N","caviar"))),t("PP",t("P","with"),t("NP",t("Det","a"),t("N","spoon")))))) => 1.
-phrase("S",0,8,t("S",t("S",t("NP","Papa"),t("VP",t("V","ate"),t("NP",t("NP",t("Det","the"),t("N","caviar")),t("PP",t("P","with"),t("NP",t("Det","a"),t("N","spoon")))))),".")) => 1.
-phrase("S",0,8,t("S",t("S",t("NP","Papa"),t("VP",t("VP",t("V","ate"),t("NP",t("Det","the"),t("N","caviar"))),t("PP",t("P","with"),t("NP",t("Det","a"),t("N","spoon"))))),".")) => 1.
-phrase("V",1,2,t("V","ate"))             => 1.
-phrase("VP",1,4,t("VP",t("V","ate"),t("NP",t("Det","the"),t("N","caviar")))) => 1.
-phrase("VP",1,7,t("VP",t("V","ate"),t("NP",t("NP",t("Det","the"),t("N","caviar")),t("PP",t("P","with"),t("NP",t("Det","a"),t("N","spoon")))))) => 1.
-phrase("VP",1,7,t("VP",t("VP",t("V","ate"),t("NP",t("Det","the"),t("N","caviar"))),t("PP",t("P","with"),t("NP",t("Det","a"),t("N","spoon"))))) => 1.
-phrase("a",5,6,"a")                      => 1.
-phrase("ate",1,2,"ate")                  => 1.
-phrase("caviar",3,4,"caviar")            => 1.
-phrase("spoon",6,7,"spoon")              => 1.
-phrase("the",2,3,"the")                  => 1.
-phrase("with",4,5,"with")                => 1.
+phrase(".",7,8,".")                      = 1.
+phrase("Det",2,3,t("Det","the"))         = 1.
+phrase("Det",5,6,t("Det","a"))           = 1.
+phrase("N",3,4,t("N","caviar"))          = 1.
+phrase("N",6,7,t("N","spoon"))           = 1.
+phrase("NP",0,1,t("NP","Papa"))          = 1.
+phrase("NP",2,4,t("NP",t("Det","the"),t("N","caviar"))) = 1.
+phrase("NP",2,7,t("NP",t("NP",t("Det","the"),t("N","caviar")),t("PP",t("P","with"),t("NP",t("Det","a"),t("N","spoon"))))) = 1.
+phrase("NP",5,7,t("NP",t("Det","a"),t("N","spoon"))) = 1.
+phrase("P",4,5,t("P","with"))            = 1.
+phrase("PP",4,7,t("PP",t("P","with"),t("NP",t("Det","a"),t("N","spoon")))) = 1.
+phrase("Papa",0,1,"Papa")                = 1.
+phrase("S",0,4,t("S",t("NP","Papa"),t("VP",t("V","ate"),t("NP",t("Det","the"),t("N","caviar"))))) = 1.
+phrase("S",0,7,t("S",t("NP","Papa"),t("VP",t("V","ate"),t("NP",t("NP",t("Det","the"),t("N","caviar")),t("PP",t("P","with"),t("NP",t("Det","a"),t("N","spoon"))))))) = 1.
+phrase("S",0,7,t("S",t("NP","Papa"),t("VP",t("VP",t("V","ate"),t("NP",t("Det","the"),t("N","caviar"))),t("PP",t("P","with"),t("NP",t("Det","a"),t("N","spoon")))))) = 1.
+phrase("S",0,8,t("S",t("S",t("NP","Papa"),t("VP",t("V","ate"),t("NP",t("NP",t("Det","the"),t("N","caviar")),t("PP",t("P","with"),t("NP",t("Det","a"),t("N","spoon")))))),".")) = 1.
+phrase("S",0,8,t("S",t("S",t("NP","Papa"),t("VP",t("VP",t("V","ate"),t("NP",t("Det","the"),t("N","caviar"))),t("PP",t("P","with"),t("NP",t("Det","a"),t("N","spoon"))))),".")) = 1.
+phrase("V",1,2,t("V","ate"))             = 1.
+phrase("VP",1,4,t("VP",t("V","ate"),t("NP",t("Det","the"),t("N","caviar")))) = 1.
+phrase("VP",1,7,t("VP",t("V","ate"),t("NP",t("NP",t("Det","the"),t("N","caviar")),t("PP",t("P","with"),t("NP",t("Det","a"),t("N","spoon")))))) = 1.
+phrase("VP",1,7,t("VP",t("VP",t("V","ate"),t("NP",t("Det","the"),t("N","caviar"))),t("PP",t("P","with"),t("NP",t("Det","a"),t("N","spoon"))))) = 1.
+phrase("a",5,6,"a")                      = 1.
+phrase("ate",1,2,"ate")                  = 1.
+phrase("caviar",3,4,"caviar")            = 1.
+phrase("spoon",6,7,"spoon")              = 1.
+phrase("the",2,3,"the")                  = 1.
+phrase("with",4,5,"with")                = 1.
 
 rewrite/2
 =========
-rewrite("Det","a")    => 1.
-rewrite("Det","the")  => 1.
-rewrite("N","caviar") => 1.
-rewrite("N","spoon")  => 1.
-rewrite("NP","Papa")  => 1.
-rewrite("P","with")   => 1.
-rewrite("V","ate")    => 1.
+rewrite("Det","a")    = 1.
+rewrite("Det","the")  = 1.
+rewrite("N","caviar") = 1.
+rewrite("N","spoon")  = 1.
+rewrite("NP","Papa")  = 1.
+rewrite("P","with")   = 1.
+rewrite("V","ate")    = 1.
 
 rewrite/3
 =========
-rewrite("NP","Det","N") => 1.
-rewrite("NP","NP","PP") => 1.
-rewrite("PP","P","NP")  => 1.
-rewrite("S","NP","VP")  => 1.
-rewrite("S","S",".")    => 1.
-rewrite("VP","V","NP")  => 1.
-rewrite("VP","VP","PP") => 1.
+rewrite("NP","Det","N") = 1.
+rewrite("NP","NP","PP") = 1.
+rewrite("PP","P","NP")  = 1.
+rewrite("S","NP","VP")  = 1.
+rewrite("S","S",".")    = 1.
+rewrite("VP","V","NP")  = 1.
+rewrite("VP","VP","PP") = 1.
 
 word/2
 ======
-word(".",7)      => true.
-word("Papa",0)   => true.
-word("a",5)      => true.
-word("ate",1)    => true.
-word("caviar",3) => true.
-word("spoon",6)  => true.
-word("the",2)    => true.
-word("with",4)   => true.
+word(".",7)      = true.
+word("Papa",0)   = true.
+word("a",5)      = true.
+word("ate",1)    = true.
+word("caviar",3) = true.
+word("spoon",6)  = true.
+word("the",2)    = true.
+word("with",4)   = true.
 

diff --git a/examples/expected/simple.py.out b/examples/expected/simple.py.out
index f1139b559ea957f0ee51e4a417b99a59bc7d0ce5..42175936c240404fed02dce3c519a00be9c8b396 100644 (file)
--- a/examples/expected/simple.py.out
+++ b/examples/expected/simple.py.out
@@ -1,7 +1,7 @@
 
 Solution
 ========
-a => true.
-b => true.
-c => true.
+a = true.
+b = true.
+c = true.
 

diff --git a/test/repl/aggregator-conflict.expect b/test/repl/aggregator-conflict.expect
index 6b34765b21e3e818856646c03eb5560fe5d90869..cebfc6e95c4390251d6270ab23c6cf4a62435d44 100644 (file)
--- a/test/repl/aggregator-conflict.expect
+++ b/test/repl/aggregator-conflict.expect
@@ -1,12 +1,12 @@
 > > =============
-a => 1.
+a = 1.
 > DynaCompilerError:
 Encountered error in input program:
- Conflicting aggregators; rule 
+ Conflicting aggregators; rule <repl>
  uses '|=' for a/0 but I had been lead to expect '+='.
 Everything was syntactically valid, but we could not
 see it through.
 
-> new rule(s) were not added to program.
+new rule(s) were not added to program.
 
 > exit

diff --git a/test/repl/late-aggregator-assignment.expect b/test/repl/late-aggregator-assignment.expect
index 9f9f921359ac9eb113cb0701ef974ebfc872635b..7f69603dc5662d198220d9e74749ff59a5550a6c 100644 (file)
--- a/test/repl/late-aggregator-assignment.expect
+++ b/test/repl/late-aggregator-assignment.expect
@@ -4,7 +4,7 @@ Rules
   0: a += b * c.
 
 > =============
-b => 2.
+b = 2.
 > 
 Rules
 =====
@@ -12,8 +12,8 @@ Rules
   1: b := 2.
 
 > =============
-a => 6.
-c => 3.
+a = 6.
+c = 3.
 > 
 Rules
 =====

diff --git a/test/repl/retract-rule.expect b/test/repl/retract-rule.expect
index ac656c6046c33bd8d54415ccca58271ae7ae1adc..abb16d119f4924ec0beb5d85ccdc3d39e7f156c7 100644 (file)
--- a/test/repl/retract-rule.expect
+++ b/test/repl/retract-rule.expect
@@ -1,9 +1,9 @@
 > > =============
-a => 1.
+a = 1.
 > =============
-b => 1.
+b = 1.
 > =============
-a => 2.
+a = 2.
 > 
 Rules
 =====
@@ -14,12 +14,12 @@ Rules
 > 
 Solution
 ========
-a => 2.
-b => 1.
+a = 2.
+b = 1.
 
 > > > 
 Solution
 ========
-a => 1.
+a = 1.
 
 > exit