diff options
-rw-r--r-- | src/compiler/scala/tools/nsc/Interpreter.scala | 3 | ||||
-rw-r--r-- | src/library/scala/Option.scala | 8 | ||||
-rw-r--r-- | src/library/scala/Predef.scala | 65 | ||||
-rw-r--r-- | src/library/scala/runtime/TypeRep.scala | 156 | ||||
-rw-r--r-- | test/files/run/typerep.check | 40 | ||||
-rw-r--r-- | test/files/run/typerep.scala | 101 | ||||
-rwxr-xr-x | test/scalatest | 3 |
7 files changed, 371 insertions, 5 deletions
diff --git a/src/compiler/scala/tools/nsc/Interpreter.scala b/src/compiler/scala/tools/nsc/Interpreter.scala index 10ce4b7c6a..701db42de3 100644 --- a/src/compiler/scala/tools/nsc/Interpreter.scala +++ b/src/compiler/scala/tools/nsc/Interpreter.scala @@ -54,7 +54,8 @@ import nsc.{InterpreterResults=>IR} * properly, because rebinding at the Java level is technically difficult. * </p> * - * @author Moez A. Abdel-Gawad, Lex Spoon + * @author Moez A. Abdel-Gawad + * @author Lex Spoon */ class Interpreter(val settings: Settings, out: PrintWriter) { import symtab.Names diff --git a/src/library/scala/Option.scala b/src/library/scala/Option.scala index 4a72a44511..0f66b16230 100644 --- a/src/library/scala/Option.scala +++ b/src/library/scala/Option.scala @@ -9,7 +9,7 @@ // $Id$ -package scala; +package scala import Predef._ @@ -17,9 +17,11 @@ import Predef._ object Option { /** An implicit conversion that converts an option to an iterable value */ - implicit def option2Iterable[a](xo: Option[a]): Iterable[a] = xo.toList -} + implicit def option2Iterable[A](xo: Option[A]): Iterable[A] = xo.toList + implicit def someRep[A](implicit elemrep: runtime.TypeRep[A]): runtime.TypeRep[Some[A]] = + runtime.TypeRep.SomeRep(elemrep) +} /** This class represents optional values. Instances of <code>Option</code> * are either instances of case class <code>Some</code> or it is case diff --git a/src/library/scala/Predef.scala b/src/library/scala/Predef.scala index 04d388ce17..f42a027baa 100644 --- a/src/library/scala/Predef.scala +++ b/src/library/scala/Predef.scala @@ -321,4 +321,69 @@ object Predef { def currentThread = java.lang.Thread.currentThread() + // runtime types ------------------------------------------------------- + + def getType[A](x: A)(implicit rep: runtime.TypeRep[A]): runtime.TypeRep[A] = rep + + implicit def boolRep: runtime.TypeRep[Boolean] = runtime.TypeRep.BooleanRep + implicit def byteRep: runtime.TypeRep[Byte] = runtime.TypeRep.ByteRep + implicit def charRep: runtime.TypeRep[Char] = runtime.TypeRep.CharRep + implicit def shortRep: runtime.TypeRep[Short] = runtime.TypeRep.ShortRep + implicit def intRep: runtime.TypeRep[Int] = runtime.TypeRep.IntRep + implicit def longRep: runtime.TypeRep[Long] = runtime.TypeRep.LongRep + implicit def floatRep: runtime.TypeRep[Float] = runtime.TypeRep.FloatRep + implicit def doubleRep: runtime.TypeRep[Double] = runtime.TypeRep.DoubleRep + + implicit def unitRep: runtime.TypeRep[Unit] = runtime.TypeRep.UnitRep + implicit def classRep: runtime.TypeRep[Class] = runtime.TypeRep.ClassRep + implicit def stringRep: runtime.TypeRep[String] = runtime.TypeRep.StringRep + //implicit def noneRep: runtime.TypeRep[None.type] = runtime.TypeRep.NoneRep + //implicit def nilRep: runtime.TypeRep[Nil.type] = runtime.TypeRep.NilRep + implicit def anyRep: runtime.TypeRep[Any] = runtime.TypeRep.AnyRep + + implicit def listRep[A](implicit elemrep: runtime.TypeRep[A]): runtime.TypeRep[List[A]] = + runtime.TypeRep.ListRep(elemrep) + + implicit def arrayRep[A](implicit elemrep: runtime.TypeRep[A]): runtime.TypeRep[Array[A]] = + runtime.TypeRep.ArrayRep(elemrep) + + implicit def tuple2Rep[A1, A2](implicit _1: runtime.TypeRep[A1], _2: runtime.TypeRep[A2]): runtime.TypeRep[Tuple2[A1, A2]] = + runtime.TypeRep.Tuple2Rep(_1, _2) + implicit def tuple3Rep[A1, A2, A3](implicit _1: runtime.TypeRep[A1], _2: runtime.TypeRep[A2], _3: runtime.TypeRep[A3]): runtime.TypeRep[Tuple3[A1, A2, A3]] = + runtime.TypeRep.Tuple3Rep(_1, _2, _3) + implicit def tuple4Rep[A1, A2, A3, A4](implicit _1: runtime.TypeRep[A1], _2: runtime.TypeRep[A2], _3: runtime.TypeRep[A3], _4: runtime.TypeRep[A4]): runtime.TypeRep[Tuple4[A1, A2, A3, A4]] = + runtime.TypeRep.Tuple4Rep(_1, _2, _3, _4) + implicit def tuple5Rep[A1, A2, A3, A4, A5](implicit _1: runtime.TypeRep[A1], _2: runtime.TypeRep[A2], _3: runtime.TypeRep[A3], _4: runtime.TypeRep[A4], _5: runtime.TypeRep[A5]): runtime.TypeRep[Tuple5[A1, A2, A3, A4, A5]] = + runtime.TypeRep.Tuple5Rep(_1, _2, _3, _4, _5) + implicit def tuple6Rep[A1, A2, A3, A4, A5, A6](implicit _1: runtime.TypeRep[A1], _2: runtime.TypeRep[A2], _3: runtime.TypeRep[A3], _4: runtime.TypeRep[A4], _5: runtime.TypeRep[A5], _6: runtime.TypeRep[A6]): runtime.TypeRep[Tuple6[A1, A2, A3, A4, A5, A6]] = + runtime.TypeRep.Tuple6Rep(_1, _2, _3, _4, _5, _6) + implicit def tuple7Rep[A1, A2, A3, A4, A5, A6, A7](implicit _1: runtime.TypeRep[A1], _2: runtime.TypeRep[A2], _3: runtime.TypeRep[A3], _4: runtime.TypeRep[A4], _5: runtime.TypeRep[A5], _6: runtime.TypeRep[A6], _7: runtime.TypeRep[A7]): runtime.TypeRep[Tuple7[A1, A2, A3, A4, A5, A6, A7]] = + runtime.TypeRep.Tuple7Rep(_1, _2, _3, _4, _5, _6, _7) + implicit def tuple8Rep[A1, A2, A3, A4, A5, A6, A7, A8](implicit _1: runtime.TypeRep[A1], _2: runtime.TypeRep[A2], _3: runtime.TypeRep[A3], _4: runtime.TypeRep[A4], _5: runtime.TypeRep[A5], _6: runtime.TypeRep[A6], _7: runtime.TypeRep[A7], _8: runtime.TypeRep[A8]): runtime.TypeRep[Tuple8[A1, A2, A3, A4, A5, A6, A7, A8]] = + runtime.TypeRep.Tuple8Rep(_1, _2, _3, _4, _5, _6, _7, _8) + implicit def tuple9Rep[A1, A2, A3, A4, A5, A6, A7, A8, A9](implicit _1: runtime.TypeRep[A1], _2: runtime.TypeRep[A2], _3: runtime.TypeRep[A3], _4: runtime.TypeRep[A4], _5: runtime.TypeRep[A5], _6: runtime.TypeRep[A6], _7: runtime.TypeRep[A7], _8: runtime.TypeRep[A8], _9: runtime.TypeRep[A9]): runtime.TypeRep[Tuple9[A1, A2, A3, A4, A5, A6, A7, A8, A9]] = + runtime.TypeRep.Tuple9Rep(_1, _2, _3, _4, _5, _6, _7, _8, _9) + + implicit def func1Rep[A1, B](implicit a1: runtime.TypeRep[A1], b: runtime.TypeRep[B]): runtime.TypeRep[Function1[A1, B]] = + runtime.TypeRep.Function1Rep(a1, b) + implicit def func2Rep[A1, A2, B](implicit a1: runtime.TypeRep[A1], a2: runtime.TypeRep[A2], b: runtime.TypeRep[B]): runtime.TypeRep[Function2[A1, A2, B]] = + runtime.TypeRep.Function2Rep(a1, a2, b) + implicit def func3Rep[A1, A2, A3, B](implicit a1: runtime.TypeRep[A1], a2: runtime.TypeRep[A2], a3: runtime.TypeRep[A3], b: runtime.TypeRep[B]): runtime.TypeRep[Function3[A1, A2, A3, B]] = + runtime.TypeRep.Function3Rep(a1, a2, a3, b) + implicit def func4Rep[A1, A2, A3, A4, B](implicit a1: runtime.TypeRep[A1], a2: runtime.TypeRep[A2], a3: runtime.TypeRep[A3], a4: runtime.TypeRep[A4], b: runtime.TypeRep[B]): runtime.TypeRep[Function4[A1, A2, A3, A4, B]] = + runtime.TypeRep.Function4Rep(a1, a2, a3, a4, b) + implicit def func5Rep[A1, A2, A3, A4, A5, B](implicit a1: runtime.TypeRep[A1], a2: runtime.TypeRep[A2], a3: runtime.TypeRep[A3], a4: runtime.TypeRep[A4], a5: runtime.TypeRep[A5], b: runtime.TypeRep[B]): runtime.TypeRep[Function5[A1, A2, A3, A4, A5, B]] = + runtime.TypeRep.Function5Rep(a1, a2, a3, a4, a5, b) + implicit def func6Rep[A1, A2, A3, A4, A5, A6, B](implicit a1: runtime.TypeRep[A1], a2: runtime.TypeRep[A2], a3: runtime.TypeRep[A3], a4: runtime.TypeRep[A4], a5: runtime.TypeRep[A5], a6: runtime.TypeRep[A6], b: runtime.TypeRep[B]): runtime.TypeRep[Function6[A1, A2, A3, A4, A5, A6, B]] = + runtime.TypeRep.Function6Rep(a1, a2, a3, a4, a5, a6, b) + implicit def func7Rep[A1, A2, A3, A4, A5, A6, A7, B](implicit a1: runtime.TypeRep[A1], a2: runtime.TypeRep[A2], a3: runtime.TypeRep[A3], a4: runtime.TypeRep[A4], a5: runtime.TypeRep[A5], a6: runtime.TypeRep[A6], a7: runtime.TypeRep[A7], b: runtime.TypeRep[B]): runtime.TypeRep[Function7[A1, A2, A3, A4, A5, A6, A7, B]] = + runtime.TypeRep.Function7Rep(a1, a2, a3, a4, a5, a6, a7, b) + implicit def func8Rep[A1, A2, A3, A4, A5, A6, A7, A8, B](implicit a1: runtime.TypeRep[A1], a2: runtime.TypeRep[A2], a3: runtime.TypeRep[A3], a4: runtime.TypeRep[A4], a5: runtime.TypeRep[A5], a6: runtime.TypeRep[A6], a7: runtime.TypeRep[A7], a8: runtime.TypeRep[A8], b: runtime.TypeRep[B]): runtime.TypeRep[Function8[A1, A2, A3, A4, A5, A6, A7, A8, B]] = + runtime.TypeRep.Function8Rep(a1, a2, a3, a4, a5, a6, a7, a8, b) + implicit def func9Rep[A1, A2, A3, A4, A5, A6, A7, A8, A9, B](implicit a1: runtime.TypeRep[A1], a2: runtime.TypeRep[A2], a3: runtime.TypeRep[A3], a4: runtime.TypeRep[A4], a5: runtime.TypeRep[A5], a6: runtime.TypeRep[A6], a7: runtime.TypeRep[A7], a8: runtime.TypeRep[A8], a9: runtime.TypeRep[A9], b: runtime.TypeRep[B]): runtime.TypeRep[Function9[A1, A2, A3, A4, A5, A6, A7, A8, A9, B]] = + runtime.TypeRep.Function9Rep(a1, a2, a3, a4, a5, a6, a7, a8, a9, b) +/* + implicit def objectRep[A <: AnyRef](obj: A)(implicit rep: runtime.TypeRep[A]): runtime.TypeRep[Class] = + runtime.TypeRep.ObjectRep(obj.getClass) +*/ } diff --git a/src/library/scala/runtime/TypeRep.scala b/src/library/scala/runtime/TypeRep.scala new file mode 100644 index 0000000000..c125050b17 --- /dev/null +++ b/src/library/scala/runtime/TypeRep.scala @@ -0,0 +1,156 @@ +/* __ *\ +** ________ ___ / / ___ Scala API ** +** / __/ __// _ | / / / _ | (c) 2007-2008, LAMP/EPFL ** +** __\ \/ /__/ __ |/ /__/ __ | http://scala-lang.org/ ** +** /____/\___/_/ |_/____/_/ | | ** +** |/ ** +\* */ + +// $Id: $ + + +package scala.runtime + +/** + * @author Stephane Micheloud + * @version 1.0 + */ +abstract class TypeRep[A] + +object TypeRep { + + case object BooleanRep extends TypeRep[Boolean] { + override def toString = "Boolean" + } + case object ByteRep extends TypeRep[Byte] { + override def toString = "Byte" + } + case object CharRep extends TypeRep[Char] { + override def toString = "Char" + } + case object ShortRep extends TypeRep[Short] { + override def toString = "Short" + } + case object IntRep extends TypeRep[Int] { + override def toString = "Int" + } + case object LongRep extends TypeRep[Long] { + override def toString = "Long" + } + case object FloatRep extends TypeRep[Float] { + override def toString = "Float" + } + case object DoubleRep extends TypeRep[Double] { + override def toString = "Double" + } + + case object UnitRep extends TypeRep[Unit] { + override def toString = "Unit" + } + case object ClassRep extends TypeRep[Class] { + override def toString = "Class" + } + case object StringRep extends TypeRep[String] { + override def toString = "String" + } + case object NoneRep extends TypeRep[None.type] { + override def toString = "None" + } + case object NilRep extends TypeRep[Nil.type] { + override def toString = "Nil" + } + case object AnyRep extends TypeRep[Any] { + override def toString = "Any" + } + + @serializable + case class SomeRep[A](elemRep: TypeRep[A]) extends TypeRep[Some[A]] { + override def toString = "Some[" + elemRep + "]" + } + + @serializable + case class ListRep[A](elemRep: TypeRep[A]) extends TypeRep[List[A]] { + override def toString = "List[" + elemRep + "]" + } + + @serializable + case class ArrayRep[A](elemRep: TypeRep[A]) extends TypeRep[Array[A]] { + override def toString = "Array[" + elemRep + "]" + } + + @serializable + case class Tuple2Rep[A1, A2](_1: TypeRep[A1], _2: TypeRep[A2]) extends TypeRep[Tuple2[A1, A2]] { + override def toString = "Tuple2[" + _1 + ", " + _2 + "]" + } + @serializable + case class Tuple3Rep[A1, A2, A3](_1: TypeRep[A1], _2: TypeRep[A2], _3: TypeRep[A3]) extends TypeRep[Tuple3[A1, A2, A3]] { + override def toString = "Tuple3[" + _1 + ", " + _2 + ", " + _3 + "]" + } + @serializable + case class Tuple4Rep[A1, A2, A3, A4](_1: TypeRep[A1], _2: TypeRep[A2], _3: TypeRep[A3], _4: TypeRep[A4]) extends TypeRep[Tuple4[A1, A2, A3, A4]] { + override def toString = "Tuple4[" + _1 + ", " + _2 + ", " + _3 + ", " + _4 + "]" + } + @serializable + case class Tuple5Rep[A1, A2, A3, A4, A5](_1: TypeRep[A1], _2: TypeRep[A2], _3: TypeRep[A3], _4: TypeRep[A4], _5: TypeRep[A5]) extends TypeRep[Tuple5[A1, A2, A3, A4, A5]] { + override def toString = "Tuple5[" + _1 + ", " + _2 + ", " + _3 + ", " + _4 + ", " + _5 + "]" + } + @serializable + case class Tuple6Rep[A1, A2, A3, A4, A5, A6](val _1: TypeRep[A1], val _2: TypeRep[A2], val _3: TypeRep[A3], val _4: TypeRep[A4], val _5: TypeRep[A5], val _6: TypeRep[A6]) extends TypeRep[Tuple6[A1, A2, A3, A4, A5, A6]] { + override def toString = "Tuple6[" + _1 + ", " + _2 + ", " + _3 + ", " + _4 + ", " + _5 + ", " + _6 + "]" + } + @serializable + case class Tuple7Rep[A1, A2, A3, A4, A5, A6, A7](val _1: TypeRep[A1], val _2: TypeRep[A2], val _3: TypeRep[A3], val _4: TypeRep[A4], val _5: TypeRep[A5], val _6: TypeRep[A6], val _7: TypeRep[A7]) extends TypeRep[Tuple7[A1, A2, A3, A4, A5, A6, A7]] { + override def toString = "Tuple7[" + _1 + ", " + _2 + ", " + _3 + ", " + _4 + ", " + _5 + ", " + _6 + ", " + _7 + "]" + } + @serializable + case class Tuple8Rep[A1, A2, A3, A4, A5, A6, A7, A8](val _1: TypeRep[A1], val _2: TypeRep[A2], val _3: TypeRep[A3], val _4: TypeRep[A4], val _5: TypeRep[A5], val _6: TypeRep[A6], val _7: TypeRep[A7], val _8: TypeRep[A8]) extends TypeRep[Tuple8[A1, A2, A3, A4, A5, A6, A7, A8]] { + override def toString = "Tuple8[" + _1 + ", " + _2 + ", " + _3 + ", " + _4 + ", " + _5 + ", " + _6 + ", " + _7 + ", " + _8 + "]" + } + @serializable + case class Tuple9Rep[A1, A2, A3, A4, A5, A6, A7, A8, A9](val _1: TypeRep[A1], val _2: TypeRep[A2], val _3: TypeRep[A3], val _4: TypeRep[A4], val _5: TypeRep[A5], val _6: TypeRep[A6], val _7: TypeRep[A7], val _8: TypeRep[A8], val _9: TypeRep[A9]) extends TypeRep[Tuple9[A1, A2, A3, A4, A5, A6, A7, A8, A9]] { + override def toString = "Tuple9[" + _1 + ", " + _2 + ", " + _3 + ", " + _4 + ", " + _5 + ", " + _6 + ", " + _7 + ", " + _8 + ", " + _9 + "]" + } + + @serializable + case class Function1Rep[A1, B](a1: TypeRep[A1], b: TypeRep[B]) extends TypeRep[Function1[A1, B]] { + override def toString = "Function1[" + a1 + ", " + b + "]" + } + @serializable + case class Function2Rep[A1, A2, B](a1: TypeRep[A1], a2: TypeRep[A2], b: TypeRep[B]) extends TypeRep[Function2[A1, A2, B]] { + override def toString = "Function2[" + a1 + ", " + a2 + ", " + b + "]" + } + @serializable + case class Function3Rep[A1, A2, A3, B](a1: TypeRep[A1], a2: TypeRep[A2], a3: TypeRep[A3], b: TypeRep[B]) extends TypeRep[Function3[A1, A2, A3, B]] { + override def toString = "Function3[" + a1 + ", " + a2 + ", " + a3 + ", " + b + "]" + } + @serializable + case class Function4Rep[A1, A2, A3, A4, B](a1: TypeRep[A1], a2: TypeRep[A2], a3: TypeRep[A3], a4: TypeRep[A4], b: TypeRep[B]) extends TypeRep[Function4[A1, A2, A3, A4, B]] { + override def toString = "Function4[" + a1 + ", " + a2 + ", " + a3 + ", " + a4 + ", " + b + "]" + } + @serializable + case class Function5Rep[A1, A2, A3, A4, A5, B](a1: TypeRep[A1], a2: TypeRep[A2], a3: TypeRep[A3], a4: TypeRep[A4], a5: TypeRep[A5], b: TypeRep[B]) extends TypeRep[Function5[A1, A2, A3, A4, A5, B]] { + override def toString = "Function5[" + a1 + ", " + a2 + ", " + a3 + ", " + a4 + ", " + a5 + ", " + b + "]" + } + @serializable + case class Function6Rep[A1, A2, A3, A4, A5, A6, B](a1: TypeRep[A1], a2: TypeRep[A2], a3: TypeRep[A3], a4: TypeRep[A4], a5: TypeRep[A5], a6: TypeRep[A6], b: TypeRep[B]) extends TypeRep[Function6[A1, A2, A3, A4, A5, A6, B]] { + override def toString = "Function6[" + a1 + ", " + a2 + ", " + a3 + ", " + a4 + ", " + a5 + ", " + a6 + ", " + b + "]" + } + @serializable + case class Function7Rep[A1, A2, A3, A4, A5, A6, A7, B](a1: TypeRep[A1], a2: TypeRep[A2], a3: TypeRep[A3], a4: TypeRep[A4], a5: TypeRep[A5], a6: TypeRep[A6], a7: TypeRep[A7], b: TypeRep[B]) extends TypeRep[Function7[A1, A2, A3, A4, A5, A6, A7, B]] { + override def toString = "Function7[" + a1 + ", " + a2 + ", " + a3 + ", " + a4 + ", " + a5 + ", " + a6 + ", " + a7 + ", " + b + "]" + } + @serializable + case class Function8Rep[A1, A2, A3, A4, A5, A6, A7, A8, B](a1: TypeRep[A1], a2: TypeRep[A2], a3: TypeRep[A3], a4: TypeRep[A4], a5: TypeRep[A5], a6: TypeRep[A6], a7: TypeRep[A7], a8: TypeRep[A8], b: TypeRep[B]) extends TypeRep[Function8[A1, A2, A3, A4, A5, A6, A7, A8, B]] { + override def toString = "Function8[" + a1 + ", " + a2 + ", " + a3 + ", " + a4 + ", " + a5 + ", " + a6 + ", " + a7 + ", " + a8 + b + "]" + } + @serializable + case class Function9Rep[A1, A2, A3, A4, A5, A6, A7, A8, A9, B](a1: TypeRep[A1], a2: TypeRep[A2], a3: TypeRep[A3], a4: TypeRep[A4], a5: TypeRep[A5], a6: TypeRep[A6], a7: TypeRep[A7], a8: TypeRep[A8], a9: TypeRep[A9], b: TypeRep[B]) extends TypeRep[Function9[A1, A2, A3, A4, A5, A6, A7, A8, A9, B]] { + override def toString = "Function9[" + a1 + ", " + a2 + ", " + a3 + ", " + a4 + ", " + a5 + ", " + a6 + ", " + a7 + ", " + a8 + ", " + b + "]" + } +/* + @serializable + case class ObjectRep[A](c: Class) extends TypeRep[A] { + override def toString = c.getName + } +*/ +} diff --git a/test/files/run/typerep.check b/test/files/run/typerep.check new file mode 100644 index 0000000000..d554d335b2 --- /dev/null +++ b/test/files/run/typerep.check @@ -0,0 +1,40 @@ +Boolean +Byte +Char +Int +Long +Float +Double +String +Unit +Class + +Some[Int] + +List[Int] +List[Int] +List[List[Int]] +List[Any] + +Array[Int] +Array[Array[Int]] +Array[Int] +Array[Int] +Array[Int] +Array[Int] + +Tuple2[Int, String] +Tuple3[Char, Char, String] +Tuple2[Tuple2[Int, String], Tuple2[Int, String]] + +Function1[Int, Int] +Int +Function1[Int, Int] +Int +Function1[Int, Function1[Int, Int]] +Function1[Int, Int] +Int +Function3[Boolean, List[Char], Int, Int] +Function2[Function1[Int, Int], Int, Int] +Int + diff --git a/test/files/run/typerep.scala b/test/files/run/typerep.scala new file mode 100644 index 0000000000..9d848db762 --- /dev/null +++ b/test/files/run/typerep.scala @@ -0,0 +1,101 @@ +object Test extends Application { + testPrimitives + testOptions + testLists + testArrays + testTuples + testFuncs + //test4 // todo +} + +object testPrimitives { + println(getType(true)) + println(getType(16.toByte)) + println(getType('a')) + println(getType(3)) + println(getType(3l)) + println(getType(0.0f)) + println(getType(0.0d)) + println(getType("abc")) + println(getType(())) // Unit + println(getType(classOf[Int])) // Class + println +} + +object testOptions { + println(getType(Some(2))) + //println(getType(Some(Some(3)))) // ambiguous implicit values + //println(getType(None)) // no implicit argument matching parameter + println +} + +object testLists { + println(getType(List(3))) + println(getType(3 :: Nil)) + println(getType(List(List(3)))) + //println(getType(Nil)) // no implicit argument matching parameter type + println(getType(List(1, "abc"))) + println +} + +object testArrays { + println(getType(Array(3))) + println(getType(Array(Array(3), Array(4)))) + println(getType(new Array[Int](0))) + println(getType(List(1).toArray)) + println(getType(List[Int]().toArray)) + println(getType(Array(3).drop(1).toArray)) // empty + println +} + +object testTuples { + println(getType((3, "abc"))) + println(getType(Triple('a', 'b', "c"))) + println(getType(((3, "abc"), (4, "xyz")))) + println +} + +object testFuncs { + def f1(x: Int): Int = 2 * x + println(getType(f1 _)) + println(getType(f1(2))) + val f2 = (x: Int) => 2 * x + println(getType(f2)) + println(getType(f2(2))) + val f3 = (x: Int) => (y: Int) => x + y + println(getType(f3)) + println(getType(f3(2))) + println(getType(f3(2)(2))) + def f4(b: Boolean, c: List[Char], i: Int): Int = i + println(getType(f4 _)) + def f5(f: Int => Int, x: Int) = f(x) + println(getType(f5 _)) + println(getType(f5(f1, 1))) + println +} + +class Foo { + class Bar(x: Int) +} + +object foo extends Foo + +package pkg1 { + class C1 + object c1 extends C1 +} +/* +object test4 { + println(getType(foo)) + println(getType(new foo.Bar(0))) + val foo2 = new Foo + println(getType(foo2)) + println(getType(new foo2.Bar(1))) + println + + println(getType(pkg1.c1)) + val c1 = new pkg1.C1 + println(getType(c1)) + println +} +*/ diff --git a/test/scalatest b/test/scalatest index a340e49b88..4f52724acf 100755 --- a/test/scalatest +++ b/test/scalatest @@ -743,7 +743,8 @@ else SCALAC_CMD="${BIN_DIR}scalac"; fi; -if [ ! -x `which $SCALAC_CMD` ]; then +scalac=`which "$SCALAC_CMD" 2> /dev/null` +if [ -z "$scalac" ] || [ ! -x "$scalac" ]; then printf_failure "Missing command \"$SCALAC_CMD\"; run 'ant <target>'.\\n"; exit 1; fi; |