diff options
| author | Martin Odersky <odersky@gmail.com> | 2003-08-15 12:54:18 +0000 |
|---|---|---|
| committer | Martin Odersky <odersky@gmail.com> | 2003-08-15 12:54:18 +0000 |
| commit | 5fdf691280325593178fb60c1eee97255dcddf8a (patch) | |
| tree | b577b7a9c9b5cc5fafef1f03686331905bd71e48 /sources/scalac/backend | |
| parent | cce804c34f58e904cdc66889ba9990b3edd827f5 (diff) | |
| download | scala-5fdf691280325593178fb60c1eee97255dcddf8a.tar.gz scala-5fdf691280325593178fb60c1eee97255dcddf8a.tar.bz2 scala-5fdf691280325593178fb60c1eee97255dcddf8a.zip | |
*** empty log message ***
Diffstat (limited to 'sources/scalac/backend')
| -rw-r--r-- | sources/scalac/backend/jvm/GenJVM.java | 4 | ||||
| -rw-r--r-- | sources/scalac/backend/jvm/GenJVMBCEL.java | 6 | ||||
| -rw-r--r-- | sources/scalac/backend/msil/GenMSIL.java | 4 |
3 files changed, 7 insertions, 7 deletions
diff --git a/sources/scalac/backend/jvm/GenJVM.java b/sources/scalac/backend/jvm/GenJVM.java index 980cc7e23f..153a30ca0b 100644 --- a/sources/scalac/backend/jvm/GenJVM.java +++ b/sources/scalac/backend/jvm/GenJVM.java @@ -378,7 +378,7 @@ class GenJVM { boolean isConstrCall = (funSym.name == CONSTRUCTOR_NAME); boolean isSuperCall; switch (fun) { - case Select(Super(_), _): isSuperCall = true; break; + case Select(Super(_, _), _): isSuperCall = true; break; default: isSuperCall = false; break; } @@ -482,7 +482,7 @@ class GenJVM { } break; case This(_): - case Super(_): + case Super(_, _): ctx.code.emitALOAD_0(); generatedType = JAVA_LANG_OBJECT_T; break; diff --git a/sources/scalac/backend/jvm/GenJVMBCEL.java b/sources/scalac/backend/jvm/GenJVMBCEL.java index c9a2ed5031..cb26af50d9 100644 --- a/sources/scalac/backend/jvm/GenJVMBCEL.java +++ b/sources/scalac/backend/jvm/GenJVMBCEL.java @@ -319,7 +319,7 @@ class GenJVMBCEL { boolean isConstrCall = (funSym.name == CONSTRUCTOR_NAME); boolean isSuperCall; switch (fun) { - case Select(Super(_), _): isSuperCall = true; break; + case Select(Super(_, _), _): isSuperCall = true; break; default: isSuperCall = false; break; } @@ -479,7 +479,7 @@ class GenJVMBCEL { break; case Sequence(_): - case Super(_): + case Super(_, _): case ModuleDef(_,_,_,_): case PatDef(_,_,_): case Import(_, _): @@ -628,7 +628,7 @@ class GenJVMBCEL { protected void genLoadQualifier(Tree tree) { switch (tree) { - case Select(Super(_), _): + case Select(Super(_, _), _): case Ident(_): currIL.append(ic.THIS); break; diff --git a/sources/scalac/backend/msil/GenMSIL.java b/sources/scalac/backend/msil/GenMSIL.java index eb4ba27c1c..350cf84453 100644 --- a/sources/scalac/backend/msil/GenMSIL.java +++ b/sources/scalac/backend/msil/GenMSIL.java @@ -586,7 +586,7 @@ public class GenMSIL /*implements Modifiers */ { case This(_): return items.SelfItem(tc.getType(currentClass)); - case Super(_): + case Super(_, _): //logErr("Not implemented yet: Super(" + Debug.show(sym) + ")"); //log("gen.Super(_): Super.symbol() = " + dumpSym(sym)); //log("gen.Super(tpe): tpe.symbol() = " + dumpSym(tpe.symbol())); @@ -831,7 +831,7 @@ public class GenMSIL /*implements Modifiers */ { //Debug.show(qualifier.type())); /// FIXME after the Super attribution is correct switch (qualifier) { - case Super(_): + case Super(_, _): load(items.SelfItem(tc.getType(currentClass))); break; default: |