diff options
-rwxr-xr-x | sources/scala/tools/nsc/Global.scala | 4 | ||||
-rw-r--r-- | sources/scala/tools/nsc/backend/jvm/GenJVM.scala | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/sources/scala/tools/nsc/Global.scala b/sources/scala/tools/nsc/Global.scala index 6ec822c0cc..58666f0f5f 100755 --- a/sources/scala/tools/nsc/Global.scala +++ b/sources/scala/tools/nsc/Global.scala @@ -20,7 +20,7 @@ import matching.TransMatcher; import transform._; import backend.icode.{ICodes, GenICode, Checkers}; import backend.ScalaPrimitives; -import backend.jvm.BytecodeGenerators; +import backend.jvm.GenJVM; class Global(val settings: Settings, val reporter: Reporter) extends SymbolTable with Trees @@ -236,7 +236,7 @@ class Global(val settings: Settings, val reporter: Reporter) extends SymbolTable val global: Global.this.type = Global.this; } - object genJVM extends BytecodeGenerators { + object genJVM extends GenJVM { val global: Global.this.type = Global.this; } diff --git a/sources/scala/tools/nsc/backend/jvm/GenJVM.scala b/sources/scala/tools/nsc/backend/jvm/GenJVM.scala index ffb0b7a2a8..dd06a6e6fd 100644 --- a/sources/scala/tools/nsc/backend/jvm/GenJVM.scala +++ b/sources/scala/tools/nsc/backend/jvm/GenJVM.scala @@ -16,7 +16,7 @@ import ch.epfl.lamp.fjbg._; /** */ -abstract class BytecodeGenerators extends SubComponent { +abstract class GenJVM extends SubComponent { import global._; import icodes._; import icodes.opcodes._; |