Minor. Got rid of useless parameter.
This commit is contained in:
@@ -108,17 +108,17 @@ public abstract class ClassBodyCodegen extends MemberCodegen {
|
|||||||
|
|
||||||
protected void generateDeclaration(PropertyCodegen propertyCodegen, JetDeclaration declaration) {
|
protected void generateDeclaration(PropertyCodegen propertyCodegen, JetDeclaration declaration) {
|
||||||
if (declaration instanceof JetProperty || declaration instanceof JetNamedFunction) {
|
if (declaration instanceof JetProperty || declaration instanceof JetNamedFunction) {
|
||||||
genFunctionOrProperty(context, (JetTypeParameterListOwner) declaration, v);
|
genFunctionOrProperty((JetTypeParameterListOwner) declaration, v);
|
||||||
}
|
}
|
||||||
else if (declaration instanceof JetClassOrObject) {
|
else if (declaration instanceof JetClassOrObject) {
|
||||||
if (declaration instanceof JetEnumEntry && !enumEntryNeedSubclass(state.getBindingContext(), (JetEnumEntry) declaration)) {
|
if (declaration instanceof JetEnumEntry && !enumEntryNeedSubclass(state.getBindingContext(), (JetEnumEntry) declaration)) {
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
genClassOrObject(context, (JetClassOrObject) declaration);
|
genClassOrObject((JetClassOrObject) declaration);
|
||||||
}
|
}
|
||||||
else if (declaration instanceof JetClassObject) {
|
else if (declaration instanceof JetClassObject) {
|
||||||
genClassOrObject(context, ((JetClassObject) declaration).getObjectDeclaration());
|
genClassOrObject(((JetClassObject) declaration).getObjectDeclaration());
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -52,7 +52,6 @@ public class MemberCodegen extends ParentCodegenAwareImpl {
|
|||||||
}
|
}
|
||||||
|
|
||||||
public void genFunctionOrProperty(
|
public void genFunctionOrProperty(
|
||||||
@NotNull FieldOwnerContext context,
|
|
||||||
@NotNull JetTypeParameterListOwner functionOrProperty,
|
@NotNull JetTypeParameterListOwner functionOrProperty,
|
||||||
@NotNull ClassBuilder classBuilder
|
@NotNull ClassBuilder classBuilder
|
||||||
) {
|
) {
|
||||||
@@ -127,8 +126,8 @@ public class MemberCodegen extends ParentCodegenAwareImpl {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
public void genClassOrObject(CodegenContext parentContext, JetClassOrObject aClass) {
|
public void genClassOrObject(JetClassOrObject aClass) {
|
||||||
genClassOrObject(parentContext, aClass, state, this);
|
genClassOrObject(context, aClass, state, this);
|
||||||
}
|
}
|
||||||
|
|
||||||
@NotNull
|
@NotNull
|
||||||
|
|||||||
@@ -288,7 +288,7 @@ public class PackageCodegen extends GenerationStateAware {
|
|||||||
|
|
||||||
new PackagePartCodegen(builder, file, packagePartType, packagePartContext, state).generate();
|
new PackagePartCodegen(builder, file, packagePartType, packagePartContext, state).generate();
|
||||||
|
|
||||||
final FieldOwnerContext packageFacade = CodegenContext.STATIC.intoPackageFacade(packagePartType, packageFragment);
|
FieldOwnerContext packageFacade = CodegenContext.STATIC.intoPackageFacade(packagePartType, packageFragment);
|
||||||
|
|
||||||
final MemberCodegen memberCodegen = getMemberCodegen(packageFacade);
|
final MemberCodegen memberCodegen = getMemberCodegen(packageFacade);
|
||||||
|
|
||||||
@@ -303,7 +303,7 @@ public class PackageCodegen extends GenerationStateAware {
|
|||||||
@Override
|
@Override
|
||||||
public void run() {
|
public void run() {
|
||||||
memberCodegen.genFunctionOrProperty(
|
memberCodegen.genFunctionOrProperty(
|
||||||
packageFacade, (JetTypeParameterListOwner) declaration, v.getClassBuilder());
|
(JetTypeParameterListOwner) declaration, v.getClassBuilder());
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
);
|
);
|
||||||
|
|||||||
@@ -79,7 +79,7 @@ public class PackagePartCodegen extends MemberCodegen {
|
|||||||
|
|
||||||
for (JetDeclaration declaration : jetFile.getDeclarations()) {
|
for (JetDeclaration declaration : jetFile.getDeclarations()) {
|
||||||
if (declaration instanceof JetNamedFunction || declaration instanceof JetProperty) {
|
if (declaration instanceof JetNamedFunction || declaration instanceof JetProperty) {
|
||||||
genFunctionOrProperty(context, (JetTypeParameterListOwner) declaration, v);
|
genFunctionOrProperty((JetTypeParameterListOwner) declaration, v);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -204,7 +204,7 @@ public class ScriptCodegen extends MemberCodegen {
|
|||||||
|
|
||||||
private void genMembers(@NotNull FieldOwnerContext context, @NotNull ClassBuilder classBuilder) {
|
private void genMembers(@NotNull FieldOwnerContext context, @NotNull ClassBuilder classBuilder) {
|
||||||
for (JetDeclaration decl : scriptDeclaration.getDeclarations()) {
|
for (JetDeclaration decl : scriptDeclaration.getDeclarations()) {
|
||||||
genFunctionOrProperty(context, (JetTypeParameterListOwner) decl, classBuilder);
|
genFunctionOrProperty((JetTypeParameterListOwner) decl, classBuilder);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user