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,50 @@
+== main ==
+fun main() {
+    while(1 > 0) {
+      2
+    }
+}
+---------------------
+l0:
+    <START>        NEXT:[r(1)]                 PREV:[]
+l2:
+l5:
+    r(1)           NEXT:[r(0)]                 PREV:[<START>, jmp(l2)]
+    r(0)           NEXT:[r(>)]                 PREV:[r(1)]
+    r(>)           NEXT:[r(1 > 0)]             PREV:[r(0)]
+    r(1 > 0)       NEXT:[jf(l3)]               PREV:[r(>)]
+    jf(l3)         NEXT:[read (Unit), r(2)]    PREV:[r(1 > 0)]
+l4:
+    r(2)           NEXT:[jmp(l2)]              PREV:[jf(l3)]
+    jmp(l2)        NEXT:[r(1)]                 PREV:[r(2)]
+l3:
+    read (Unit)    NEXT:[<END>]                PREV:[jf(l3)]
+l1:
+    <END>          NEXT:[]                     PREV:[read (Unit)]
+error:
+    <ERROR>        NEXT:[]                     PREV:[]
+=====================
+== dowhile ==
+fun dowhile() {
+    do {return}
+    while(1 > 0)
+}
+---------------------
+l0:
+    <START>        NEXT:[ret l1]                 PREV:[]
+l2:
+l4:
+    ret l1         NEXT:[<END>]                  PREV:[<START>, jt(l2)]
+l5:
+    r(1)           NEXT:[r(0)]                   PREV:[]
+    r(0)           NEXT:[r(>)]                   PREV:[r(1)]
+    r(>)           NEXT:[r(1 > 0)]               PREV:[r(0)]
+    r(1 > 0)       NEXT:[jt(l2)]                 PREV:[r(>)]
+    jt(l2)         NEXT:[read (Unit), ret l1]    PREV:[r(1 > 0)]
+l3:
+    read (Unit)    NEXT:[<END>]                  PREV:[jt(l2)]
+l1:
+    <END>          NEXT:[]                       PREV:[ret l1, read (Unit)]
+error:
+    <ERROR>        NEXT:[]                       PREV:[]
+=====================