From 2337612c8f9703cee5b1822433a707948e80ef71 Mon Sep 17 00:00:00 2001
From: Julien Fischer <jfischer@opturion.com>
Date: Fri, 1 Jul 2016 11:51:30 +1000
Subject: [PATCH] Fix failing tabling tests.

tests/tabling/rotate.exp:
tests/tabling/rotate2.exp:
     Conform to standard library changes.
---
 tests/tabling/rotate.exp  | 16 ++++++++--------
 tests/tabling/rotate2.exp | 16 ++++++++--------
 2 files changed, 16 insertions(+), 16 deletions(-)

diff --git a/tests/tabling/rotate.exp b/tests/tabling/rotate.exp
index a495989c9..f66193502 100644
--- a/tests/tabling/rotate.exp
+++ b/tests/tabling/rotate.exp
@@ -14,9 +14,9 @@ rotations(3, 2, [[1, 0], [2, 0], [3, 0], [4, 0], [5, 0]]) =
 	soln 0: [[3, 0], [4, 0], [5, 0], [1, 0], [2, 0]]
 	soln 1: [[4, 0], [5, 0], [1, 0], [2, 0], [3, 0]]
 
-rotations(3, 2, [[1], [1, 2], [1, 2, 3], [1, 2, 3, 4]]) =
-	soln 0: [[1, 2, 3], [1, 2, 3, 4], [1], [1, 2]]
-	soln 1: [[1, 2, 3, 4], [1], [1, 2], [1, 2, 3]]
+rotations(3, 2, [sol([1]), sol([1, 2]), sol([1, 2, 3]), sol([1, 2, 3, 4])]) =
+	soln 0: [sol([1, 2, 3]), sol([1, 2, 3, 4]), sol([1]), sol([1, 2])]
+	soln 1: [sol([1, 2, 3, 4]), sol([1]), sol([1, 2]), sol([1, 2, 3])]
 
 rotations(3, 1, [10, 20, 30, 40, 50]) =
 	soln 0: [40, 50, 10, 20, 30]
@@ -30,8 +30,8 @@ rotations(3, 1, ["ten", "twenty", "thirty", "forty", "fifty"]) =
 rotations(3, 1, [[1, 0], [2, 0], [3, 0], [4, 0], [5, 0]]) =
 	soln 0: [[4, 0], [5, 0], [1, 0], [2, 0], [3, 0]]
 
-rotations(3, 1, [[1], [1, 2], [1, 2, 3], [1, 2, 3, 4]]) =
-	soln 0: [[1, 2, 3, 4], [1], [1, 2], [1, 2, 3]]
+rotations(3, 1, [sol([1]), sol([1, 2]), sol([1, 2, 3]), sol([1, 2, 3, 4])]) =
+	soln 0: [sol([1, 2, 3, 4]), sol([1]), sol([1, 2]), sol([1, 2, 3])]
 
 rotations(2, 1, [10, 20, 30, 40, 50]) =
 	soln 0: [30, 40, 50, 10, 20]
@@ -45,8 +45,8 @@ rotations(2, 1, ["ten", "twenty", "thirty", "forty", "fifty"]) =
 rotations(2, 1, [[1, 0], [2, 0], [3, 0], [4, 0], [5, 0]]) =
 	soln 0: [[3, 0], [4, 0], [5, 0], [1, 0], [2, 0]]
 
-rotations(2, 1, [[1], [1, 2], [1, 2, 3], [1, 2, 3, 4]]) =
-	soln 0: [[1, 2, 3], [1, 2, 3, 4], [1], [1, 2]]
+rotations(2, 1, [sol([1]), sol([1, 2]), sol([1, 2, 3]), sol([1, 2, 3, 4])]) =
+	soln 0: [sol([1, 2, 3]), sol([1, 2, 3, 4]), sol([1]), sol([1, 2])]
 
 rotations(2, 0, [10, 20, 30, 40, 50]) =
 
@@ -56,5 +56,5 @@ rotations(2, 0, ["ten", "twenty", "thirty", "forty", "fifty"]) =
 
 rotations(2, 0, [[1, 0], [2, 0], [3, 0], [4, 0], [5, 0]]) =
 
