honeymoose
/
OpenSearch
mirror of https://github.com/honeymoose/OpenSearch.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

painless: Some reformatting in EChain to make it clear if "this" or inner "expression" is affected

This commit is contained in:
Uwe Schindler 2016-05-16 21:04:03 +02:00
parent b05ac87a5d
commit d6cbbdeb98
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
modules/lang-painless/src/main/java/org/elasticsearch/painless/node/EChain.java
View File

@ -221,8 +221,8 @@ public final class EChain extends AExpression {
lastDef.storeValueType = last.after;
}
statement = true;
actual = read ? last.after : definition.voidType;
this.statement = true;
this.actual = read ? last.after : definition.voidType;
}
private void analyzeWrite(final CompilerSettings settings, final Definition definition, final Variables variables) {
@ -234,16 +234,16 @@ public final class EChain extends AExpression {
final ADefLink lastDef = (ADefLink) last;
expression.analyze(settings, definition, variables);
lastDef.storeValueType = expression.expected = expression.actual;
actual = read ? lastDef.storeValueType : definition.voidType;
this.actual = read ? lastDef.storeValueType : definition.voidType;
} else {
// otherwise we adapt the type of the expression to the store type
expression.expected = last.after;
expression.analyze(settings, definition, variables);
actual = read ? last.after : definition.voidType;
this.actual = read ? last.after : definition.voidType;
}
expression = expression.cast(settings, definition, variables);
statement = true;
this.statement = true;
}
private void analyzeRead() {