diff options
Diffstat (limited to 'sources/scalac/transformer')
| -rw-r--r-- | sources/scalac/transformer/AddConstructors.java | 2 | ||||
| -rw-r--r-- | sources/scalac/transformer/AddInterfaces.java | 4 | ||||
| -rw-r--r-- | sources/scalac/transformer/AddInterfacesPhase.java | 4 |
3 files changed, 5 insertions, 5 deletions
diff --git a/sources/scalac/transformer/AddConstructors.java b/sources/scalac/transformer/AddConstructors.java index 226b476dc5..732762adb3 100644 --- a/sources/scalac/transformer/AddConstructors.java +++ b/sources/scalac/transformer/AddConstructors.java @@ -73,7 +73,7 @@ public class AddConstructors extends Transformer { Symbol getConstructor(Symbol classConstr) { return getConstructor(classConstr, (((Type.MethodType)classConstr.info()).vparams), - classConstr.primaryConstructorClass()); + classConstr.constructorClass()); } Symbol getConstructor(Symbol classConstr, Symbol[] paramSyms, Symbol owner) { diff --git a/sources/scalac/transformer/AddInterfaces.java b/sources/scalac/transformer/AddInterfaces.java index fadc2eed35..628eef8321 100644 --- a/sources/scalac/transformer/AddInterfaces.java +++ b/sources/scalac/transformer/AddInterfaces.java @@ -170,7 +170,7 @@ class AddInterfaces extends Transformer { if (sym.isConstructor()) { // If the constructor now refers to the interface // constructor, use the class constructor instead. - Symbol clsSym = sym.primaryConstructorClass(); + Symbol clsSym = sym.constructorClass(); if (phase.needInterface(clsSym)) return gen.Select(qualifier, phase.getClassSymbol(clsSym).primaryConstructor()); @@ -205,7 +205,7 @@ class AddInterfaces extends Transformer { if (sym.isConstructor()) { // If the constructor now refers to the interface // constructor, use the class constructor instead. - Symbol clsSym = sym.primaryConstructorClass(); + Symbol clsSym = sym.constructorClass(); if (phase.needInterface(clsSym)) return gen.Ident(phase.getClassSymbol(clsSym).primaryConstructor()); else diff --git a/sources/scalac/transformer/AddInterfacesPhase.java b/sources/scalac/transformer/AddInterfacesPhase.java index c012f403c9..ce4f95e734 100644 --- a/sources/scalac/transformer/AddInterfacesPhase.java +++ b/sources/scalac/transformer/AddInterfacesPhase.java @@ -33,7 +33,7 @@ public class AddInterfacesPhase extends Phase { public Type transformInfo(Symbol sym, Type tp) { if (sym.isPrimaryConstructor()) { - Symbol clazz = sym.primaryConstructorClass(); + Symbol clazz = sym.constructorClass(); if (!(clazz.isClass() && needInterface(clazz))) return tp; // The symbol is a constructor of a class which needs // an interface. All its value arguments have to be @@ -195,7 +195,7 @@ public class AddInterfacesPhase extends Phase { */ protected Symbol getClassSymbol(Symbol ifaceSym) { if (ifaceSym.isPrimaryConstructor()) - return getClassSymbol(ifaceSym.primaryConstructorClass()) + return getClassSymbol(ifaceSym.constructorClass()) .primaryConstructor(); if (!needInterface(ifaceSym)) |