diff options
| author | Miguel Garcia <miguelalfredo.garcia@epfl.ch> | 2012-03-06 12:51:15 +0100 |
|---|---|---|
| committer | Miguel Garcia <miguelalfredo.garcia@epfl.ch> | 2012-03-06 12:51:15 +0100 |
| commit | 483ecd96b9852ef9792d5d6acc0fd137eafe8929 (patch) | |
| tree | d215fc436ad1980eed60a5e282d1bfa870a1a8b4 /src | |
| parent | e328d853a6e0e790da01fedd8122e2875c7f1442 (diff) | |
| download | scala-483ecd96b9852ef9792d5d6acc0fd137eafe8929.tar.gz scala-483ecd96b9852ef9792d5d6acc0fd137eafe8929.tar.bz2 scala-483ecd96b9852ef9792d5d6acc0fd137eafe8929.zip | |
readability
Diffstat (limited to 'src')
| -rw-r--r-- | src/compiler/scala/tools/nsc/backend/jvm/GenJVM.scala | 24 |
1 files changed, 8 insertions, 16 deletions
diff --git a/src/compiler/scala/tools/nsc/backend/jvm/GenJVM.scala b/src/compiler/scala/tools/nsc/backend/jvm/GenJVM.scala index b8ccccb916..0cdd9be20b 100644 --- a/src/compiler/scala/tools/nsc/backend/jvm/GenJVM.scala +++ b/src/compiler/scala/tools/nsc/backend/jvm/GenJVM.scala @@ -1296,14 +1296,10 @@ abstract class GenJVM extends SubComponent with GenJVMUtil with GenAndroid with var owner = javaName(lf.hostClass) debuglog("LOAD_FIELD with owner: " + owner + " flags: " + Flags.flagsToString(field.owner.flags)) - if (isStatic) - jcode.emitGETSTATIC(owner, - javaName(field), - javaType(field)) - else - jcode.emitGETFIELD(owner, - javaName(field), - javaType(field)) + val fieldJName = javaName(field) + val fieldJType = javaType(field) + if (isStatic) jcode.emitGETSTATIC(owner, fieldJName, fieldJType) + else jcode.emitGETFIELD( owner, fieldJName, fieldJType) case LOAD_MODULE(module) => // assert(module.isModule, "Expected module: " + module) @@ -1341,14 +1337,10 @@ abstract class GenJVM extends SubComponent with GenJVMUtil with GenAndroid with case STORE_FIELD(field, isStatic) => val owner = javaName(field.owner) - if (isStatic) - jcode.emitPUTSTATIC(owner, - javaName(field), - javaType(field)) - else - jcode.emitPUTFIELD(owner, - javaName(field), - javaType(field)) + val fieldJName = javaName(field) + val fieldJType = javaType(field) + if (isStatic) jcode.emitPUTSTATIC(owner, fieldJName, fieldJType) + else jcode.emitPUTFIELD( owner, fieldJName, fieldJType) case CALL_PRIMITIVE(primitive) => genPrimitive(primitive, instr.pos) |