From 7f1f2aa6413b7a4285f68cc3a91efd7c1e307ec9 Mon Sep 17 00:00:00 2001
From: develar <develar@gmail.com>
Date: Fri, 21 Jun 2013 16:21:28 +0400
Subject: [PATCH] Dropped get_hasNext (hasNext property) from js library files.

---
 js/js.translator/testFiles/kotlin_lib.js       | 12 +++---------
 js/js.translator/testFiles/kotlin_lib_ecma5.js |  9 +++------
 js/js.translator/testFiles/maps.js             |  8 ++++----
 3 files changed, 10 insertions(+), 19 deletions(-)

diff --git a/js/js.translator/testFiles/kotlin_lib.js b/js/js.translator/testFiles/kotlin_lib.js
index b325a5aa63b..d376e093b3e 100644
--- a/js/js.translator/testFiles/kotlin_lib.js
+++ b/js/js.translator/testFiles/kotlin_lib.js
@@ -116,9 +116,6 @@ var kotlin = {set:function (receiver, key, value) {
         next: function () {
             return this.array[this.index++];
         },
-        get_hasNext: function () {
-            return this.index < this.size;
-        },
         hasNext: function () {
             return this.index < this.size;
         }
@@ -132,9 +129,6 @@ var kotlin = {set:function (receiver, key, value) {
         },
         next: function () {
             return this.list.get(this.index++);
-        },
-        get_hasNext: function () {
-            return this.index < this.size;
         }
     });
 
@@ -379,8 +373,8 @@ var kotlin = {set:function (receiver, key, value) {
             this.set_i(this.$i + this.$increment);
             return value;
         },
-        get_hasNext: function () {
-            return this.$increment > 0 ? this.$next <= this.$end : this.$next >= this.$end;
+        hasNext: function () {
+            return this.get_count() > 0;
         }
     });
 
@@ -449,7 +443,7 @@ var kotlin = {set:function (receiver, key, value) {
             throw Kotlin.Exception();
         }
         var max = it.next();
-        while (it.get_hasNext()) {
+        while (it.hasNext()) {
             var el = it.next();
             if (comp.compare(max, el) < 0) {
                 max = el;
diff --git a/js/js.translator/testFiles/kotlin_lib_ecma5.js b/js/js.translator/testFiles/kotlin_lib_ecma5.js
index bee9e704943..cea232dfba6 100644
--- a/js/js.translator/testFiles/kotlin_lib_ecma5.js
+++ b/js/js.translator/testFiles/kotlin_lib_ecma5.js
@@ -175,12 +175,9 @@ var Kotlin = Object.create(null);
                     initializer = value;
                 }
                 else if (name.indexOf("get_") === 0) {
-                    // our std lib contains collision: hasNext property vs hasNext as function, we prefer function (actually, it does work)
-                    var getterName = name.substring(4);
-                    if (!descriptors.hasOwnProperty(getterName)) {
-                        descriptors[getterName] = {get: value};
-                        descriptors[name] = {value: value};
-                    }
+                    descriptors[name.substring(4)] = {get: value};
+                    // std lib code can refers to
+                    descriptors[name] = {value: value};
                 }
                 else if (name.indexOf("set_") === 0) {
                     descriptors[name.substring(4)] = {set: value};
diff --git a/js/js.translator/testFiles/maps.js b/js/js.translator/testFiles/maps.js
index ffc18118fc2..e9d381b5e04 100644
--- a/js/js.translator/testFiles/maps.js
+++ b/js/js.translator/testFiles/maps.js
@@ -404,7 +404,7 @@ Kotlin.ComplexHashMap = Kotlin.HashMap;
         next: function () {
             return this.map[this.keys[this.index++]];
         },
-        get_hasNext: function () {
+        hasNext: function () {
             return this.index < this.size;
         }
     });
@@ -595,8 +595,8 @@ Kotlin.PrimitiveHashSet = Kotlin.$createClass(Kotlin.AbstractCollection, {
                 var iter1 = this.iterator();
                 var iter2 = o.iterator();
                 while (true) {
-                    var hn1 = iter1.get_hasNext();
-                    var hn2 = iter2.get_hasNext();
+                    var hn1 = iter1.hasNext();
+                    var hn2 = iter2.hasNext();
                     if (hn1 != hn2) return false;
                     if (!hn2)
                         return true;
@@ -614,7 +614,7 @@ Kotlin.PrimitiveHashSet = Kotlin.$createClass(Kotlin.AbstractCollection, {
             var builder = "[";
             var iter = this.iterator();
             var first = true;
-            while (iter.get_hasNext()) {
+            while (iter.hasNext()) {
                 if (first)
                     first = false;
                 else