diff options
| author | Iulian Dragos <jaguarul@gmail.com> | 2007-01-29 14:03:26 +0000 |
|---|---|---|
| committer | Iulian Dragos <jaguarul@gmail.com> | 2007-01-29 14:03:26 +0000 |
| commit | 5833fcd8c74b8aae30b47529f0936b4880321a74 (patch) | |
| tree | 9036dfbafe86c4cf744f9a948e49d44c158e64c8 /src/compiler/scala/tools/nsc/Global.scala | |
| parent | d684e5c0717e8cd3389fc0bc810e26ac8f765d0e (diff) | |
| download | scala-5833fcd8c74b8aae30b47529f0936b4880321a74.tar.gz scala-5833fcd8c74b8aae30b47529f0936b4880321a74.tar.bz2 scala-5833fcd8c74b8aae30b47529f0936b4880321a74.zip | |
Fixed crash for 'return' in finally
Diffstat (limited to 'src/compiler/scala/tools/nsc/Global.scala')
| -rw-r--r-- | src/compiler/scala/tools/nsc/Global.scala | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/compiler/scala/tools/nsc/Global.scala b/src/compiler/scala/tools/nsc/Global.scala index 03848e7439..49d94f5ff7 100644 --- a/src/compiler/scala/tools/nsc/Global.scala +++ b/src/compiler/scala/tools/nsc/Global.scala @@ -76,10 +76,10 @@ class Global(var settings: Settings, var reporter: Reporter) extends SymbolTable val global: Global.this.type = Global.this } -/* object icodeReader extends ICodeReader { + object icodeReader extends ICodeReader { val global: Global.this.type = Global.this } -*/ + object analysis extends TypeFlowAnalysis { val global: Global.this.type = Global.this } @@ -551,7 +551,7 @@ class Global(var settings: Settings, var reporter: Reporter) extends SymbolTable if (settings.Xscript.value && filenames.length != 1) error("can only compile one script at a time") val sources = filenames map ( - if (settings.Xscript.value) {x => ScriptRunner.wrappedScript(x, &Global.this.getSourceFile)} else getSourceFile) + /* if (settings.Xscript.value) {x => ScriptRunner.wrappedScript(x, &Global.this.getSourceFile)} else */ getSourceFile) compileSources(sources) } catch { case ex: IOException => error(ex.getMessage()) @@ -650,7 +650,7 @@ class Global(var settings: Settings, var reporter: Reporter) extends SymbolTable val posConfig : PositionConfiguration = positionConfiguration; posConfig.FirstPos.asInstanceOf[PositionType]; } - final val NoPos = positionConfiguration.NoPos + final def NoPos = positionConfiguration.NoPos final def coerceIntToPos(pos: Int): PositionType = positionConfiguration.coerceIntToPos(pos) implicit final def coercePosToInt(pos: PositionType): Int = |