JS stdlib: fix bug with using "__proto__" as element of DefaultPrimitiveHashSet.

2014-10-10 13:43:35 +04:00
parent 49e2262ca7
commit 64044800c9
1 changed files with 54 additions and 3 deletions
@@ -773,15 +773,66 @@ Kotlin.AbstractPrimitiveHashSet = Kotlin.createClassNow(Kotlin.AbstractCollectio
        }
 });

+var PROTO_NAME = "__proto__";
+
 Kotlin.DefaultPrimitiveHashSet = Kotlin.createClassNow(Kotlin.AbstractPrimitiveHashSet,
    /** @constructs */
    function () {
-        Kotlin.AbstractPrimitiveHashSet.call(this);
+        var superClass = Kotlin.AbstractPrimitiveHashSet;
+
+        superClass.call(this);
+        this.super = superClass.prototype;
+
+        this.containsProto = false;
    },
-    {
    /** @lends {Kotlin.DefaultPrimitiveHashSet.prototype} */
+    {
+        contains_za3rmp$: function (key) {
+            var skey = String(key);
+            if (skey === PROTO_NAME) {
+                return this.containsProto;
+            }
+
+            return this.super.contains_za3rmp$.call(this, key);
+        },
+        add_za3rmp$: function (element) {
+            var skey = String(element);
+            if (skey === PROTO_NAME) {
+                var isNewElement = !this.containsProto;
+
+                if (isNewElement) {
+                    this.containsProto = true;
+                    this.$size++;
+                }
+
+                return isNewElement;
+            }
+
+            return this.super.add_za3rmp$.call(this, element);
+        },
+        remove_za3rmp$: function (element) {
+            var skey = String(element);
+            if (skey === PROTO_NAME) {
+                var contains = this.containsProto;
+
+                if (contains) {
+                    this.containsProto = false;
+                    this.$size++;
+                }
+
+                return contains;
+            }
+
+            return this.super.remove_za3rmp$.call(this, element);
+        },
+        clear: function () {
+            this.$size = 0;
+            this.containsProto = false;
+            this.map = {};
+        },
        toArray: function () {
-            return Object.keys(this.map);
+            var elements = Object.keys(this.map);
+            return !this.containsProto ? elements : elements.concat(PROTO_NAME);
        }
 });