From 0219962e12aefe36ec41ca5c547e8183a8a25fcc Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?R=C3=A9gis=20Blanc?= <regwblanc@gmail.com>
Date: Thu, 26 Apr 2012 20:24:25 +0200
Subject: [PATCH] was setting type to already typed expression
---
.../scala/leon/ImperativeCodeElimination.scala | 14 +++++++-------
src/main/scala/leon/Main.scala | 2 +-
src/main/scala/leon/PassManager.scala | 2 +-
3 files changed, 9 insertions(+), 9 deletions(-)
diff --git a/src/main/scala/leon/ImperativeCodeElimination.scala b/src/main/scala/leon/ImperativeCodeElimination.scala
index 662ed9cc9..eb139f824 100644
--- a/src/main/scala/leon/ImperativeCodeElimination.scala
+++ b/src/main/scala/leon/ImperativeCodeElimination.scala
@@ -15,9 +15,11 @@ object ImperativeCodeElimination extends Pass {
def apply(pgm: Program): Program = {
val allFuns = pgm.definedFunctions
allFuns.foreach(fd => fd.body.map(body => {
+ Logger.debug("Transforming to functional code the following function:\n" + fd, 5, "imperative")
parent = fd
val (res, scope, _) = toFunction(body)
fd.body = Some(scope(res))
+ Logger.debug("Resulting functional code is:\n" + fd, 5, "imperative")
}))
pgm
}
@@ -58,14 +60,12 @@ object ImperativeCodeElimination extends Pass {
val thenVal = if(modifiedVars.isEmpty) tRes else Tuple(tRes +: modifiedVars.map(vId => tFun.get(vId) match {
case Some(newId) => newId.toVariable
case None => vId.toVariable
- }))
- thenVal.setType(iteType)
+ })).setType(iteType)
val elseVal = if(modifiedVars.isEmpty) eRes else Tuple(eRes +: modifiedVars.map(vId => eFun.get(vId) match {
case Some(newId) => newId.toVariable
case None => vId.toVariable
- }))
- elseVal.setType(iteType)
+ })).setType(iteType)
val iteExpr = IfExpr(cRes, replaceNames(cFun, tScope(thenVal)), replaceNames(cFun, eScope(elseVal))).setType(iteType)
@@ -97,14 +97,14 @@ object ImperativeCodeElimination extends Pass {
val matchType = if(modifiedVars.isEmpty) resId.getType else TupleType(resId.getType +: freshIds.map(_.getType))
val csesVals = csesRes.zip(csesFun).map{
- case (cRes, cFun) => (if(modifiedVars.isEmpty) cRes else Tuple(cRes +: modifiedVars.map(vId => cFun.get(vId) match {
+ case (cRes, cFun) => if(modifiedVars.isEmpty) cRes else Tuple(cRes +: modifiedVars.map(vId => cFun.get(vId) match {
case Some(newId) => newId.toVariable
case None => vId.toVariable
- }))).setType(matchType)
+ })).setType(matchType)
}
val newRhs = csesVals.zip(csesScope).map{
- case (cVal, cScope) => replaceNames(scrutFun, cScope(cVal)).setType(matchType)
+ case (cVal, cScope) => replaceNames(scrutFun, cScope(cVal))
}
val matchExpr = MatchExpr(scrutRes, cses.zip(newRhs).map{
case (SimpleCase(pat, _), newRhs) => SimpleCase(pat, newRhs)
diff --git a/src/main/scala/leon/Main.scala b/src/main/scala/leon/Main.scala
index d184f36b7..e9818f16d 100644
--- a/src/main/scala/leon/Main.scala
+++ b/src/main/scala/leon/Main.scala
@@ -31,7 +31,7 @@ object Main {
}
private def defaultAction(program: Program, reporter: Reporter) : Unit = {
- Logger.debug("Default action on program: " + program, 5, "main")
+ Logger.debug("Default action on program: " + program, 3, "main")
val passManager = new PassManager(Seq(EpsilonElimination, ImperativeCodeElimination, UnitElimination, FunctionClosure, FunctionHoisting, Simplificator))
val program2 = passManager.run(program)
val analysis = new Analysis(program2, reporter)
diff --git a/src/main/scala/leon/PassManager.scala b/src/main/scala/leon/PassManager.scala
index 2ab8f44ad..bebd98577 100644
--- a/src/main/scala/leon/PassManager.scala
+++ b/src/main/scala/leon/PassManager.scala
@@ -8,7 +8,7 @@ class PassManager(passes: Seq[Pass]) {
passes.foldLeft(program)((pgm, pass) => {
Logger.debug("Running Pass: " + pass.description, 1, "passman")
val newPgm = pass(pgm)
- Logger.debug("Resulting program: " + newPgm, 5, "passman")
+ Logger.debug("Resulting program: " + newPgm, 3, "passman")
newPgm
})
}
--
GitLab