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

Minor: Formatting changed

Browse Source
This commit is contained in:
Alexey Sedunov
2014-06-19 16:17:39 +04:00
parent 1a16c515f3
commit 7b439c2173
2 changed files with 25 additions and 33 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/frontend/src/org/jetbrains/jet/lang/cfg/JetControlFlowProcessor.java
+19 -17
View File
@@ -555,16 +555,12 @@ public class JetControlFlowProcessor {
@NotNull AccessTarget target,
@Nullable PseudoValue rightValue,
@NotNull Map<PseudoValue, ReceiverValue> receiverValues,
@NotNull JetExpression parentExpression) {
@NotNull JetExpression parentExpression
) {
VariableDescriptor descriptor = BindingContextUtils.extractVariableDescriptorIfAny(trace.getBindingContext(), left, false);
if (descriptor != null) {
builder.write(
parentExpression,
left,
rightValue != null ? rightValue : createSyntheticValue(parentExpression),
target,
receiverValues
);
PseudoValue rValue = rightValue != null ? rightValue : createSyntheticValue(parentExpression);
builder.write(parentExpression, left, rValue, target, receiverValues);
}
}
@@ -1142,15 +1138,21 @@ public class JetControlFlowProcessor {
builder.declareVariable(entry);
ResolvedCall<FunctionDescriptor> resolvedCall = trace.get(BindingContext.COMPONENT_RESOLVED_CALL, entry);
PseudoValue writtenValue = resolvedCall != null
? builder.call(
entry,
entry,
resolvedCall,
getReceiverValues(initializer, resolvedCall, false),
Collections.<PseudoValue, ValueParameterDescriptor>emptyMap()
).getOutputValue()
: createSyntheticValue(entry, initializer);
PseudoValue writtenValue;
if (resolvedCall != null) {
writtenValue = builder.call(
entry,
entry,
resolvedCall,
getReceiverValues(initializer, resolvedCall, false),
Collections.<PseudoValue, ValueParameterDescriptor>emptyMap()
).getOutputValue();
}
else {
writtenValue = createSyntheticValue(entry, initializer);
}
if (generateWriteForEntries) {
generateInitializer(entry, writtenValue != null ? writtenValue : createSyntheticValue(entry));
}
compiler/frontend/src/org/jetbrains/jet/lang/cfg/pseudocode/instructions/eval/operationInstructions.kt
+6 -16
View File
@@ -107,16 +107,11 @@ public class MagicInstruction(
inputValues: List<PseudoValue>,
val expectedTypes: Map<PseudoValue, TypePredicate>
) : OperationInstruction(element, lexicalScope, inputValues), StrictlyValuedOperationInstruction {
override fun accept(visitor: InstructionVisitor) {
visitor.visitMagic(this)
}
override fun accept(visitor: InstructionVisitor) = visitor.visitMagic(this)
override fun <R> accept(visitor: InstructionVisitorWithResult<R>): R {
return visitor.visitMagic(this)
}
override fun <R> accept(visitor: InstructionVisitorWithResult<R>): R = visitor.visitMagic(this)
override fun createCopy() =
MagicInstruction(element, lexicalScope, synthetic, inputValues, expectedTypes).setResult(resultValue)
override fun createCopy() = MagicInstruction(element, lexicalScope, synthetic, inputValues, expectedTypes).setResult(resultValue)
override fun toString() = renderInstruction("magic", render(element))
@@ -141,16 +136,11 @@ class MergeInstruction private(
lexicalScope: LexicalScope,
inputValues: List<PseudoValue>
): OperationInstruction(element, lexicalScope, inputValues), StrictlyValuedOperationInstruction {
override fun accept(visitor: InstructionVisitor) {
visitor.visitMerge(this)
}
override fun accept(visitor: InstructionVisitor) = visitor.visitMerge(this)
override fun <R> accept(visitor: InstructionVisitorWithResult<R>): R {
return visitor.visitMerge(this)
}
override fun <R> accept(visitor: InstructionVisitorWithResult<R>): R = visitor.visitMerge(this)
override fun createCopy() =
MergeInstruction(element, lexicalScope, inputValues).setResult(resultValue)
override fun createCopy() = MergeInstruction(element, lexicalScope, inputValues).setResult(resultValue)
override fun toString() = renderInstruction("merge", render(element))