diff options
| author | Josh Suereth <Joshua.Suereth@gmail.com> | 2012-06-18 17:20:21 -0700 |
|---|---|---|
| committer | Josh Suereth <Joshua.Suereth@gmail.com> | 2012-06-18 17:20:21 -0700 |
| commit | e759db42be0bcc157e1290fdb95170d8b89b0be8 (patch) | |
| tree | 3e10deef01a37e63d3e97fa936a1bbcedde8a7c2 /src | |
| parent | cc33555d259da8dc879952460bd40aa78e0fdda1 (diff) | |
| parent | 18aab246de965099f8b1c9b82164fb8d77b75de1 (diff) | |
| download | scala-e759db42be0bcc157e1290fdb95170d8b89b0be8.tar.gz scala-e759db42be0bcc157e1290fdb95170d8b89b0be8.tar.bz2 scala-e759db42be0bcc157e1290fdb95170d8b89b0be8.zip | |
Merge pull request #738 from scalamacros/topic/checkinit
fixes checkinit, now it's for real
Diffstat (limited to 'src')
| -rw-r--r-- | src/reflect/scala/reflect/internal/SymbolTable.scala | 2 | ||||
| -rw-r--r-- | src/reflect/scala/reflect/runtime/JavaUniverse.scala | 8 |
2 files changed, 1 insertions, 9 deletions
diff --git a/src/reflect/scala/reflect/internal/SymbolTable.scala b/src/reflect/scala/reflect/internal/SymbolTable.scala index cadd76b1ba..a0c57042f3 100644 --- a/src/reflect/scala/reflect/internal/SymbolTable.scala +++ b/src/reflect/scala/reflect/internal/SymbolTable.scala @@ -40,7 +40,7 @@ abstract class SymbolTable extends makro.Universe { val gen = new TreeGen { val global: SymbolTable.this.type = SymbolTable.this } - val treeBuild = gen + lazy val treeBuild = gen def log(msg: => AnyRef): Unit def abort(msg: String): Nothing = throw new FatalError(supplementErrorMessage(msg)) diff --git a/src/reflect/scala/reflect/runtime/JavaUniverse.scala b/src/reflect/scala/reflect/runtime/JavaUniverse.scala index 7ce71166c9..629df76178 100644 --- a/src/reflect/scala/reflect/runtime/JavaUniverse.scala +++ b/src/reflect/scala/reflect/runtime/JavaUniverse.scala @@ -12,14 +12,6 @@ class JavaUniverse extends internal.SymbolTable with ReflectSetup with runtime.S def picklerPhase = SomePhase - type TreeGen = internal.TreeGen - - override type Position = scala.reflect.internal.util.Position - - override val gen = new TreeGen { val global: self.type = self } - - override val treeBuild = gen - lazy val settings = new Settings def forInteractive = false def forScaladoc = false |