diff options
author | Martin Odersky <odersky@gmail.com> | 2012-02-06 14:27:43 +0100 |
---|---|---|
committer | Martin Odersky <odersky@gmail.com> | 2012-02-06 14:27:43 +0100 |
commit | 4407cdb4df86de2422c242210a96b11c2d14ac31 (patch) | |
tree | 106b46c66dfb54915939113e2fdda253d450821b /src/compiler | |
parent | 01494243503b1597f0d5597c6c4414a42473c064 (diff) | |
download | scala-4407cdb4df86de2422c242210a96b11c2d14ac31.tar.gz scala-4407cdb4df86de2422c242210a96b11c2d14ac31.tar.bz2 scala-4407cdb4df86de2422c242210a96b11c2d14ac31.zip |
Definitions are now initialized in reflection (was missing before).
Diffstat (limited to 'src/compiler')
-rw-r--r-- | src/compiler/scala/reflect/internal/pickling/UnPickler.scala | 1 | ||||
-rw-r--r-- | src/compiler/scala/reflect/runtime/Universe.scala | 6 |
2 files changed, 7 insertions, 0 deletions
diff --git a/src/compiler/scala/reflect/internal/pickling/UnPickler.scala b/src/compiler/scala/reflect/internal/pickling/UnPickler.scala index b21b33e138..92ac9b1426 100644 --- a/src/compiler/scala/reflect/internal/pickling/UnPickler.scala +++ b/src/compiler/scala/reflect/internal/pickling/UnPickler.scala @@ -229,6 +229,7 @@ abstract class UnPickler /*extends reflect.generic.UnPickler*/ { // (3) Try as a nested object symbol. nestedObjectSymbol orElse { // (4) Otherwise, fail. + //System.err.println("missing "+name+" in "+owner+"/"+owner.id+" "+owner.info.decls) adjust(errorMissingRequirement(name, owner)) } } diff --git a/src/compiler/scala/reflect/runtime/Universe.scala b/src/compiler/scala/reflect/runtime/Universe.scala index c786bb86c5..d1d9855860 100644 --- a/src/compiler/scala/reflect/runtime/Universe.scala +++ b/src/compiler/scala/reflect/runtime/Universe.scala @@ -37,6 +37,12 @@ class Universe extends SymbolTable { type Position = String // source file? val NoPosition = "" + definitions.AnyValClass // force it. + // establish root association to avoid cyclic dependency errors later classToScala(classOf[java.lang.Object]).initialize + +// println("initializing definitions") + definitions.init() + } |