diff options
| author | Paul Phillips <paulp@improving.org> | 2012-02-06 10:40:06 -0800 |
|---|---|---|
| committer | Paul Phillips <paulp@improving.org> | 2012-02-06 11:14:53 -0800 |
| commit | f0dcb3c87fe9c3214af6abe4e8d2032a8d51295c (patch) | |
| tree | dd7a0e76b3b2ea26ba25b7acfd6436ce6fbd5263 /test/files/scalap/caseClass/result.test | |
| parent | b6dde2b6cf5f66e96fc92c09c1fbe3b4a8dc348c (diff) | |
| parent | 5376ded8acfb9552b2da6c558c5b0db73df99075 (diff) | |
| download | scala-f0dcb3c87fe9c3214af6abe4e8d2032a8d51295c.tar.gz scala-f0dcb3c87fe9c3214af6abe4e8d2032a8d51295c.tar.bz2 scala-f0dcb3c87fe9c3214af6abe4e8d2032a8d51295c.zip | |
Merge remote-tracking branch 'odersky/topic/inline' into inline-remerge
Conflicts:
src/compiler/scala/reflect/internal/Definitions.scala
src/compiler/scala/tools/nsc/typechecker/Namers.scala
src/library/scala/AnyVal.scala
test/files/run/primitive-sigs-2.check
test/files/run/t4172.check
test/files/scalap/abstractClass/result.test
test/files/scalap/abstractMethod/result.test
test/files/scalap/caseClass/result.test
test/files/scalap/cbnParam/result.test
test/files/scalap/classPrivate/result.test
test/files/scalap/classWithExistential/result.test
test/files/scalap/classWithSelfAnnotation/result.test
test/files/scalap/covariantParam/result.test
test/files/scalap/implicitParam/result.test
test/files/scalap/paramClauses/result.test
test/files/scalap/paramNames/result.test
test/files/scalap/sequenceParam/result.test
test/files/scalap/simpleClass/result.test
test/files/scalap/traitObject/result.test
test/files/scalap/typeAnnotations/result.test
test/files/scalap/valAndVar/result.test
test/files/scalap/wildcardType/result.test
Diffstat (limited to 'test/files/scalap/caseClass/result.test')
| -rw-r--r-- | test/files/scalap/caseClass/result.test | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/test/files/scalap/caseClass/result.test b/test/files/scalap/caseClass/result.test index 7c94b52cf7..8e3255859f 100644 --- a/test/files/scalap/caseClass/result.test +++ b/test/files/scalap/caseClass/result.test @@ -1,4 +1,4 @@ -case class CaseClass[A <: scala.Seq[scala.Int]](i : A, s : scala.Predef.String) extends java.lang.Object with scala.Product with scala.Serializable with scala.AnyRef { +case class CaseClass[A <: scala.Seq[scala.Int]](i : A, s : scala.Predef.String) extends java.lang.Object with scala.Product with scala.Serializable { val i : A = { /* compiled code */ } val s : scala.Predef.String = { /* compiled code */ } def foo : scala.Int = { /* compiled code */ } |