NPE on unfinished function declaration fixed

2011-09-07 13:22:47 +04:00
parent 2f4377d7c0
commit d9137f18cc
2 changed files with 24 additions and 20 deletions
@@ -115,6 +115,22 @@ fun blockReturnValueTypeMatch() : Int {
 fun blockNoReturnIfValDeclaration(): Int {
  <error>val x = 1</error>
 }
+fun blockNoReturnIfEmptyIf(): Int {
+  if (1 < 2) <error>{}</error> else <error>{}</error>
+}
+fun blockNoReturnIfUnitInOneBranch(): Int {
+  if (1 < 2) {
+    return 1
+  } else {
+    if (3 < 4) <error>{
+    }</error> else {
+      return 2
+    }
+  }
+}
+fun nonBlockReturnIfEmptyIf(): Int = if (1 < 2) <error>{}</error> else <error>{}</error>
+fun nonBlockNoReturnIfUnitInOneBranch(): Int = if (1 < 2) <error>{}</error> else 2
+
 val a = <error>return 1</error>

 class A() {
@@ -148,18 +164,3 @@ fun f(): Int {
 }

 fun f(): Int = if (1 < 2) 1 else returnNothing()
-
-fun blockNoReturnIfEmptyIf(): Int {
-    if (1 < 2) <error>{}</error> else <error>{}</error>
-}
-
-fun blockNoReturnIfUnitInOneBranch(): Int {
-  if (1 < 2) {
-    return 1
-  } else {
-    if (3 < 4) <error>{
-    }</error> else {
-      return 21
-    }
-  }
-}