-rotations(2, 0, [[1], [1, 2], [1, 2, 3], [1, 2, 3, 4]]) =
+rotations(2, 0, [sol([1]), sol([1, 2]), sol([1, 2, 3]), sol([1, 2, 3, 4])]) =
 
diff --git a/tests/tabling/rotate2.exp b/tests/tabling/rotate2.exp
index a495989c9..f66193502 100644
--- a/tests/tabling/rotate2.exp
+++ b/tests/tabling/rotate2.exp
@@ -14,9 +14,9 @@ rotations(3, 2, [[1, 0], [2, 0], [3, 0], [4, 0], [5, 0]]) =
 	soln 0: [[3, 0], [4, 0], [5, 0], [1, 0], [2, 0]]
 	soln 1: [[4, 0], [5, 0], [1, 0], [2, 0], [3, 0]]
 
-rotations(3, 2, [[1], [1, 2], [1, 2, 3], [1, 2, 3, 4]]) =
-	soln 0: [[1, 2, 3], [1, 2, 3, 4], [1], [1, 2]]
-	soln 1: [[1, 2, 3, 4], [1], [1, 2], [1, 2, 3]]
+rotations(3, 2, [sol([1]), sol([1, 2]), sol([1, 2, 3]), sol([1, 2, 3, 4])]) =
+	soln 0: [sol([1, 2, 3]), sol([1, 2, 3, 4]), sol([1]), sol([1, 2])]
+	soln 1: [sol([1, 2, 3, 4]), sol([1]), sol([1, 2]), sol([1, 2, 3])]
 
 rotations(3, 1, [10, 20, 30, 40, 50]) =
 	soln 0: [40, 50, 10, 20, 30]
@@ -30,8 +30,8 @@ rotations(3, 1, ["ten", "twenty", "thirty", "forty", "fifty"]) =
 rotations(3, 1, [[1, 0], [2, 0], [3, 0], [4, 0], [5, 0]]) =
 	soln 0: [[4, 0], [5, 0], [1, 0], [2, 0], [3, 0]]
 
-rotations(3, 1, [[1], [1, 2], [1, 2, 3], [1, 2, 3, 4]]) =
-	soln 0: [[1, 2, 3, 4], [1], [1, 2], [1, 2, 3]]
+rotations(3, 1, [sol([1]), sol([1, 2]), sol([1, 2, 3]), sol([1, 2, 3, 4])]) =
+	soln 0: [sol([1, 2, 3, 4]), sol([1]), sol([1, 2]), sol([1, 2, 3])]
 
 rotations(2, 1, [10, 20, 30, 40, 50]) =
 	soln 0: [30, 40, 50, 10, 20]
@@ -45,8 +45,8 @@ rotations(2, 1, ["ten", "twenty", "thirty", "forty", "fifty"]) =
 rotations(2, 1, [[1, 0], [2, 0], [3, 0], [4, 0], [5, 0]]) =
 	soln 0: [[3, 0], [4, 0], [5, 0], [1, 0], [2, 0]]
 
-rotations(2, 1, [[1], [1, 2], [1, 2, 3], [1, 2, 3, 4]]) =
-	soln 0: [[1, 2, 3], [1, 2, 3, 4], [1], [1, 2]]
+rotations(2, 1, [sol([1]), sol([1, 2]), sol([1, 2, 3]), sol([1, 2, 3, 4])]) =
+	soln 0: [sol([1, 2, 3]), sol([1, 2, 3, 4]), sol([1]), sol([1, 2])]
 
 rotations(2, 0, [10, 20, 30, 40, 50]) =
 
@@ -56,5 +56,5 @@ rotations(2, 0, ["ten", "twenty", "thirty", "forty", "fifty"]) =
 
 rotations(2, 0, [[1, 0], [2, 0], [3, 0], [4, 0], [5, 0]]) =
 
-rotations(2, 0, [[1], [1, 2], [1, 2, 3], [1, 2, 3, 4]]) =
+rotations(2, 0, [sol([1]), sol([1, 2]), sol([1, 2, 3]), sol([1, 2, 3, 4])]) =