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

Minor. Simplified, reformatted, got rid of warnings.

Browse Source
This commit is contained in:
Evgeny Gerashchenko
2013-03-28 21:07:32 +04:00
parent 056c7e0df3
commit e5d14f6970
2 changed files with 6 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/backend/src/org/jetbrains/jet/codegen/ClosureCodegen.java
+1 -3
View File
@@ -303,13 +303,11 @@ public class ClosureCodegen extends GenerationStateAware {
} }
private static FunctionDescriptor getInvokeFunction(FunctionDescriptor funDescriptor) { private static FunctionDescriptor getInvokeFunction(FunctionDescriptor funDescriptor) {
FunctionDescriptor interfaceFunction;
int paramCount = funDescriptor.getValueParameters().size(); int paramCount = funDescriptor.getValueParameters().size();
KotlinBuiltIns builtIns = KotlinBuiltIns.getInstance(); KotlinBuiltIns builtIns = KotlinBuiltIns.getInstance();
ClassDescriptor funClass = funDescriptor.getReceiverParameter() == null ClassDescriptor funClass = funDescriptor.getReceiverParameter() == null
? builtIns.getFunction(paramCount) ? builtIns.getFunction(paramCount)
: builtIns.getExtensionFunction(paramCount); : builtIns.getExtensionFunction(paramCount);
interfaceFunction = funClass.getDefaultType().getMemberScope().getFunctions(Name.identifier("invoke")).iterator().next(); return funClass.getDefaultType().getMemberScope().getFunctions(Name.identifier("invoke")).iterator().next();
return interfaceFunction;
} }
} }
compiler/backend/src/org/jetbrains/jet/codegen/SamWrapperCodegen.java
+5 -2
View File
@@ -25,7 +25,10 @@ import org.jetbrains.jet.codegen.context.CodegenContext;
import org.jetbrains.jet.codegen.state.GenerationState; import org.jetbrains.jet.codegen.state.GenerationState;
import org.jetbrains.jet.codegen.state.GenerationStateAware; import org.jetbrains.jet.codegen.state.GenerationStateAware;
import org.jetbrains.jet.codegen.state.JetTypeMapperMode; import org.jetbrains.jet.codegen.state.JetTypeMapperMode;
import org.jetbrains.jet.lang.descriptors.*; import org.jetbrains.jet.lang.descriptors.CallableDescriptor;
import org.jetbrains.jet.lang.descriptors.ClassDescriptor;
import org.jetbrains.jet.lang.descriptors.FunctionDescriptor;
import org.jetbrains.jet.lang.descriptors.SimpleFunctionDescriptor;
import org.jetbrains.jet.lang.psi.JetCallExpression; import org.jetbrains.jet.lang.psi.JetCallExpression;
import org.jetbrains.jet.lang.psi.JetExpression; import org.jetbrains.jet.lang.psi.JetExpression;
import org.jetbrains.jet.lang.resolve.BindingContext; import org.jetbrains.jet.lang.resolve.BindingContext;
@@ -75,7 +78,7 @@ public class SamWrapperCodegen extends GenerationStateAware {
ACC_FINAL, ACC_FINAL,
name.getInternalName(), name.getInternalName(),
null, null,
JvmClassName.byType(OBJECT_TYPE).getInternalName(), OBJECT_TYPE.getInternalName(),
new String[]{JvmClassName.byClassDescriptor(samInterface).getInternalName()} new String[]{JvmClassName.byClassDescriptor(samInterface).getInternalName()}
); );
cv.visitSource(callExpression.getContainingFile().getName(), null); cv.visitSource(callExpression.getContainingFile().getName(), null);