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

Reformat ControlFlowProcessor according to code style

Browse Source
This commit is contained in:
Dmitriy Novozhilov
2018-09-24 13:55:08 +03:00
committed by Dmitriy Novozhilov
parent 80835fe6ea
commit fa79f7bf30
1 changed files with 9 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/frontend/src/org/jetbrains/kotlin/cfg/ControlFlowProcessor.kt
+9 -5
View File
@@ -186,7 +186,8 @@ class ControlFlowProcessor(
val expression = KtPsiUtil.deparenthesize(element) ?: return val expression = KtPsiUtil.deparenthesize(element) ?: return
if (expression is KtStatementExpression || expression is KtTryExpression if (expression is KtStatementExpression || expression is KtTryExpression
|| expression is KtIfExpression || expression is KtWhenExpression) { || expression is KtIfExpression || expression is KtWhenExpression
) {
return return
} }
@@ -229,7 +230,7 @@ class ControlFlowProcessor(
private fun getResolvedCallAccessTarget(element: KtElement?): AccessTarget = private fun getResolvedCallAccessTarget(element: KtElement?): AccessTarget =
element.getResolvedCall(trace.bindingContext)?.let { AccessTarget.Call(it) } element.getResolvedCall(trace.bindingContext)?.let { AccessTarget.Call(it) }
?: AccessTarget.BlackBox ?: AccessTarget.BlackBox
private fun getDeclarationAccessTarget(element: KtElement): AccessTarget { private fun getDeclarationAccessTarget(element: KtElement): AccessTarget {
val descriptor = trace.get(BindingContext.DECLARATION_TO_DESCRIPTOR, element) val descriptor = trace.get(BindingContext.DECLARATION_TO_DESCRIPTOR, element)
@@ -923,7 +924,8 @@ class ControlFlowProcessor(
// Local class secondary constructors are handled differently // Local class secondary constructors are handled differently
// They are the only local class element NOT included in owner pseudocode // They are the only local class element NOT included in owner pseudocode
// See generateInitializersForScriptClassOrObject && generateDeclarationForLocalClassOrObjectIfNeeded // See generateInitializersForScriptClassOrObject && generateDeclarationForLocalClassOrObjectIfNeeded
labelExprEnclosingFunc is ConstructorDescriptor && !labelExprEnclosingFunc.isPrimary) { labelExprEnclosingFunc is ConstructorDescriptor && !labelExprEnclosingFunc.isPrimary
) {
trace.report(BREAK_OR_CONTINUE_JUMPS_ACROSS_FUNCTION_BOUNDARY.on(jumpExpression)) trace.report(BREAK_OR_CONTINUE_JUMPS_ACROSS_FUNCTION_BOUNDARY.on(jumpExpression))
} }
false false
@@ -1413,7 +1415,8 @@ class ControlFlowProcessor(
for (declaration in classOrObject.declarations) { for (declaration in classOrObject.declarations) {
if (declaration is KtSecondaryConstructor || if (declaration is KtSecondaryConstructor ||
declaration is KtProperty || declaration is KtProperty ||
declaration is KtAnonymousInitializer) { declaration is KtAnonymousInitializer
) {
continue continue
} }
generateInstructions(declaration) generateInstructions(declaration)
@@ -1488,7 +1491,8 @@ class ControlFlowProcessor(
mark(expression) mark(expression)
val receiverExpression = expression.receiverExpression val receiverExpression = expression.receiverExpression
if (receiverExpression != null && if (receiverExpression != null &&
trace.bindingContext.get(BindingContext.DOUBLE_COLON_LHS, receiverExpression) is DoubleColonLHS.Expression) { trace.bindingContext.get(BindingContext.DOUBLE_COLON_LHS, receiverExpression) is DoubleColonLHS.Expression
) {
generateInstructions(receiverExpression) generateInstructions(receiverExpression)
createNonSyntheticValue(expression, MagicKind.BOUND_CALLABLE_REFERENCE, receiverExpression) createNonSyntheticValue(expression, MagicKind.BOUND_CALLABLE_REFERENCE, receiverExpression)
} else { } else {