From 62be822d8fefba8a54354049420f681965308eb1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Mika=C3=ABl=20Mayer?= <mikael.mayer@epfl.ch> Date: Wed, 23 Mar 2016 11:26:02 +0100 Subject: [PATCH] Reverted bad part of commit ef8fad41021709aadd08ab54751f465b1c9369e3 --- src/main/scala/leon/purescala/DefOps.scala | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/main/scala/leon/purescala/DefOps.scala b/src/main/scala/leon/purescala/DefOps.scala index 1b9d146d1..8d7f626d8 100644 --- a/src/main/scala/leon/purescala/DefOps.scala +++ b/src/main/scala/leon/purescala/DefOps.scala @@ -401,7 +401,7 @@ object DefOps { * @param ciMapF Given a previous case class invocation and its new case class definition, returns the expression to use. * By default it is the case class construction using the new case class definition. * @return the new program with a map from the old case classes to the new case classes, with maps concerning identifiers and function definitions. */ - def replaceCaseClassDefs(p: Program)(cdMapF: CaseClassDef => Option[Option[AbstractClassType] => CaseClassDef], + def replaceCaseClassDefs(p: Program)(cdMapFOriginal: CaseClassDef => Option[Option[AbstractClassType] => CaseClassDef], ciMapF: (CaseClass, CaseClassType) => Option[Expr] = defaultCdMap) : (Program, Map[ClassDef, ClassDef], Map[Identifier, Identifier], Map[FunDef, FunDef]) = { var cdMapFCache = Map[CaseClassDef, Option[Option[AbstractClassType] => CaseClassDef]]() @@ -413,7 +413,7 @@ object DefOps { cd match { case ccd: CaseClassDef => cdMapFCache.getOrElse(ccd, { - val new_cd_potential = cdMapF(ccd) + val new_cd_potential = cdMapFOriginal(ccd) cdMapFCache += ccd -> new_cd_potential new_cd_potential }) -- GitLab