diff options
author | paltherr <paltherr@epfl.ch> | 2004-02-05 13:01:51 +0000 |
---|---|---|
committer | paltherr <paltherr@epfl.ch> | 2004-02-05 13:01:51 +0000 |
commit | f5fc87e968c97147ed953750bf885c6af581019b (patch) | |
tree | 60f8574a0f674ce6a1ff7626a53a15a9f839f7ae | |
parent | d2d7a7ed163deb502de97b13373786ed742434a4 (diff) | |
download | scala-f5fc87e968c97147ed953750bf885c6af581019b.tar.gz scala-f5fc87e968c97147ed953750bf885c6af581019b.tar.bz2 scala-f5fc87e968c97147ed953750bf885c6af581019b.zip |
- Simplified by using isStatic
-rw-r--r-- | sources/scala/tools/scalai/ExpressionCompiler.java | 11 |
1 files changed, 1 insertions, 10 deletions
diff --git a/sources/scala/tools/scalai/ExpressionCompiler.java b/sources/scala/tools/scalai/ExpressionCompiler.java index a937e2ca82..bb4e3ad9cb 100644 --- a/sources/scala/tools/scalai/ExpressionCompiler.java +++ b/sources/scala/tools/scalai/ExpressionCompiler.java @@ -218,7 +218,7 @@ public class ExpressionCompiler { return Code.Self; case Select(Tree expr, _): - return compute(expr); + return tree.symbol().isStatic() ? Code.Null : compute(expr); case Ident(_): return Code.Self; @@ -305,15 +305,6 @@ public class ExpressionCompiler { // Private Methods - load & store private Code load(Tree target, Symbol symbol) { - // !!! remove this hack, and argument "from" - if (symbol.isMethod()) { // !!! Kinds. - // !!! - return vapply(target, symbol, Tree.EMPTY_ARRAY); - } - - // !!! return something ? raise exception ? - if (!symbol.isValue()) return Code.Null; - return Code.Load(object(target), context.lookupVariable(symbol)); } |