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

An exception fixed

Browse Source
This commit is contained in:
Andrey Breslav
2012-03-23 18:11:43 +01:00
parent aae196839e
commit d27138e252
2 changed files with 7 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/frontend/src/org/jetbrains/jet/lang/resolve/calls/CallResolver.java
+3
View File
@@ -639,6 +639,9 @@ public class CallResolver {
List<JetExpression> argumentExpressions = resolvedArgument.getArgumentExpressions(); List<JetExpression> argumentExpressions = resolvedArgument.getArgumentExpressions();
for (JetExpression argumentExpression : argumentExpressions) { for (JetExpression argumentExpression : argumentExpressions) {
if (argumentExpression == null) {
throw new IllegalStateException("A null instead of an expression in the arguments for " + entry.getKey());
}
JetType type = expressionTypingServices.getType(context.scope, argumentExpression, parameterType, context.dataFlowInfo, context.candidateCall.getTrace()); JetType type = expressionTypingServices.getType(context.scope, argumentExpression, parameterType, context.dataFlowInfo, context.candidateCall.getTrace());
if (type == null || ErrorUtils.isErrorType(type)) { if (type == null || ErrorUtils.isErrorType(type)) {
context.candidateCall.argumentHasNoType(); context.candidateCall.argumentHasNoType();
compiler/frontend/src/org/jetbrains/jet/lang/resolve/calls/ValueArgumentsToParametersMapper.java
+4 -1
View File
@@ -200,7 +200,10 @@ import static org.jetbrains.jet.lang.resolve.BindingContext.REFERENCE_TARGET;
varargs.put(valueParameterDescriptor, vararg); varargs.put(valueParameterDescriptor, vararg);
candidateCall.recordValueArgument(valueParameterDescriptor, vararg); candidateCall.recordValueArgument(valueParameterDescriptor, vararg);
} }
vararg.getArgumentExpressions().add(valueArgument.getArgumentExpression()); JetExpression expression = valueArgument.getArgumentExpression();
if (expression != null) {
vararg.getArgumentExpressions().add(expression);
}
} }
else { else {
ResolvedValueArgument argument = new ExpressionValueArgument(valueArgument.getArgumentExpression()); ResolvedValueArgument argument = new ExpressionValueArgument(valueArgument.getArgumentExpression());