Fixed structName for structures containing arrays

Author: Alexey Romanov

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/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])

test-out/epfl/test9-struct4.check

@@ -34,7 +34,7 @@ x23
 } else {
 x5
 }
-val x27 = new Record[]Anon189207751(x4,x26)
+val x27 = new ArrayOfAnon189207751(x4,x26)
 val x28 = println(x27)
 x28
 }
@@ -43,4 +43,4 @@ x28
   End of Generated Code                  
 *******************************************/
 
-case class Record[]Anon189207751(re: Array[Int], im: Array[Double])
+case class ArrayOfAnon189207751(re: Array[Int], im: Array[Double])