added support for sets in iterable logic

atsepkov · Jan 27, 2019 · 442b20d · 442b20d
1 parent 677ca80
commit 442b20d
Show file tree

Hide file tree

Showing 7 changed files with 55 additions and 2 deletions.
diff --git a/lib/baselib.js b/lib/baselib.js
@@ -119,6 +119,8 @@ function hex(a) {
 function ՐՏ_in(val, arr) {
     if (typeof arr.indexOf === "function") {
         return arr.indexOf(val) !== -1;
+    } else if (typeof arr.has === "function") {
+        return arr.has(val);
     }
     return arr.hasOwnProperty(val);
 }
@@ -127,13 +129,19 @@ function ՐՏ_Iterable(iterable) {
     if (iterable.constructor === [].constructor || iterable.constructor === "".constructor || (tmp = Array.prototype.slice.call(iterable)).length) {
         return tmp || iterable;
     }
+    if (Set && iterable.constructor === Set) {
+        return Array.from(iterable);
+    }
     return Object.keys(iterable);
 }
 function len(obj) {
     var tmp;
     if (obj.constructor === [].constructor || obj.constructor === "".constructor || (tmp = Array.prototype.slice.call(obj)).length) {
         return (tmp || obj).length;
     }
+    if (Set && obj.constructor === Set) {
+        return obj.size;
+    }
     return Object.keys(obj).length;
 }
 function map(oper, arr) {
@@ -501,6 +509,8 @@ var ValueError = (ՐՏ_10 = function ValueError() {
     "in": function ՐՏ_in(val, arr) {
         if (typeof arr.indexOf === "function") {
             return arr.indexOf(val) !== -1;
+        } else if (typeof arr.has === "function") {
+            return arr.has(val);
         }
         return arr.hasOwnProperty(val);
     },
@@ -509,13 +519,19 @@ var ValueError = (ՐՏ_10 = function ValueError() {
         if (iterable.constructor === [].constructor || iterable.constructor === "".constructor || (tmp = Array.prototype.slice.call(iterable)).length) {
             return tmp || iterable;
         }
+        if (Set && iterable.constructor === Set) {
+            return Array.from(iterable);
+        }
         return Object.keys(iterable);
     },
     "len": function len(obj) {
         var tmp;
         if (obj.constructor === [].constructor || obj.constructor === "".constructor || (tmp = Array.prototype.slice.call(obj)).length) {
             return (tmp || obj).length;
         }
+        if (Set && obj.constructor === Set) {
+            return obj.size;
+        }
         return Object.keys(obj).length;
     },
     "map": function map(oper, arr) {

diff --git a/lib/compile.js b/lib/compile.js
@@ -119,6 +119,8 @@ function hex(a) {
 function ՐՏ_in(val, arr) {
     if (typeof arr.indexOf === "function") {
         return arr.indexOf(val) !== -1;
+    } else if (typeof arr.has === "function") {
+        return arr.has(val);
     }
     return arr.hasOwnProperty(val);
 }
@@ -127,13 +129,19 @@ function ՐՏ_Iterable(iterable) {
     if (iterable.constructor === [].constructor || iterable.constructor === "".constructor || (tmp = Array.prototype.slice.call(iterable)).length) {
         return tmp || iterable;
     }
+    if (Set && iterable.constructor === Set) {
+        return Array.from(iterable);
+    }
     return Object.keys(iterable);
 }
 function len(obj) {
     var tmp;
     if (obj.constructor === [].constructor || obj.constructor === "".constructor || (tmp = Array.prototype.slice.call(obj)).length) {
         return (tmp || obj).length;
     }
+    if (Set && obj.constructor === Set) {
+        return obj.size;
+    }
     return Object.keys(obj).length;
 }
 function map(oper, arr) {

diff --git a/lib/rapydscript.js b/lib/rapydscript.js
diff --git a/lib/self.js b/lib/self.js
@@ -119,6 +119,8 @@ function hex(a) {
 function ՐՏ_in(val, arr) {
     if (typeof arr.indexOf === "function") {
         return arr.indexOf(val) !== -1;
+    } else if (typeof arr.has === "function") {
+        return arr.has(val);
     }
     return arr.hasOwnProperty(val);
 }
@@ -127,13 +129,19 @@ function ՐՏ_Iterable(iterable) {
     if (iterable.constructor === [].constructor || iterable.constructor === "".constructor || (tmp = Array.prototype.slice.call(iterable)).length) {
         return tmp || iterable;
     }
+    if (Set && iterable.constructor === Set) {
+        return Array.from(iterable);
+    }
     return Object.keys(iterable);
 }
 function len(obj) {
     var tmp;
     if (obj.constructor === [].constructor || obj.constructor === "".constructor || (tmp = Array.prototype.slice.call(obj)).length) {
         return (tmp || obj).length;
     }
+    if (Set && obj.constructor === Set) {
+        return obj.size;
+    }
     return Object.keys(obj).length;
 }
 function map(oper, arr) {

diff --git a/lib/test.js b/lib/test.js
@@ -119,6 +119,8 @@ function hex(a) {
 function ՐՏ_in(val, arr) {
     if (typeof arr.indexOf === "function") {
         return arr.indexOf(val) !== -1;
+    } else if (typeof arr.has === "function") {
+        return arr.has(val);
     }
     return arr.hasOwnProperty(val);
 }
@@ -127,13 +129,19 @@ function ՐՏ_Iterable(iterable) {
     if (iterable.constructor === [].constructor || iterable.constructor === "".constructor || (tmp = Array.prototype.slice.call(iterable)).length) {
         return tmp || iterable;
     }
+    if (Set && iterable.constructor === Set) {
+        return Array.from(iterable);
+    }
     return Object.keys(iterable);
 }
 function len(obj) {
     var tmp;
     if (obj.constructor === [].constructor || obj.constructor === "".constructor || (tmp = Array.prototype.slice.call(obj)).length) {
         return (tmp || obj).length;
     }
+    if (Set && obj.constructor === Set) {
+        return obj.size;
+    }
     return Object.keys(obj).length;
 }
 function map(oper, arr) {

diff --git a/package.json b/package.json
@@ -17,7 +17,7 @@
     "postversion": "git push && npm publish",
     "build-self": "bin/rapydscript --self"
   },
-  "version": "0.5.58",
+  "version": "0.5.59",
   "license": "BSD-2-Clause",
   "engines": {
     "node": ">=0.12.0"

diff --git a/src/baselib.pyj b/src/baselib.pyj
@@ -104,6 +104,7 @@
 ,
 "in": def ՐՏ_in(val, arr):
     if JS('typeof arr.indexOf') is 'function': return arr.indexOf(val) is not -1
+    elif JS('typeof arr.has') is 'function': return arr.has(val)
     return arr.hasOwnProperty(val)
 ,
 "iterable": def ՐՏ_Iterable(iterable):
@@ -112,6 +113,8 @@
     or iterable.constructor is ''.constructor
     or (tmp = Array.prototype.slice.call(iterable)).length:
         return tmp or iterable
+    if Set and iterable.constructor is Set:
+        return Array.from(iterable)
     return Object.keys(iterable)    # so we can use 'for ... in' syntax with hashes
 ,
 "len": def len(obj):
@@ -120,6 +123,8 @@
     or obj.constructor is ''.constructor
     or (tmp = Array.prototype.slice.call(obj)).length:
         return (tmp or obj).length
+    if Set and obj.constructor is Set:
+        return obj.size
     return Object.keys(obj).length
 ,
 "map": def map(oper, arr):