diff options
Diffstat (limited to 'test/files/run')
-rw-r--r-- | test/files/run/primitive-sigs-2.check | 2 | ||||
-rw-r--r-- | test/files/run/programmatic-main.check | 44 | ||||
-rw-r--r-- | test/files/run/repl-parens.check | 2 | ||||
-rw-r--r-- | test/files/run/t4110.check | 4 | ||||
-rw-r--r-- | test/files/run/t4172.check | 2 | ||||
-rw-r--r-- | test/files/run/t4891.check | 1 |
6 files changed, 28 insertions, 27 deletions
diff --git a/test/files/run/primitive-sigs-2.check b/test/files/run/primitive-sigs-2.check index c69d1b54a6..0af1434cea 100644 --- a/test/files/run/primitive-sigs-2.check +++ b/test/files/run/primitive-sigs-2.check @@ -1,4 +1,4 @@ -T<java.lang.Object> interface scala.ScalaObject +T<java.lang.Object> class java.lang.Object List(A, char, class java.lang.Object) a public <T> java.lang.Object Arr.arr4(java.lang.Object[],scala.reflect.Manifest<T>) diff --git a/test/files/run/programmatic-main.check b/test/files/run/programmatic-main.check index 6f253f5de1..a24de79b8a 100644 --- a/test/files/run/programmatic-main.check +++ b/test/files/run/programmatic-main.check @@ -4,25 +4,27 @@ namer 2 resolve names, attach symbols to named trees packageobjects 3 load package objects typer 4 the meat and potatoes: type the trees - superaccessors 5 add super accessors in traits and nested classes - pickler 6 serialize symbol tables - refchecks 7 reference/override checking, translate nested objects - uncurry 8 uncurry, translate function values to anonymous classes - tailcalls 9 replace tail calls by jumps - specialize 10 @specialized-driven class and method specialization - explicitouter 11 this refs to outer pointers, translate patterns - erasure 12 erase types, add interfaces for traits - lazyvals 13 allocate bitmaps, translate lazy vals into lazified defs - lambdalift 14 move nested functions to top level - constructors 15 move field definitions into constructors - flatten 16 eliminate inner classes - mixin 17 mixin composition - cleanup 18 platform-specific cleanups, generate reflective calls - icode 19 generate portable intermediate code - inliner 20 optimization: do inlining -inlineExceptionHandlers 21 optimization: inline exception handlers - closelim 22 optimization: eliminate uncalled closures - dce 23 optimization: eliminate dead code - jvm 24 generate JVM bytecode - terminal 25 The last phase in the compiler chain + extmethods 5 add extension methods for inline classes + superaccessors 6 add super accessors in traits and nested classes + pickler 7 serialize symbol tables + refchecks 8 reference/override checking, translate nested objects + liftcode 9 reify trees + uncurry 10 uncurry, translate function values to anonymous classes + tailcalls 11 replace tail calls by jumps + specialize 12 @specialized-driven class and method specialization + explicitouter 13 this refs to outer pointers, translate patterns + erasure 14 erase types, add interfaces for traits + lazyvals 15 allocate bitmaps, translate lazy vals into lazified defs + lambdalift 16 move nested functions to top level + constructors 17 move field definitions into constructors + flatten 18 eliminate inner classes + mixin 19 mixin composition + cleanup 20 platform-specific cleanups, generate reflective calls + icode 21 generate portable intermediate code + inliner 22 optimization: do inlining +inlineExceptionHandlers 23 optimization: inline exception handlers + closelim 24 optimization: eliminate uncalled closures + dce 25 optimization: eliminate dead code + jvm 26 generate JVM bytecode + terminal 27 The last phase in the compiler chain diff --git a/test/files/run/repl-parens.check b/test/files/run/repl-parens.check index 944846541f..69f0a9ce30 100644 --- a/test/files/run/repl-parens.check +++ b/test/files/run/repl-parens.check @@ -66,7 +66,7 @@ scala> 55 ; () => 5 res13: () => Int = <function0> scala> () => { class X ; new X } -res14: () => Object with ScalaObject = <function0> +res14: () => Object = <function0> scala> diff --git a/test/files/run/t4110.check b/test/files/run/t4110.check index 8b005989de..dea7e5957c 100644 --- a/test/files/run/t4110.check +++ b/test/files/run/t4110.check @@ -1,2 +1,2 @@ -Object with Test$A with Test$B -Object with Test$A with Test$B +Object with Test$A with Test$B with Object +Object with Test$A with Test$B with Object diff --git a/test/files/run/t4172.check b/test/files/run/t4172.check index 95e3eb950d..b94da0c9d8 100644 --- a/test/files/run/t4172.check +++ b/test/files/run/t4172.check @@ -4,7 +4,7 @@ Type :help for more information. scala> scala> val c = { class C { override def toString = "C" }; ((new C, new C { def f = 2 })) } -c: (C, C{def f: Int}) forSome { type C <: Object with ScalaObject } = (C,C) +c: (C, C with Object{def f: Int}) forSome { type C <: Object } = (C,C) scala> diff --git a/test/files/run/t4891.check b/test/files/run/t4891.check index 072f8df8d4..79fd7f6fbb 100644 --- a/test/files/run/t4891.check +++ b/test/files/run/t4891.check @@ -5,4 +5,3 @@ test.generic.C1 test.generic.C2 (m) public void test.generic.C1.m1() null -interface scala.ScalaObject |