diff options
Diffstat (limited to 'sources/scalac/typechecker')
| -rw-r--r-- | sources/scalac/typechecker/Analyzer.java | 4 | ||||
| -rw-r--r-- | sources/scalac/typechecker/RefCheck.java | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/sources/scalac/typechecker/Analyzer.java b/sources/scalac/typechecker/Analyzer.java index da68b474b7..3718e377bb 100644 --- a/sources/scalac/typechecker/Analyzer.java +++ b/sources/scalac/typechecker/Analyzer.java @@ -276,7 +276,7 @@ public class Analyzer extends Transformer implements Modifiers, Kinds { error(sym.pos, "`override' modifier not allowed for classes"); } if ((sym.flags & DEF) != 0 && sym.owner().isPrimaryConstructor() && - (sym.owner().primaryConstructorClass().flags & CASE) != 0) { + (sym.owner().constructorClass().flags & CASE) != 0) { error(sym.pos, "`def' modifier not allowed for case class parameters"); } /*!!! @@ -1540,7 +1540,7 @@ public class Analyzer extends Transformer implements Modifiers, Kinds { constrs[i] = transform(constrs[i], CONSTRmode | SUPERmode, Type.AnyType); Symbol f = TreeInfo.methSymbol(constrs[i]); if (f != null) { - Symbol c = f.primaryConstructorClass(); + Symbol c = f.constructorClass(); if (c.kind == CLASS) { c.initialize();//to detect cycles if (i > 0 && (c.flags & JAVA) == 0 && c.isExternal()) { diff --git a/sources/scalac/typechecker/RefCheck.java b/sources/scalac/typechecker/RefCheck.java index 08f1539eb8..e78d628631 100644 --- a/sources/scalac/typechecker/RefCheck.java +++ b/sources/scalac/typechecker/RefCheck.java @@ -292,7 +292,7 @@ public class RefCheck extends Transformer implements Modifiers, Kinds { /** The variance of symbol `base' relative to the class which defines `tvar'. */ int flip(Symbol base, Symbol tvar) { - Symbol clazz = tvar.owner().primaryConstructorClass(); + Symbol clazz = tvar.owner().constructorClass(); Symbol sym = base; int flip = CoVariance; while (sym != clazz && flip != AnyVariance) { |