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

generatePatternMatch() returns StackValue for result

Browse Source
This commit is contained in:
Dmitry Jemerov
2011-07-06 13:49:52 +02:00
parent 71f521c05d
commit 3fe728dff6
1 changed files with 12 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
idea/src/org/jetbrains/jet/codegen/ExpressionCodegen.java
+12 -8
View File
@@ -1621,20 +1621,21 @@ public class ExpressionCodegen extends JetVisitor {
@Override @Override
public void visitIsExpression(final JetIsExpression expression) { public void visitIsExpression(final JetIsExpression expression) {
generatePatternMatch(expression.getPattern(), expression.isNegated(), final StackValue match = StackValue.expression(OBJECT_TYPE, expression.getLeftHandSide(), this);
StackValue.expression(OBJECT_TYPE, expression.getLeftHandSide(), this)); StackValue result = generatePatternMatch(expression.getPattern(), expression.isNegated(), match);
myStack.push(result);
} }
private void generatePatternMatch(JetPattern pattern, boolean negated, StackValue expressionToMatch) { private StackValue generatePatternMatch(JetPattern pattern, boolean negated, StackValue expressionToMatch) {
if (pattern instanceof JetTypePattern) { if (pattern instanceof JetTypePattern) {
JetTypeReference typeReference = ((JetTypePattern) pattern).getTypeReference(); JetTypeReference typeReference = ((JetTypePattern) pattern).getTypeReference();
JetType jetType = bindingContext.resolveTypeReference(typeReference); JetType jetType = bindingContext.resolveTypeReference(typeReference);
generateInstanceOf(expressionToMatch, jetType, false); generateInstanceOf(expressionToMatch, jetType, false);
StackValue value = StackValue.onStack(Type.BOOLEAN_TYPE); StackValue value = StackValue.onStack(Type.BOOLEAN_TYPE);
myStack.push(negated ? StackValue.not(value) : value); return negated ? StackValue.not(value) : value;
} }
else if (pattern instanceof JetWildcardPattern) { else if (pattern instanceof JetWildcardPattern) {
myStack.push(StackValue.constant(!negated, Type.BOOLEAN_TYPE)); return StackValue.constant(!negated, Type.BOOLEAN_TYPE);
} }
else { else {
throw new UnsupportedOperationException("Unsupported pattern type: " + pattern); throw new UnsupportedOperationException("Unsupported pattern type: " + pattern);
@@ -1731,29 +1732,32 @@ public class ExpressionCodegen extends JetVisitor {
nextEntry = new Label(); nextEntry = new Label();
if (!whenEntry.isElse()) { if (!whenEntry.isElse()) {
JetWhenCondition condition = whenEntry.getCondition(); JetWhenCondition condition = whenEntry.getCondition();
StackValue conditionValue;
if (condition instanceof JetWhenConditionWithExpression) { if (condition instanceof JetWhenConditionWithExpression) {
v.load(subjectLocal, subjectType); v.load(subjectLocal, subjectType);
JetExpression condExpression = ((JetWhenConditionWithExpression) condition).getExpression(); JetExpression condExpression = ((JetWhenConditionWithExpression) condition).getExpression();
Type condType = expressionType(condExpression); Type condType = expressionType(condExpression);
gen(condExpression, condType); gen(condExpression, condType);
generateEqualsForExpressionsOnStack(JetTokens.EQEQ, subjectType, condType); generateEqualsForExpressionsOnStack(JetTokens.EQEQ, subjectType, condType);
conditionValue = myStack.pop();
} }
else if (condition instanceof JetWhenConditionInRange) { else if (condition instanceof JetWhenConditionInRange) {
JetExpression range = ((JetWhenConditionInRange) condition).getRangeExpression(); JetExpression range = ((JetWhenConditionInRange) condition).getRangeExpression();
gen(range, RANGE_TYPE); gen(range, RANGE_TYPE);
new StackValue.Local(subjectLocal, subjectType).put(INTEGER_TYPE, v); new StackValue.Local(subjectLocal, subjectType).put(INTEGER_TYPE, v);
v.invokeinterface(CLASS_RANGE, "contains", "(Ljava/lang/Comparable;)Z"); v.invokeinterface(CLASS_RANGE, "contains", "(Ljava/lang/Comparable;)Z");
myStack.push(new StackValue.OnStack(Type.BOOLEAN_TYPE)); conditionValue = new StackValue.OnStack(Type.BOOLEAN_TYPE);
} }
else if (condition instanceof JetWhenConditionIsPattern) { else if (condition instanceof JetWhenConditionIsPattern) {
JetWhenConditionIsPattern patternCondition = (JetWhenConditionIsPattern) condition; JetWhenConditionIsPattern patternCondition = (JetWhenConditionIsPattern) condition;
JetPattern pattern = patternCondition.getPattern(); JetPattern pattern = patternCondition.getPattern();
generatePatternMatch(pattern, patternCondition.isNegated(), StackValue.local(subjectLocal, subjectType)); conditionValue = generatePatternMatch(pattern, patternCondition.isNegated(),
StackValue.local(subjectLocal, subjectType));
} }
else { else {
throw new UnsupportedOperationException("unsupported kind of when condition"); throw new UnsupportedOperationException("unsupported kind of when condition");
} }
myStack.pop().condJump(nextEntry, true, v); conditionValue.condJump(nextEntry, true, v);
} }
else { else {
hasElse = true; hasElse = true;