Emit type signature for ReduceElem and ReduceIfElem

Author: Alexey Romanov

test-out/epfl/test7-fusion2.check

@@ -28,8 +28,8 @@ super.focusExactScopeFat with result changed from List(Sym(28)) to List(Sym(53))
 *******************************************/
 class Test extends ((Unit)=>(Unit)) {
 def apply(x0:Unit): Unit = {
-var x45 = 0
-var x46 = 0
+var x45: Double = 0
+var x46: Double = 0
 for (x1 <- 0 until 100) {
 val x29 = 2.0*x1
 val x31 = 1.0+x29

test-out/epfl/test7-fusion22.check

@@ -35,8 +35,8 @@ def apply(x0:Unit): Unit = {
 val x37 = 1.0+2.0
 var x3 = new Array[Double](50)
 var x7 = new Array[Double](50)
-var x11 = 0
-var x38 = 0
+var x11: Double = 0
+var x38: Double = 0
 for (x2 <- 0 until 50) {
 x3(x2) = 1.0
 x7(x2) = 2.0

test-out/epfl/test7-fusion23.check

@@ -37,8 +37,8 @@ for (x1 <- 0 until 100) {
 val x43 = 1.0+2.0
 var x3 = new Array[Double](x1)
 var x29 = new Array[Double](x1)
-var x32 = 0
-var x44 = 0
+var x32: Double = 0
+var x44: Double = 0
 for (x2 <- 0 until x1) {
 x3(x2) = 1.0
 x29(x2) = 2.0

test-out/epfl/test7-fusion3.check

@@ -14,7 +14,7 @@ val x5 = x4 > 50
 if (x5) x6 += x4
 }
 val x7 = x6.length
-var x10 = 0
+var x10: Int = 0
 for (x8 <- 0 until x7) {
 val x9 = x6.apply(x8)
 x10 += x9

test-out/epfl/test7-fusion4.check

@@ -19,7 +19,7 @@ super.focusExactScopeFat with result changed from List(Sym(12)) to List(Sym(25))
 *******************************************/
 class Test extends ((Unit)=>(Unit)) {
 def apply(x0:Unit): Unit = {
-var x23 = 0
+var x23: Int = 0
 for (x1 <- 0 until 100) {
 val x13 = x1 > 50
 if (x13) x23 += x1

test-src/epfl/test7-analysis/Arrays.scala

@@ -154,11 +154,11 @@ trait ScalaGenArrayLoopsFat extends ScalaGenArrayLoops with ScalaGenLoopsFat {
           case ArrayElem(y) =>
             stream.println("var " + quote(l) + " = new Array[" + getBlockResult(y).tp + "]("+quote(s)+")")
           case ReduceElem(y) =>
-            stream.println("var " + quote(l) + " = 0")
+            stream.println("var " + quote(l) + ": " + getBlockResult(y).tp + " = 0")
           case ArrayIfElem(c,y) =>
             stream.println("var " + quote(l) + " = new ArrayBuilder[" + getBlockResult(y).tp + "]")
           case ReduceIfElem(c,y) =>
-            stream.println("var " + quote(l) + " = 0")
+            stream.println("var " + quote(l) + ": " + getBlockResult(y).tp + " = 0")
           case FlattenElem(y) =>
             stream.println("var " + quote(l) + " = new ArrayBuilder[" + getBlockResult(y).tp + "]")
         }