From e4d996012d408d453fc4810b6cd20e378cd1438b Mon Sep 17 00:00:00 2001
From: Philippe Suter <philippe.suter@gmail.com>
Date: Tue, 29 Jun 2010 16:53:07 +0000
Subject: [PATCH]

---
 src/funcheck/CodeExtraction.scala | 2 +-
 src/purescala/Analysis.scala      | 6 ++++++
 2 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/src/funcheck/CodeExtraction.scala b/src/funcheck/CodeExtraction.scala
index 83fa2d608..d0e0fed69 100644
--- a/src/funcheck/CodeExtraction.scala
+++ b/src/funcheck/CodeExtraction.scala
@@ -211,7 +211,7 @@ trait CodeExtraction extends Extractors {
 
       realBody match {
         case ExEnsuredExpression(body2, resSym, contract) => {
-          varSubsts(resSym) = (() => ResultVariable())
+          varSubsts(resSym) = (() => ResultVariable().setType(funDef.returnType))
           val c1 = s2ps(contract)
           // varSubsts.remove(resSym)
           realBody = body2
diff --git a/src/purescala/Analysis.scala b/src/purescala/Analysis.scala
index 2e067cb53..7701dca51 100644
--- a/src/purescala/Analysis.scala
+++ b/src/purescala/Analysis.scala
@@ -93,6 +93,12 @@ class Analysis(val program: Program) {
       }
     }
 
+    def rewritePatternMatching(expr: Expr) : Expr = {
+
+
+      expr
+    }
+
     def replaceInExpr(substs: Map[Expr,Expr], expr: Expr) : Expr = {
         def rec(ex: Expr) : Expr = ex match {
             case _ if (substs.get(ex).isDefined) => substs(ex)
-- 
GitLab