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

Minor. TraitImplBodyCodegen -> InterfaceImplBodyCodegen

Browse Source
This commit is contained in:
Denis Zharkov
2015-09-24 18:51:23 +03:00
parent 27bc62bd8e
commit cb1bdfde52
3 changed files with 6 additions and 6 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
@@ -336,7 +336,7 @@ public class ExpressionCodegen extends JetVisitor<StackValue, StackValue> implem
Type traitImplType = state.getTypeMapper().mapTraitImpl(descriptor); Type traitImplType = state.getTypeMapper().mapTraitImpl(descriptor);
ClassBuilder traitImplBuilder = state.getFactory().newVisitor(TraitImpl(declaration, descriptor), traitImplType, declaration.getContainingFile()); ClassBuilder traitImplBuilder = state.getFactory().newVisitor(TraitImpl(declaration, descriptor), traitImplType, declaration.getContainingFile());
ClassContext traitImplContext = context.intoAnonymousClass(descriptor, this, OwnerKind.DEFAULT_IMPLS); ClassContext traitImplContext = context.intoAnonymousClass(descriptor, this, OwnerKind.DEFAULT_IMPLS);
new TraitImplBodyCodegen(declaration, traitImplContext, traitImplBuilder, state, parentCodegen).generate(); new InterfaceImplBodyCodegen(declaration, traitImplContext, traitImplBuilder, state, parentCodegen).generate();
} }
return StackValue.none(); return StackValue.none();
compiler/backend/src/org/jetbrains/kotlin/codegen/TraitImplBodyCodegen.kt → compiler/backend/src/org/jetbrains/kotlin/codegen/InterfaceImplBodyCodegen.kt
+1 -1
View File
@@ -35,7 +35,7 @@ import org.jetbrains.org.objectweb.asm.Opcodes.ACC_FINAL
import org.jetbrains.org.objectweb.asm.Opcodes.ACC_PUBLIC import org.jetbrains.org.objectweb.asm.Opcodes.ACC_PUBLIC
import org.jetbrains.org.objectweb.asm.Opcodes.V1_6 import org.jetbrains.org.objectweb.asm.Opcodes.V1_6
public class TraitImplBodyCodegen( public class InterfaceImplBodyCodegen(
aClass: JetClassOrObject, aClass: JetClassOrObject,
context: ClassContext, context: ClassContext,
v: ClassBuilder, v: ClassBuilder,
compiler/backend/src/org/jetbrains/kotlin/codegen/MemberCodegen.java
+4 -4
View File
@@ -208,10 +208,10 @@ public abstract class MemberCodegen<T extends JetElement/* TODO: & JetDeclaratio
new ImplementationBodyCodegen(aClass, classContext, classBuilder, state, parentCodegen).generate(); new ImplementationBodyCodegen(aClass, classContext, classBuilder, state, parentCodegen).generate();
if (aClass instanceof JetClass && ((JetClass) aClass).isInterface()) { if (aClass instanceof JetClass && ((JetClass) aClass).isInterface()) {
Type traitImplType = state.getTypeMapper().mapTraitImpl(descriptor); Type defaultImplsType = state.getTypeMapper().mapTraitImpl(descriptor);
ClassBuilder traitImplBuilder = state.getFactory().newVisitor(TraitImpl(aClass, descriptor), traitImplType, aClass.getContainingFile()); ClassBuilder defaultImplsBuilder = state.getFactory().newVisitor(TraitImpl(aClass, descriptor), defaultImplsType, aClass.getContainingFile());
ClassContext traitImplContext = parentContext.intoClass(descriptor, OwnerKind.DEFAULT_IMPLS, state); ClassContext defaultImplsContext = parentContext.intoClass(descriptor, OwnerKind.DEFAULT_IMPLS, state);
new TraitImplBodyCodegen(aClass, traitImplContext, traitImplBuilder, state, parentCodegen).generate(); new InterfaceImplBodyCodegen(aClass, defaultImplsContext, defaultImplsBuilder, state, parentCodegen).generate();
} }
} }