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

Resolve parenthesized element as expression

Browse Source
This commit is contained in:
Stanislav Erokhin
2015-02-03 21:51:21 +03:00
parent 3b92cab9e0
commit a33450395c
12 changed files with 26 additions and 43 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/frontend/src/org/jetbrains/kotlin/types/expressions/BasicExpressionTypingVisitor.java
+1 -5
View File
@@ -107,15 +107,11 @@ public class BasicExpressionTypingVisitor extends ExpressionTypingVisitor {
@Override
public JetTypeInfo visitParenthesizedExpression(@NotNull JetParenthesizedExpression expression, ExpressionTypingContext context) {
return visitParenthesizedExpression(expression, context, false);
}
public JetTypeInfo visitParenthesizedExpression(JetParenthesizedExpression expression, ExpressionTypingContext context, boolean isStatement) {
JetExpression innerExpression = expression.getExpression();
if (innerExpression == null) {
return JetTypeInfo.create(null, context.dataFlowInfo);
}
return facade.getTypeInfo(innerExpression, context.replaceScope(context.scope), isStatement);
return facade.getTypeInfo(innerExpression, context.replaceScope(context.scope));
}
@Override
compiler/frontend/src/org/jetbrains/kotlin/types/expressions/ExpressionTypingVisitorForStatements.java
-5
View File
@@ -415,11 +415,6 @@ public class ExpressionTypingVisitorForStatements extends ExpressionTypingVisito
return components.expressionTypingServices.getBlockReturnedType(expression, context, true);
}
@Override
public JetTypeInfo visitParenthesizedExpression(@NotNull JetParenthesizedExpression expression, ExpressionTypingContext context) {
return basic.visitParenthesizedExpression(expression, context, true);
}
@Override
public JetTypeInfo visitLabeledExpression(@NotNull JetLabeledExpression expression, ExpressionTypingContext context) {
return basic.visitLabeledExpression(expression, context, true);
compiler/testData/codegen/box/labels/labeledDeclarations2.kt
-16
View File
@@ -1,16 +0,0 @@
data class A(val a: Int, val b: Int)
fun box() : String
{
(@a val x = 1)
(@b fun a() = 2)
(@c val (z, z2) = A(1, 2))
if (x != 1) return "fail 1"
if (a() != 2) return "fail 2"
if (z != 1 || z2 != 2) return "fail 3"
return "OK"
}
compiler/testData/codegen/box/objects/kt560.kt
+1 -1
View File
@@ -15,7 +15,7 @@ open class AllEvenNum() {
}
}
(i = i + 1)
i = i + 1
}
}
compiler/testData/diagnostics/tests/BreakContinue.kt
+4 -4
View File
@@ -1,23 +1,23 @@
class C {
fun f (<!UNUSED_PARAMETER!>a<!> : Boolean, <!UNUSED_PARAMETER!>b<!> : Boolean) {
@b (while (true)
@b while (true)
@a {
<!NOT_A_LOOP_LABEL!>break@f<!>
break
<!UNREACHABLE_CODE!>break@b<!>
<!NOT_A_LOOP_LABEL!>break@a<!>
})
}
<!BREAK_OR_CONTINUE_OUTSIDE_A_LOOP!>continue<!>
@b (while (true)
@b while (true)
@a {
<!NOT_A_LOOP_LABEL!>continue@f<!>
continue
<!UNREACHABLE_CODE!>continue@b<!>
<!NOT_A_LOOP_LABEL!>continue@a<!>
})
}
<!BREAK_OR_CONTINUE_OUTSIDE_A_LOOP!>break<!>
compiler/testData/diagnostics/tests/deparenthesize/ParenthesizedVariable.kt
+3
View File
@@ -0,0 +1,3 @@
fun test() {
(@d <!DECLARATION_IN_ILLEGAL_CONTEXT!>val bar = 2<!>)
}
compiler/testData/diagnostics/tests/deparenthesize/ParenthesizedVariable.txt
+3
View File
@@ -0,0 +1,3 @@
package
internal fun test(): kotlin.Unit
compiler/tests/org/jetbrains/kotlin/checkers/JetDiagnosticsTestGenerated.java
+6
View File
@@ -3552,6 +3552,12 @@ public class JetDiagnosticsTestGenerated extends AbstractJetDiagnosticsTest {
String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/deparenthesize/checkDeparenthesizedType.kt");
doTest(fileName);
}
@TestMetadata("ParenthesizedVariable.kt")
public void testParenthesizedVariable() throws Exception {
String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/deparenthesize/ParenthesizedVariable.kt");
doTest(fileName);
}
}
@TestMetadata("compiler/testData/diagnostics/tests/duplicateJvmSignature")
compiler/tests/org/jetbrains/kotlin/codegen/generated/BlackBoxCodegenTestGenerated.java
-6
View File
@@ -4317,12 +4317,6 @@ public class BlackBoxCodegenTestGenerated extends AbstractBlackBoxCodegenTest {
doTest(fileName);
}
@TestMetadata("labeledDeclarations2.kt")
public void testLabeledDeclarations2() throws Exception {
String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/labels/labeledDeclarations2.kt");
doTest(fileName);
}
@TestMetadata("propertyAccessor.kt")
public void testPropertyAccessor() throws Exception {
String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/labels/propertyAccessor.kt");
idea/testData/checker/BreakContinue.kt
+6 -6
View File
@@ -1,23 +1,23 @@
class C {
fun f (<warning>a</warning> : Boolean, <warning>b</warning> : Boolean) {
@b (while (true)
@b (<error descr="[EXPRESSION_EXPECTED] While is not an expression, and only expressions are allowed here">while (true)
@a {
<error>break@f</error>
break
<warning>break@b</warning>
break@b
<error>break@a</error>
})
}</error>)
<error>continue</error>
@b (while (true)
@b (<error descr="[EXPRESSION_EXPECTED] While is not an expression, and only expressions are allowed here">while (true)
@a {
<error>continue@f</error>
continue
<warning>continue@b</warning>
continue@b
<error>continue@a</error>
})
}</error>)
<error>break</error>
idea/testData/quickfix/suppress/forStatement/afterAssign.kt
+1
View File
@@ -1,4 +1,5 @@
// "Suppress 'UNNECESSARY_NOT_NULL_ASSERTION' for statement " "true"
// ERROR: Assignments are not expressions, and only expressions are allowed in this context
fun foo() {
var x = 0
idea/testData/quickfix/suppress/forStatement/beforeAssign.kt
+1
View File
@@ -1,4 +1,5 @@
// "Suppress 'UNNECESSARY_NOT_NULL_ASSERTION' for statement " "true"
// ERROR: Assignments are not expressions, and only expressions are allowed in this context
fun foo() {
var x = 0