From 940e7dec2c267a7c02e6a85d32c01a90efc39dbe Mon Sep 17 00:00:00 2001
From: Nicolas Voirol <voirol.nicolas@gmail.com>
Date: Fri, 28 Oct 2016 15:50:09 +0200
Subject: [PATCH] Fixed FiniteMap ast change in tests
---
src/test/scala/inox/ast/ExtractorsSuite.scala | 3 +-
.../inox/evaluators/EvaluatorSuite.scala | 34 +++++++++----------
2 files changed, 19 insertions(+), 18 deletions(-)
diff --git a/src/test/scala/inox/ast/ExtractorsSuite.scala b/src/test/scala/inox/ast/ExtractorsSuite.scala
index 614c334ab..7ed1de07d 100644
--- a/src/test/scala/inox/ast/ExtractorsSuite.scala
+++ b/src/test/scala/inox/ast/ExtractorsSuite.scala
@@ -51,7 +51,8 @@ class ExtractorsSuite extends FunSuite {
val a1 = FiniteMap(
Seq(IntLiteral(0) -> x, IntLiteral(3) -> y, IntLiteral(5) -> z),
IntegerLiteral(10),
- Int32Type)
+ Int32Type,
+ IntegerType)
val a2 = a1 match {
case Operator(es, builder) => {
assert(es === Seq(IntLiteral(0), x, IntLiteral(3), y, IntLiteral(5), z, IntegerLiteral(10)))
diff --git a/src/test/scala/inox/evaluators/EvaluatorSuite.scala b/src/test/scala/inox/evaluators/EvaluatorSuite.scala
index 66ed0ef04..c33a408b7 100644
--- a/src/test/scala/inox/evaluators/EvaluatorSuite.scala
+++ b/src/test/scala/inox/evaluators/EvaluatorSuite.scala
@@ -204,43 +204,43 @@ class EvaluatorSuite extends FunSuite {
val e = evaluator(ctx)
eval(e, Equals(
- FiniteMap(Seq.empty, IntLiteral(12), Int32Type),
- FiniteMap(Seq.empty, IntLiteral(12), Int32Type))
+ FiniteMap(Seq.empty, IntLiteral(12), Int32Type, Int32Type),
+ FiniteMap(Seq.empty, IntLiteral(12), Int32Type, Int32Type))
) === BooleanLiteral(true)
eval(e, Equals(
- FiniteMap(Seq.empty, IntLiteral(9), Int32Type),
- FiniteMap(Seq.empty, IntLiteral(12), Int32Type))
+ FiniteMap(Seq.empty, IntLiteral(9), Int32Type, Int32Type),
+ FiniteMap(Seq.empty, IntLiteral(12), Int32Type, Int32Type))
) === BooleanLiteral(false)
eval(e, Equals(
- FiniteMap(Seq(IntLiteral(1) -> IntLiteral(2), IntLiteral(2) -> IntLiteral(3)), IntLiteral(9), Int32Type),
- FiniteMap(Seq(IntLiteral(2) -> IntLiteral(3), IntLiteral(1) -> IntLiteral(2)), IntLiteral(9), Int32Type))
+ FiniteMap(Seq(IntLiteral(1) -> IntLiteral(2), IntLiteral(2) -> IntLiteral(3)), IntLiteral(9), Int32Type, Int32Type),
+ FiniteMap(Seq(IntLiteral(2) -> IntLiteral(3), IntLiteral(1) -> IntLiteral(2)), IntLiteral(9), Int32Type, Int32Type))
) === BooleanLiteral(true)
eval(e, Equals(
- FiniteMap(Seq(IntLiteral(1) -> IntLiteral(2), IntLiteral(1) -> IntLiteral(3)), IntLiteral(9), Int32Type),
- FiniteMap(Seq(IntLiteral(1) -> IntLiteral(3), IntLiteral(1) -> IntLiteral(2)), IntLiteral(9), Int32Type))
+ FiniteMap(Seq(IntLiteral(1) -> IntLiteral(2), IntLiteral(1) -> IntLiteral(3)), IntLiteral(9), Int32Type, Int32Type),
+ FiniteMap(Seq(IntLiteral(1) -> IntLiteral(3), IntLiteral(1) -> IntLiteral(2)), IntLiteral(9), Int32Type, Int32Type))
) === BooleanLiteral(false)
eval(e, Equals(
- FiniteMap(Seq(IntLiteral(1) -> IntLiteral(2), IntLiteral(1) -> IntLiteral(3)), IntLiteral(9), Int32Type),
- FiniteMap(Seq(IntLiteral(1) -> IntLiteral(3)), IntLiteral(9), Int32Type))
+ FiniteMap(Seq(IntLiteral(1) -> IntLiteral(2), IntLiteral(1) -> IntLiteral(3)), IntLiteral(9), Int32Type, Int32Type),
+ FiniteMap(Seq(IntLiteral(1) -> IntLiteral(3)), IntLiteral(9), Int32Type, Int32Type))
) === BooleanLiteral(true)
eval(e, MapApply(
- FiniteMap(Seq(IntLiteral(1) -> IntLiteral(2), IntLiteral(2) -> IntLiteral(4)), IntLiteral(6), Int32Type),
+ FiniteMap(Seq(IntLiteral(1) -> IntLiteral(2), IntLiteral(2) -> IntLiteral(4)), IntLiteral(6), Int32Type, Int32Type),
IntLiteral(1))
) === IntLiteral(2)
eval(e, MapApply(
- FiniteMap(Seq(IntLiteral(1) -> IntLiteral(2), IntLiteral(2) -> IntLiteral(4)), IntLiteral(6), Int32Type),
+ FiniteMap(Seq(IntLiteral(1) -> IntLiteral(2), IntLiteral(2) -> IntLiteral(4)), IntLiteral(6), Int32Type, Int32Type),
IntLiteral(3))
) === IntLiteral(6)
eval(e, MapApply(
MapUpdated(
- FiniteMap(Seq(IntLiteral(1) -> IntLiteral(2), IntLiteral(2) -> IntLiteral(4)), IntLiteral(6), Int32Type),
+ FiniteMap(Seq(IntLiteral(1) -> IntLiteral(2), IntLiteral(2) -> IntLiteral(4)), IntLiteral(6), Int32Type, Int32Type),
IntLiteral(1), IntLiteral(3)),
IntLiteral(1))
) === IntLiteral(3)
@@ -254,20 +254,20 @@ class EvaluatorSuite extends FunSuite {
val v3 = Variable(FreshIdentifier("v3"), Int32Type)
eval(e, Equals(
- FiniteMap(Seq(v1 -> IntLiteral(2), v2 -> IntLiteral(4)), v3, Int32Type),
- FiniteMap(Seq(IntLiteral(1) -> IntLiteral(2), IntLiteral(2) -> IntLiteral(4)), IntLiteral(6), Int32Type)),
+ FiniteMap(Seq(v1 -> IntLiteral(2), v2 -> IntLiteral(4)), v3, Int32Type, Int32Type),
+ FiniteMap(Seq(IntLiteral(1) -> IntLiteral(2), IntLiteral(2) -> IntLiteral(4)), IntLiteral(6), Int32Type, Int32Type)),
Map(v1.toVal -> IntLiteral(1), v2.toVal -> IntLiteral(2), v3.toVal -> IntLiteral(6))
) === BooleanLiteral(true)
eval(e, MapApply(
- FiniteMap(Seq(IntLiteral(1) -> IntLiteral(2), IntLiteral(2) -> IntLiteral(4)), IntLiteral(6), Int32Type),
+ FiniteMap(Seq(IntLiteral(1) -> IntLiteral(2), IntLiteral(2) -> IntLiteral(4)), IntLiteral(6), Int32Type, Int32Type),
v1),
Map(v1.toVal -> IntLiteral(3))
) === IntLiteral(6)
eval(e, MapApply(
MapUpdated(
- FiniteMap(Seq(IntLiteral(1) -> IntLiteral(2), IntLiteral(2) -> IntLiteral(4)), IntLiteral(6), Int32Type),
+ FiniteMap(Seq(IntLiteral(1) -> IntLiteral(2), IntLiteral(2) -> IntLiteral(4)), IntLiteral(6), Int32Type, Int32Type),
v1, v2), v3),
Map(v1.toVal -> IntLiteral(1), v2.toVal -> IntLiteral(3), v3.toVal -> IntLiteral(1))
) === IntLiteral(3)
--
GitLab