diff options
| author | Martin Odersky <odersky@gmail.com> | 2003-08-21 10:30:27 +0000 |
|---|---|---|
| committer | Martin Odersky <odersky@gmail.com> | 2003-08-21 10:30:27 +0000 |
| commit | b227b272110f0654064632642c2ca1031e7c68c6 (patch) | |
| tree | 747970915b10fc1eb9b80481c44052a3808fd08f /sources/scalac/symtab/classfile | |
| parent | 7b1200a4f4ecd1014055f65f384bd814754256b0 (diff) | |
| download | scala-b227b272110f0654064632642c2ca1031e7c68c6.tar.gz scala-b227b272110f0654064632642c2ca1031e7c68c6.tar.bz2 scala-b227b272110f0654064632642c2ca1031e7c68c6.zip | |
*** empty log message ***
Diffstat (limited to 'sources/scalac/symtab/classfile')
| -rw-r--r-- | sources/scalac/symtab/classfile/Pickle.java | 6 | ||||
| -rw-r--r-- | sources/scalac/symtab/classfile/UnPickle.java | 2 |
2 files changed, 4 insertions, 4 deletions
diff --git a/sources/scalac/symtab/classfile/Pickle.java b/sources/scalac/symtab/classfile/Pickle.java index 8cf0efd2de..3d19855e90 100644 --- a/sources/scalac/symtab/classfile/Pickle.java +++ b/sources/scalac/symtab/classfile/Pickle.java @@ -82,7 +82,7 @@ public class Pickle implements Kinds, Modifiers, EntryTags { return sym.name.toTermName() == rootname && sym.owner() == rootowner || - sym.isConstructor() && isLocal(sym.primaryConstructorClass()) + sym.isConstructor() && isLocal(sym.constructorClass()) || (sym.kind != NONE && isLocal(sym.owner())); } @@ -134,7 +134,7 @@ public class Pickle implements Kinds, Modifiers, EntryTags { break; case VAL: if (sym.isPrimaryConstructor()) - putSymbol(sym.primaryConstructorClass()); + putSymbol(sym.constructorClass()); else if (sym.isModule()) putSymbol(sym.moduleClass()); break; @@ -319,7 +319,7 @@ public class Pickle implements Kinds, Modifiers, EntryTags { break; case VAL: if (sym.isPrimaryConstructor()) - writeRef(sym.primaryConstructorClass()); + writeRef(sym.constructorClass()); else if (sym.isModule()) writeRef(sym.moduleClass()); break; diff --git a/sources/scalac/symtab/classfile/UnPickle.java b/sources/scalac/symtab/classfile/UnPickle.java index 2e333e5cd2..f5b4f7ab4f 100644 --- a/sources/scalac/symtab/classfile/UnPickle.java +++ b/sources/scalac/symtab/classfile/UnPickle.java @@ -37,7 +37,7 @@ public class UnPickle implements Kinds, Modifiers, EntryTags { UnPickle(Symbol root, byte[] data, Name sourceName) { global = Global.instance; if (root.isConstructor()) { - this.classroot = root.primaryConstructorClass(); + this.classroot = root.constructorClass(); this.moduleroot = classroot.module(); } else if (root.isType()) { this.classroot = root; |