From b3ceae05e34b85336e0940c947104a98a5a104fc Mon Sep 17 00:00:00 2001 From: Andrey Breslav Date: Fri, 15 Apr 2011 19:47:49 +0400 Subject: [PATCH] hasBlockBody() fixed --- .../jetbrains/jet/lang/cfg/JetControlFlowProcessor.java | 1 + idea/src/org/jetbrains/jet/lang/psi/JetFunction.java | 2 +- .../jetbrains/jet/lang/resolve/BindingTraceContext.java | 1 + .../jet/lang/types/nullability/NullabilityDomain.java | 8 ++++++++ 4 files changed, 11 insertions(+), 1 deletion(-) create mode 100644 idea/src/org/jetbrains/jet/lang/types/nullability/NullabilityDomain.java diff --git a/idea/src/org/jetbrains/jet/lang/cfg/JetControlFlowProcessor.java b/idea/src/org/jetbrains/jet/lang/cfg/JetControlFlowProcessor.java index 1886efeddb9..fac01ff688b 100644 --- a/idea/src/org/jetbrains/jet/lang/cfg/JetControlFlowProcessor.java +++ b/idea/src/org/jetbrains/jet/lang/cfg/JetControlFlowProcessor.java @@ -188,6 +188,7 @@ public class JetControlFlowProcessor { JetArrayAccessExpression arrayAccessExpression = (JetArrayAccessExpression) left; visitAssignToArrayAccess(expression, arrayAccessExpression); } else if (left instanceof JetQualifiedExpression) { + // JetQualifiedExpression qualifiedExpression = (JetQualifiedExpression) left; value(qualifiedExpression.getReceiverExpression(), false, false); value(expression.getOperationReference(), false, false); diff --git a/idea/src/org/jetbrains/jet/lang/psi/JetFunction.java b/idea/src/org/jetbrains/jet/lang/psi/JetFunction.java index 6ad6045afc8..5dc52c9c05c 100644 --- a/idea/src/org/jetbrains/jet/lang/psi/JetFunction.java +++ b/idea/src/org/jetbrains/jet/lang/psi/JetFunction.java @@ -76,6 +76,6 @@ public class JetFunction extends JetTypeParameterListOwner implements JetDeclara } public boolean hasBlockBody() { - return findChildByType(JetTokens.EQ) != null; + return findChildByType(JetTokens.EQ) == null; } } diff --git a/idea/src/org/jetbrains/jet/lang/resolve/BindingTraceContext.java b/idea/src/org/jetbrains/jet/lang/resolve/BindingTraceContext.java index 7bc55e59a4f..26bcdc43135 100644 --- a/idea/src/org/jetbrains/jet/lang/resolve/BindingTraceContext.java +++ b/idea/src/org/jetbrains/jet/lang/resolve/BindingTraceContext.java @@ -66,6 +66,7 @@ public class BindingTraceContext extends BindingTrace implements BindingContext private void safePut(Map map, K key, V value) { V oldValue = map.put(key, value); + // TODO: // assert oldValue == null || oldValue == value : key + ": " + oldValue + " and " + value; } diff --git a/idea/src/org/jetbrains/jet/lang/types/nullability/NullabilityDomain.java b/idea/src/org/jetbrains/jet/lang/types/nullability/NullabilityDomain.java new file mode 100644 index 00000000000..60247c6f8c1 --- /dev/null +++ b/idea/src/org/jetbrains/jet/lang/types/nullability/NullabilityDomain.java @@ -0,0 +1,8 @@ +package org.jetbrains.jet.lang.types.nullability; + +/** + * @author abreslav + */ +public class NullabilityDomain { + +}