Merge pull request #102 from TiarkRompf/develop-1.0.x

Bring develop up-to-date with 1.0.x branch

Author: TiarkRompf

project/Build.scala

@@ -3,6 +3,7 @@ import java.io.File
 
 object LMSBuild extends Build {
   System.setProperty("showSuppressedErrors", "false")
+  System.setProperty("showTimings", "false")
 
   val virtScala = Option(System.getenv("SCALA_VIRTUALIZED_VERSION")).getOrElse("2.11.2")
 

src/common/ArrayBufferOps.scala

@@ -8,15 +8,18 @@ import scala.lms.internal.GenericNestedCodegen
 import collection.mutable.ArrayBuffer
 import scala.reflect.SourceContext
 
-trait ArrayBufferOps extends Base {
+trait ArrayBufferOps extends Base with StringOps with ArrayOps {
 
   object ArrayBuffer {
-    def apply[A:Manifest](xs: Rep[A]*) = arraybuffer_new(xs)
+    def apply[A:Typ](xs: Rep[A]*) = arraybuffer_new(xs)
   }
 
-  implicit def repToArrayBufferOps[A:Manifest](l: Rep[ArrayBuffer[A]]) = new ArrayBufferOpsCls(l)
+  implicit def arrayBufferTyp[T:Typ]: Typ[ArrayBuffer[T]]
+  implicit def seqTyp[T:Typ]: Typ[Seq[T]] // TODO: remove?
+
+  implicit def repToArrayBufferOps[A:Typ](l: Rep[ArrayBuffer[A]]) = new ArrayBufferOpsCls(l)
 
-  class ArrayBufferOpsCls[A:Manifest](l: Rep[ArrayBuffer[A]]) {
+  class ArrayBufferOpsCls[A:Typ](l: Rep[ArrayBuffer[A]]) {
     def +=(e: Rep[A])(implicit pos: SourceContext) = arraybuffer_append(l,e)
     def mkString(sep: Rep[String] = unit(""))(implicit pos: SourceContext) = arraybuffer_mkstring(l,sep)
     def append(l: Rep[ArrayBuffer[A]], e: Rep[A])(implicit pos: SourceContext) = arraybuffer_append(l,e)
@@ -25,53 +28,58 @@ trait ArrayBufferOps extends Base {
     def toSeq(implicit pos: SourceContext) = arraybuffer_toseq(l)
   }
 
-  def infix_+=[A:Manifest](l: Rep[ArrayBuffer[A]], e: Rep[A])(implicit pos: SourceContext) = arraybuffer_append(l, e)
+  def infix_+=[A:Typ](l: Rep[ArrayBuffer[A]], e: Rep[A])(implicit pos: SourceContext) = arraybuffer_append(l, e)
 
   /* when mixed in with OptiML, one of these infix operations causes an NPE in the scala-virtualized compiler */ //TR: still the case?
   /*
-  def infix_mkString[A:Manifest](l: Rep[ArrayBuffer[A]], sep: Rep[String] = unit(""))(implicit pos: SourceContext) = arraybuffer_mkstring(l, sep)
-  def infix_+=[A:Manifest](l: Rep[ArrayBuffer[A]], e: Rep[A])(implicit pos: SourceContext) = arraybuffer_append(l, e)
-  def infix_append[A:Manifest](l: Rep[ArrayBuffer[A]], e: Rep[A])(implicit pos: SourceContext) = arraybuffer_append(l, e)
-  def infix_toArray[A:Manifest](l: Rep[ArrayBuffer[A]])(implicit pos: SourceContext) = arraybuffer_toarray(l)
-  def infix_toSeq[A:Manifest](l: Rep[ArrayBuffer[A]])(implicit pos: SourceContext) = arraybuffer_toseq(l)
+  def infix_mkString[A:Typ](l: Rep[ArrayBuffer[A]], sep: Rep[String] = unit(""))(implicit pos: SourceContext) = arraybuffer_mkstring(l, sep)
+  def infix_+=[A:Typ](l: Rep[ArrayBuffer[A]], e: Rep[A])(implicit pos: SourceContext) = arraybuffer_append(l, e)
+  def infix_append[A:Typ](l: Rep[ArrayBuffer[A]], e: Rep[A])(implicit pos: SourceContext) = arraybuffer_append(l, e)
+  def infix_toArray[A:Typ](l: Rep[ArrayBuffer[A]])(implicit pos: SourceContext) = arraybuffer_toarray(l)
+  def infix_toSeq[A:Typ](l: Rep[ArrayBuffer[A]])(implicit pos: SourceContext) = arraybuffer_toseq(l)
   */
 
-  def arraybuffer_mkstring[A:Manifest](l: Rep[ArrayBuffer[A]], sep: Rep[String])(implicit pos: SourceContext): Rep[String]
-  def arraybuffer_append[A:Manifest](l: Rep[ArrayBuffer[A]], e: Rep[A])(implicit pos: SourceContext): Rep[Unit]
-  def arraybuffer_new[A:Manifest](xs: Seq[Rep[A]])(implicit pos: SourceContext): Rep[ArrayBuffer[A]]
-  def arraybuffer_clear[A:Manifest](l: Rep[ArrayBuffer[A]]): Rep[Unit]
-  def arraybuffer_toarray[A:Manifest](x: Rep[ArrayBuffer[A]])(implicit pos: SourceContext): Rep[Array[A]]
-  def arraybuffer_toseq[A:Manifest](x: Rep[ArrayBuffer[A]])(implicit pos: SourceContext): Rep[Seq[A]]
+  def arraybuffer_mkstring[A:Typ](l: Rep[ArrayBuffer[A]], sep: Rep[String])(implicit pos: SourceContext): Rep[String]
+  def arraybuffer_append[A:Typ](l: Rep[ArrayBuffer[A]], e: Rep[A])(implicit pos: SourceContext): Rep[Unit]
+  def arraybuffer_new[A:Typ](xs: Seq[Rep[A]])(implicit pos: SourceContext): Rep[ArrayBuffer[A]]
+  def arraybuffer_clear[A:Typ](l: Rep[ArrayBuffer[A]]): Rep[Unit]
+  def arraybuffer_toarray[A:Typ](x: Rep[ArrayBuffer[A]])(implicit pos: SourceContext): Rep[Array[A]]
+  def arraybuffer_toseq[A:Typ](x: Rep[ArrayBuffer[A]])(implicit pos: SourceContext): Rep[Seq[A]]
 }
 
 trait ArrayBufferOpsExp extends ArrayBufferOps with EffectExp {
-  case class ArrayBufferNew[A:Manifest](xs: Seq[Exp[A]]) extends Def[ArrayBuffer[A]]  {
+  implicit def arrayBufferTyp[T:Typ]: Typ[ArrayBuffer[T]] = {
+    implicit val ManifestTyp(m) = typ[T]
+    manifestTyp
+  }
+  
+  case class ArrayBufferNew[A:Typ](xs: Seq[Exp[A]]) extends Def[ArrayBuffer[A]]  {
     val mA = manifest[A]
   }
-  case class ArrayBufferMkString[A:Manifest](l: Exp[ArrayBuffer[A]], sep: Exp[String]) extends Def[String]
-  case class ArrayBufferAppend[A:Manifest](l: Exp[ArrayBuffer[A]], e: Exp[A]) extends Def[Unit]
-  case class ArrayBufferClear[A:Manifest](l: Exp[ArrayBuffer[A]]) extends Def[Unit]
-  case class ArrayBufferToArray[A:Manifest](x: Exp[ArrayBuffer[A]]) extends Def[Array[A]]
-  case class ArrayBufferToSeq[A:Manifest](x: Exp[ArrayBuffer[A]]) extends Def[Seq[A]]
-
-  def arraybuffer_new[A:Manifest](xs: Seq[Exp[A]])(implicit pos: SourceContext) = reflectMutable(ArrayBufferNew(xs))
-  def arraybuffer_mkstring[A:Manifest](l: Exp[ArrayBuffer[A]], sep: Exp[String])(implicit pos: SourceContext) = ArrayBufferMkString(l, sep)
-  def arraybuffer_append[A:Manifest](l: Exp[ArrayBuffer[A]], e: Exp[A])(implicit pos: SourceContext) = reflectWrite(l)(ArrayBufferAppend(l, e))
-  def arraybuffer_clear[A:Manifest](l: Exp[ArrayBuffer[A]]) = reflectWrite(l)(ArrayBufferClear(l))
-  def arraybuffer_toarray[A:Manifest](x: Exp[ArrayBuffer[A]])(implicit pos: SourceContext) = ArrayBufferToArray(x)
-  def arraybuffer_toseq[A:Manifest](x: Exp[ArrayBuffer[A]])(implicit pos: SourceContext) = ArrayBufferToSeq(x)
+  case class ArrayBufferMkString[A:Typ](l: Exp[ArrayBuffer[A]], sep: Exp[String]) extends Def[String]
+  case class ArrayBufferAppend[A:Typ](l: Exp[ArrayBuffer[A]], e: Exp[A]) extends Def[Unit]
+  case class ArrayBufferClear[A:Typ](l: Exp[ArrayBuffer[A]]) extends Def[Unit]
+  case class ArrayBufferToArray[A:Typ](x: Exp[ArrayBuffer[A]]) extends Def[Array[A]]
+  case class ArrayBufferToSeq[A:Typ](x: Exp[ArrayBuffer[A]]) extends Def[Seq[A]]
+
+  def arraybuffer_new[A:Typ](xs: Seq[Exp[A]])(implicit pos: SourceContext) = reflectMutable(ArrayBufferNew(xs))
+  def arraybuffer_mkstring[A:Typ](l: Exp[ArrayBuffer[A]], sep: Exp[String])(implicit pos: SourceContext) = ArrayBufferMkString(l, sep)
+  def arraybuffer_append[A:Typ](l: Exp[ArrayBuffer[A]], e: Exp[A])(implicit pos: SourceContext) = reflectWrite(l)(ArrayBufferAppend(l, e))
+  def arraybuffer_clear[A:Typ](l: Exp[ArrayBuffer[A]]) = reflectWrite(l)(ArrayBufferClear(l))
+  def arraybuffer_toarray[A:Typ](x: Exp[ArrayBuffer[A]])(implicit pos: SourceContext) = ArrayBufferToArray(x)
+  def arraybuffer_toseq[A:Typ](x: Exp[ArrayBuffer[A]])(implicit pos: SourceContext) = ArrayBufferToSeq(x)
 
   //////////////
   // mirroring
 
-  override def mirrorDef[A:Manifest](e: Def[A], f: Transformer)(implicit pos: SourceContext): Def[A] = (e match {
-    case ArrayBufferMkString(l,r) => ArrayBufferMkString(f(l),f(r))
-    case ArrayBufferAppend(l,r) => ArrayBufferAppend(f(l),f(r))
+  override def mirrorDef[A:Typ](e: Def[A], f: Transformer)(implicit pos: SourceContext): Def[A] = (e match {
+    case ArrayBufferMkString(l,r) => ArrayBufferMkString(f(l),f(r))(mtype(manifest[A]))
+    case ArrayBufferAppend(l,r) => ArrayBufferAppend(f(l),f(r))(mtype(manifest[A]))
     case _ => super.mirrorDef(e,f)
   }).asInstanceOf[Def[A]] // why??
 
 /*
-  override def mirror[A:Manifest](e: Def[A], f: Transformer)(implicit pos: SourceContext): Exp[A] = (e match {
+  override def mirror[A:Typ](e: Def[A], f: Transformer)(implicit pos: SourceContext): Exp[A] = (e match {
     case Reflect(ArrayBufferMkString(l,r), u, es) => reflectMirrored(Reflect(ArrayBufferMkString(f(l),f(r)), mapOver(f,u), f(es)))(mtype(manifest[A]))
     case Reflect(ArrayBufferAppend(l,r), u, es) => reflectMirrored(Reflect(ArrayBufferAppend(f(l),f(r)), mapOver(f,u), f(es)))(mtype(manifest[A]))
     case _ => super.mirror(e,f)