From 39daa11e132ec73043653c5cf3d772ef0984de29 Mon Sep 17 00:00:00 2001
From: Evgeny Gerashchenko <Evgeny.Gerashchenko@jetbrains.com>
Date: Wed, 8 Aug 2012 17:25:16 +0400
Subject: [PATCH] Fixed maven build. Renamed usages of upto to rangeTo.
 Excluded DownTo.kt from js lib compilation.

---
 .../kotlin/org/jetbrains/kotlin/doc/model/KotlinModel.kt    | 6 +++---
 libraries/tools/kotlin-js-library/pom.xml                   | 1 +
 runtime/src/jet/IntRange.java                               | 4 ++--
 3 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/libraries/tools/kdoc/src/main/kotlin/org/jetbrains/kotlin/doc/model/KotlinModel.kt b/libraries/tools/kdoc/src/main/kotlin/org/jetbrains/kotlin/doc/model/KotlinModel.kt
index fb8a343a180..17e6041964a 100644
--- a/libraries/tools/kdoc/src/main/kotlin/org/jetbrains/kotlin/doc/model/KotlinModel.kt
+++ b/libraries/tools/kdoc/src/main/kotlin/org/jetbrains/kotlin/doc/model/KotlinModel.kt
@@ -517,7 +517,7 @@ class KModel(val context: BindingContext, val config: KDocConfig, val sourceDirs
             // lets remove the /** ... * ... */ tokens
             val buffer = StringBuilder()
             val last = lines.size - 1
-            for (i in 0.upto(last)) {
+            for (i in 0.rangeTo(last)) {
                 var text = lines[i] ?: ""
                 text = text.trim()
                 if (i == 0) {
@@ -630,7 +630,7 @@ $highlight"""
                 break
             }
             var count = 1
-            for (i in 0.upto(remaining.size - 1)) {
+            for (i in 0.rangeTo(remaining.size - 1)) {
                 val ch = remaining[i]
                 if (ch == '{') count ++
                 else if (ch == '}') {
@@ -653,7 +653,7 @@ $highlight"""
         // lets try resolve the include name relative to this file
         val paths = relativeName.split("/")
         val size = paths.size
-        for (i in 0.upto(size - 2)) {
+        for (i in 0.rangeTo(size - 2)) {
             val path = paths[i]
             if (path == ".") continue
             else if (path == "..") dir = dir?.getParent()
diff --git a/libraries/tools/kotlin-js-library/pom.xml b/libraries/tools/kotlin-js-library/pom.xml
index 1fd4600c6d7..a4b54ec0dca 100644
--- a/libraries/tools/kotlin-js-library/pom.xml
+++ b/libraries/tools/kotlin-js-library/pom.xml
@@ -72,6 +72,7 @@
                                     <fileset dir="${basedir}/../../stdlib/src/generated">
                                         <include name="*.kt"/>
                                         <exclude name="**/*JVM.kt"/>
+                                        <exclude name="DownTo.kt"/>
 <!--
                                         <include name="JUtilIteratorsFromJLangIterables.kt"/>
                                         <include name="JUtilIterablesFromJUtilCollections.kt"/>
diff --git a/runtime/src/jet/IntRange.java b/runtime/src/jet/IntRange.java
index 913bc287717..693e21a6077 100644
--- a/runtime/src/jet/IntRange.java
+++ b/runtime/src/jet/IntRange.java
@@ -33,9 +33,9 @@ public final class IntRange implements Range<Integer>, IntIterable {
     @Override
     public String toString() {
         if (count >= 0) {
-            return getStart() + ".upto(" + getEnd() + ")";
+            return getStart() + ".rangeTo(" + getEnd() + ")";
         } else {
-            return getStart() + ".downto(" + getEnd() + ")";
+            return getStart() + ".downTo(" + getEnd() + ")";
         }
     }