Merge branch 'master' of ssh://git.labs.intellij.net/jet

Conflicts: compiler/tests/org/jetbrains/jet/cfg/JetControlFlowTest.java
2011-10-21 17:13:09 +04:00
parent 2df7f1324a d445a09a80
commit b31f4b5251
674 changed files with 3276 additions and 1589 deletions
@@ -0,0 +1,11 @@
+== short ==
+fun short() = 1
+---------------------
+l0:
+    <START>    NEXT:[r(1)]     PREV:[]
+    r(1)       NEXT:[<END>]    PREV:[<START>]
+l1:
+    <END>      NEXT:[]         PREV:[r(1)]
+error:
+    <ERROR>    NEXT:[]         PREV:[]
+=====================