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

support for calls in pattern matching

Browse Source
This commit is contained in:
Dmitry Jemerov
2011-07-06 16:29:45 +02:00
parent e61f69437d
commit 50a1eeeb59
2 changed files with 29 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
idea/src/org/jetbrains/jet/codegen/ExpressionCodegen.java
+22 -1
View File
@@ -819,10 +819,14 @@ public class ExpressionCodegen extends JetVisitor {
} }
private void invokeMethodWithArguments(CallableMethod callableMethod, JetCallExpression expression) { private void invokeMethodWithArguments(CallableMethod callableMethod, JetCallExpression expression) {
invokeMethodWithArguments(callableMethod, expression, false);
}
private void invokeMethodWithArguments(CallableMethod callableMethod, JetCallExpression expression, final boolean haveReceiver) {
if (callableMethod.isOwnerFromCall()) { if (callableMethod.isOwnerFromCall()) {
setOwnerFromCall(callableMethod, expression); setOwnerFromCall(callableMethod, expression);
} }
if (callableMethod.needsReceiverOnStack()) { if (callableMethod.needsReceiverOnStack() && !haveReceiver) {
ensureReceiverOnStack(expression, callableMethod.getReceiverClass()); ensureReceiverOnStack(expression, callableMethod.getReceiverClass());
} }
pushMethodArguments(expression, callableMethod.getValueParameterTypes()); pushMethodArguments(expression, callableMethod.getValueParameterTypes());
@@ -1793,6 +1797,23 @@ public class ExpressionCodegen extends JetVisitor {
conditionValue = generatePatternMatch(pattern, patternCondition.isNegated(), conditionValue = generatePatternMatch(pattern, patternCondition.isNegated(),
StackValue.local(subjectLocal, subjectType)); StackValue.local(subjectLocal, subjectType));
} }
else if (condition instanceof JetWhenConditionCall) {
final JetExpression call = ((JetWhenConditionCall) condition).getCallSuffixExpression();
if (call instanceof JetCallExpression) {
v.load(subjectLocal, subjectType);
final DeclarationDescriptor declarationDescriptor = resolveCalleeDescriptor((JetCallExpression) call);
final PsiElement declaration = resolveCalleeToDeclaration(declarationDescriptor);
final CallableMethod callableMethod = typeMapper.mapToCallableMethod((PsiNamedElement) declaration);
if (callableMethod.getSignature().getReturnType() != Type.BOOLEAN_TYPE) {
throw new UnsupportedOperationException("calls in pattern matching must return boolean");
}
invokeMethodWithArguments(callableMethod, (JetCallExpression) call, true);
conditionValue = StackValue.onStack(Type.BOOLEAN_TYPE);
}
else {
throw new UnsupportedOperationException("unsupported kind of call suffix");
}
}
else { else {
throw new UnsupportedOperationException("unsupported kind of when condition"); throw new UnsupportedOperationException("unsupported kind of when condition");
} }
idea/tests/org/jetbrains/jet/codegen/PatternMatchingTest.java
+7
View File
@@ -69,4 +69,11 @@ public class PatternMatchingTest extends CodegenTestCase {
assertEquals("one,two", foo.invoke(null, new Tuple2<Integer, Integer>(1, 2))); assertEquals("one,two", foo.invoke(null, new Tuple2<Integer, Integer>(1, 2)));
assertEquals("something", foo.invoke(null, new Tuple2<String, String>("not", "tuple"))); assertEquals("something", foo.invoke(null, new Tuple2<String, String>("not", "tuple")));
} }
public void testCall() throws Exception {
loadText("fun foo(s: String) = when(s) { .startsWith(\"J\") => \"JetBrains\"; else => \"something\" }");
Method foo = generateFunction();
assertEquals("JetBrains", foo.invoke(null, "Java"));
assertEquals("something", foo.invoke(null, "C#"));
}
} }