Merge remote-tracking branch 'origin/master'
Conflicts: js/js.translator/src/org/jetbrains/k2js/translate/intrinsic/functions/factories/RangesFIF.java js/js.translator/src/org/jetbrains/k2js/translate/intrinsic/functions/patterns/NamePredicate.java
This commit is contained in:
@@ -1,11 +0,0 @@
|
||||
package foo
|
||||
|
||||
import java.util.ArrayList
|
||||
|
||||
fun box() : Boolean {
|
||||
var elems = ArrayList<Int>()
|
||||
for (i in 4 downto 0) {
|
||||
elems.add(i)
|
||||
}
|
||||
return elems[0] == 4 && elems[1] == 3 && elems[2] == 2 && elems[3] == 1 && elems[4] == 0
|
||||
}
|
||||
@@ -4,7 +4,7 @@ import java.util.ArrayList
|
||||
|
||||
fun box() : Boolean {
|
||||
var elems = ArrayList<Int>()
|
||||
for (i in 0 upto 5) {
|
||||
for (i in 0 rangeTo 5) {
|
||||
elems.add(i)
|
||||
}
|
||||
return elems[0] == 0 && elems[1] == 1 && elems[2] == 2 && elems[3] == 3 && elems[4] == 4 && elems[5] == 5
|
||||
|
||||
+1
-4
@@ -3,10 +3,7 @@ package foo
|
||||
import java.util.ArrayList
|
||||
|
||||
fun box() : Boolean {
|
||||
for (i in 0 upto -1) {
|
||||
return false
|
||||
}
|
||||
for (i in 0 downto 1) {
|
||||
for (i in 0 rangeTo -1) {
|
||||
return false
|
||||
}
|
||||
return true
|
||||
Reference in New Issue
Block a user