azalea/kotlin-fork
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Minor. Rename mapTraitImpl -> mapDefaultImpls

Browse Source
This commit is contained in:
Denis Zharkov
2015-09-24 18:59:08 +03:00
parent b2d4bdc802
commit cabf0df5d1
7 changed files with 9 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/backend/src/org/jetbrains/kotlin/codegen/ExpressionCodegen.java
+1 -1
View File
@@ -333,7 +333,7 @@ public class ExpressionCodegen extends JetVisitor<StackValue, StackValue> implem
new ImplementationBodyCodegen(declaration, objectContext, classBuilder, state, getParentCodegen()).generate();
if (declaration instanceof JetClass && ((JetClass) declaration).isInterface()) {
Type traitImplType = state.getTypeMapper().mapTraitImpl(descriptor);
Type traitImplType = state.getTypeMapper().mapDefaultImpls(descriptor);
ClassBuilder traitImplBuilder = state.getFactory().newVisitor(TraitImpl(declaration, descriptor), traitImplType, declaration.getContainingFile());
ClassContext traitImplContext = context.intoAnonymousClass(descriptor, this, OwnerKind.DEFAULT_IMPLS);
new InterfaceImplBodyCodegen(declaration, traitImplContext, traitImplBuilder, state, parentCodegen).generate();
compiler/backend/src/org/jetbrains/kotlin/codegen/ImplementationBodyCodegen.java
+1 -1
View File
@@ -1421,7 +1421,7 @@ public class ImplementationBodyCodegen extends ClassBodyCodegen {
}
ClassDescriptor containingTrait = (ClassDescriptor) containingDeclaration;
Type traitImplType = typeMapper.mapTraitImpl(containingTrait);
Type traitImplType = typeMapper.mapDefaultImpls(containingTrait);
Method traitMethod = typeMapper.mapSignature(traitFun.getOriginal(), OwnerKind.DEFAULT_IMPLS).getAsmMethod();
compiler/backend/src/org/jetbrains/kotlin/codegen/InterfaceImplBodyCodegen.kt
+1 -1
View File
@@ -46,7 +46,7 @@ public class InterfaceImplBodyCodegen(
override fun generateDeclaration() {
v.defineClass(
myClass, V1_6, ACC_PUBLIC or ACC_FINAL,
typeMapper.mapTraitImpl(descriptor).getInternalName(),
typeMapper.mapDefaultImpls(descriptor).getInternalName(),
null, "java/lang/Object", ArrayUtil.EMPTY_STRING_ARRAY
)
v.visitSource(myClass.getContainingFile().getName(), null)
compiler/backend/src/org/jetbrains/kotlin/codegen/MemberCodegen.java
+1 -1
View File
@@ -208,7 +208,7 @@ public abstract class MemberCodegen<T extends JetElement/* TODO: & JetDeclaratio
new ImplementationBodyCodegen(aClass, classContext, classBuilder, state, parentCodegen).generate();
if (aClass instanceof JetClass && ((JetClass) aClass).isInterface()) {
Type defaultImplsType = state.getTypeMapper().mapTraitImpl(descriptor);
Type defaultImplsType = state.getTypeMapper().mapDefaultImpls(descriptor);
ClassBuilder defaultImplsBuilder = state.getFactory().newVisitor(TraitImpl(aClass, descriptor), defaultImplsType, aClass.getContainingFile());
ClassContext defaultImplsContext = parentContext.intoClass(descriptor, OwnerKind.DEFAULT_IMPLS, state);
new InterfaceImplBodyCodegen(aClass, defaultImplsContext, defaultImplsBuilder, state, parentCodegen).generate();
compiler/backend/src/org/jetbrains/kotlin/codegen/PropertyCodegen.java
+1 -1
View File
@@ -260,7 +260,7 @@ public class PropertyCodegen {
mv.visitEnd();
}
else {
Type tImplType = typeMapper.mapTraitImpl((ClassDescriptor) context.getContextDescriptor());
Type tImplType = typeMapper.mapDefaultImpls((ClassDescriptor) context.getContextDescriptor());
v.getSerializationBindings().put(IMPL_CLASS_NAME_FOR_CALLABLE, descriptor, shortNameByAsmType(tImplType));
}
compiler/backend/src/org/jetbrains/kotlin/codegen/state/JetTypeMapper.java
+3 -3
View File
@@ -473,7 +473,7 @@ public class JetTypeMapper {
}
@NotNull
public Type mapTraitImpl(@NotNull ClassDescriptor descriptor) {
public Type mapDefaultImpls(@NotNull ClassDescriptor descriptor) {
return Type.getObjectType(mapType(descriptor).getInternalName() + JvmAbi.DEFAULT_IMPLS_SUFFIX);
}
@@ -621,7 +621,7 @@ public class JetTypeMapper {
ClassDescriptor ownerForDefault = (ClassDescriptor) findBaseDeclaration(functionDescriptor).getContainingDeclaration();
ownerForDefaultParam = mapClass(ownerForDefault);
ownerForDefaultImpl = isJvmInterface(ownerForDefault) ? mapTraitImpl(ownerForDefault) : ownerForDefaultParam;
ownerForDefaultImpl = isJvmInterface(ownerForDefault) ? mapDefaultImpls(ownerForDefault) : ownerForDefaultParam;
if (isInterface && (superCall || descriptor.getVisibility() == Visibilities.PRIVATE)) {
thisClass = mapClass(currentOwner);
@@ -633,7 +633,7 @@ public class JetTypeMapper {
else {
invokeOpcode = INVOKESTATIC;
signature = mapSignature(descriptor.getOriginal(), OwnerKind.DEFAULT_IMPLS);
owner = mapTraitImpl(currentOwner);
owner = mapDefaultImpls(currentOwner);
}
}
else {
idea/src/org/jetbrains/kotlin/idea/debugger/JetPositionManager.kt
+1 -1
View File
@@ -426,7 +426,7 @@ public class JetPositionManager(private val myDebugProcess: DebugProcess) : Mult
}
if (jetClass is JetClass && jetClass.isInterface()) {
return typeMapper.mapTraitImpl(classDescriptor).getInternalName()
return typeMapper.mapDefaultImpls(classDescriptor).getInternalName()
}
return typeMapper.mapClass(classDescriptor).getInternalName()