diff options
author | Burak Emir <emir@epfl.ch> | 2007-08-21 21:49:23 +0000 |
---|---|---|
committer | Burak Emir <emir@epfl.ch> | 2007-08-21 21:49:23 +0000 |
commit | e313d9651adc2b7137a1dabbd3b0351619383035 (patch) | |
tree | bb43d9b9470dba4bea72b6df00b35739de6be358 /src | |
parent | 1e350595d8ad8a30234750da25a1718235547202 (diff) | |
download | scala-e313d9651adc2b7137a1dabbd3b0351619383035.tar.gz scala-e313d9651adc2b7137a1dabbd3b0351619383035.tar.bz2 scala-e313d9651adc2b7137a1dabbd3b0351619383035.zip |
fixed #1281, reverted Sean's lazy generator in ...
fixed #1281, reverted Sean's lazy generator in Main which broke the
build
Diffstat (limited to 'src')
-rw-r--r-- | src/compiler/scala/tools/nsc/Main.scala | 2 | ||||
-rw-r--r-- | src/compiler/scala/tools/nsc/typechecker/Typers.scala | 1 |
2 files changed, 2 insertions, 1 deletions
diff --git a/src/compiler/scala/tools/nsc/Main.scala b/src/compiler/scala/tools/nsc/Main.scala index cf858409b2..e710487aa8 100644 --- a/src/compiler/scala/tools/nsc/Main.scala +++ b/src/compiler/scala/tools/nsc/Main.scala @@ -86,7 +86,7 @@ object Main extends AnyRef with EvalLoop { run compile command.files if (command.settings.doc.value) { object generator extends DocDriver { - lazy val global: compiler.type = compiler + /*lazy*/ val global: compiler.type = compiler def settings = command.settings } generator process run.units diff --git a/src/compiler/scala/tools/nsc/typechecker/Typers.scala b/src/compiler/scala/tools/nsc/typechecker/Typers.scala index c162eacc1d..ed796b9967 100644 --- a/src/compiler/scala/tools/nsc/typechecker/Typers.scala +++ b/src/compiler/scala/tools/nsc/typechecker/Typers.scala @@ -1661,6 +1661,7 @@ trait Typers { self: Analyzer => val typer1 = new Typer(context1) arg.tpe = typer1.infer.inferTypedPattern(tree.pos, unappFormal, arg.tpe) //todo: replace arg with arg.asInstanceOf[inferTypedPattern(unappFormal, arg.tpe)] instead. + argDummy.setInfo(arg.tpe) // bq: this line fixed #1281. w.r.t. comment ^^^, maybe good enough? } val funPrefix = fun.tpe.prefix match { case tt @ ThisType(sym) => |