Merge pull request #75 from alexeyr/array-fixes

Array fixes

Author: TiarkRompf

src/common/ArrayOps.scala

@@ -192,7 +192,7 @@ trait ScalaGenArrayOps extends BaseGenArrayOps with ScalaGenBase {
   val ARRAY_LITERAL_MAX_SIZE = 1000
 
   override def emitNode(sym: Sym[Any], rhs: Def[Any]) = rhs match {
-    case a@ArrayNew(n) => emitValDef(sym, src"new Array[${a.m}]($n)")
+    case a@ArrayNew(n) => emitValDef(sym, src"new Array[${remap(a.m)}]($n)")
     case e@ArrayFromSeq(xs) => {
       emitData(sym, xs)
       emitValDef(sym,
@@ -224,7 +224,7 @@ trait ScalaGenArrayOps extends BaseGenArrayOps with ScalaGenBase {
     case ArrayCopy(src,srcPos,dest,destPos,len) => emitValDef(sym, src"System.arraycopy($src,$srcPos,$dest,$destPos,$len)")
     case a@ArraySort(x) =>
       gen"""val $sym = {
-           |val d = new Array[${a.m}]($x.length)
+           |val d = new Array[${remap(a.m)}]($x.length)
            |System.arraycopy($x, 0, d, 0, $x.length)
            |scala.util.Sorting.quickSort(d)
            |d

src/common/Structs.scala

@@ -178,6 +178,7 @@ trait StructExp extends StructOps with StructTags with BaseExp with EffectExp wi
     // FIXME: move to codegen? we should be able to have different policies/naming schemes
     case rm: RefinedManifest[_] => "Anon" + math.abs(rm.fields.map(f => f._1.## + f._2.toString.##).sum)
     case _ if (m <:< manifest[AnyVal]) => m.toString
+    case _ if m.erasure.isArray => "ArrayOf" + structName(m.typeArguments.head)
     case _ => m.erasure.getSimpleName + m.typeArguments.map(a => structName(a)).mkString("")
   }
 

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-out/epfl/test9-struct2.check

@@ -25,19 +25,19 @@ x2
 }
 val x16 = x0 > 7
 val x21 = if (x16) {
-val x6 = new Record[]Anon189207751(x4,x5)
+val x6 = new ArrayOfAnon189207751(x4,x5)
 x6
 } else {
 val x17 = x13
 val x18 = x14
-val x19 = new Record[]Anon189207751(x17,x18)
+val x19 = new ArrayOfAnon189207751(x17,x18)
 x19
 }
 x13 = x4
 x14 = x5
 val x24 = x13
 val x25 = x14
-val x26 = new Record[]Anon189207751(x24,x25)
+val x26 = new ArrayOfAnon189207751(x24,x25)
 val x27 = println(x26)
 val x28 = println(x21)
 x28
@@ -47,4 +47,4 @@ x28
   End of Generated Code                  
 *******************************************/
 
-case class Record[]Anon189207751(re: Array[Double], im: Array[Int])
+case class ArrayOfAnon189207751(re: Array[Double], im: Array[Int])

test-out/epfl/test9-struct2b.check

@@ -34,9 +34,9 @@ x13 = x11
 x14 = x10
 val x42 = x13
 val x43 = x14
-val x44 = new Record[]Anon189207751(x42,x43)
+val x44 = new ArrayOfAnon189207751(x42,x43)
 val x45 = println(x44)
-val x46 = new Record[]Anon189207751(x38,x39)
+val x46 = new ArrayOfAnon189207751(x38,x39)
 val x47 = println(x46)
 val x36 = x47
 x36
@@ -46,4 +46,4 @@ x36
   End of Generated Code                  
 *******************************************/
 
-case class Record[]Anon189207751(re: Array[Int], im: Array[Double])
+case class ArrayOfAnon189207751(re: Array[Int], im: Array[Double])

test-out/epfl/test9-struct3.check

@@ -18,7 +18,7 @@ var x4 = new Array[Int](100)
 for (x1 <- 0 until 100) {
 x4(x1) = x1
 }
-val x17 = new Record[]Anon189207751(x4,x4)
+val x17 = new ArrayOfAnon189207751(x4,x4)
 val x18 = println(x17)
 val x15 = x18
 x15
@@ -28,4 +28,4 @@ x15
   End of Generated Code                  
 *******************************************/
 
-case class Record[]Anon189207751(re: Array[Int], im: Array[Int])
+case class ArrayOfAnon189207751(re: Array[Int], im: Array[Int])