From 0b3e4535c70ec24e37b71bb1108f06dc872718b9 Mon Sep 17 00:00:00 2001
From: Etienne Kneuss <etienne.kneuss@epfl.ch>
Date: Tue, 16 Sep 2014 15:07:10 +0200
Subject: [PATCH] Rewrite tuples should fix types of errors
---
src/main/scala/leon/purescala/TreeOps.scala | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
diff --git a/src/main/scala/leon/purescala/TreeOps.scala b/src/main/scala/leon/purescala/TreeOps.scala
index 0f629386c..e9e2c66b1 100644
--- a/src/main/scala/leon/purescala/TreeOps.scala
+++ b/src/main/scala/leon/purescala/TreeOps.scala
@@ -1121,7 +1121,8 @@ object TreeOps {
} else {
Seq(c)
}
- case _ => Seq(c)
+ case _ =>
+ Seq(c)
}}
var finalMatch = MatchExpr(scrutinee, List(newCases.head)).setType(e.getType)
@@ -1339,6 +1340,7 @@ object TreeOps {
case Tuple(Seq()) => UnitLiteral()
case Variable(id) if idMap contains id => Variable(idMap(id))
+ case Error(err) => Error(err).setType(mapType(e.getType).getOrElse(e.getType)).copiedFrom(e)
case Tuple(Seq(s)) => pre(s)
case ts @ TupleSelect(t, 1) => t.getType match {
--
GitLab