Changeset 7638

Timestamp:

03/07/08 23:49:55 (9 months ago)

Author:

cho45

Message:

lang/javascript/jsenumerator/trunk/jsenumerator.js,
lang/javascript/jsenumerator/trunk/test.js:

apply にするかどうかと function の引数のカンマのあるなしにした。Committers:kyo_ago さんのアイデア
殆ど自然に書けるようになった。kyo_ago++

Location:

lang/javascript/jsenumerator/trunk

Files:

• jsenumerator.js (modified) (14 diffs)
• test.js (modified) (7 diffs)

lang/javascript/jsenumerator/trunk/jsenumerator.js

@@ -163 +163 @@
          *     E(1, 2, 3).map(function (i) { return i * i }); //=> [1, 4, 9]
          */
-        map : function (fun, apply) {
+        map : function (fun) {
                 var ret = [];
                 try {
                         if (this.array) {
                                 for (; this.pos < this.array.length; this.pos++) {
-                                        ret.push(fun[apply || "call"](this, this.array[this.pos]));
+                                        ret.push(this._call(fun, this.array[this.pos]));
                                 }
                         } else {
-                                while (1) ret.push(fun[apply || "call"](this, this.next()));
+                                while (1) ret.push(this._call(fun, this.next()));
                         }
                 } catch (e) {
@@ -187 +187 @@
          *     E(1, 2, 3).cycle().imap(function (i) { return i * i }).take(6); //=> [1, 4, 9, 1, 4, 9]
          */
-        imap : function (fun, apply) {
+        imap : function (fun) {
                 var self = this;
                 return Enumerator(function () {
-                        return fun[apply || "call"](this, self.next())
+                        return this._call(fun, self.next())
                 });
         },
@@ -225 +225 @@
          *     //=> [0, 2, 4, 6, 8, 10, 12, 14, 16, 18]
          */
-        iselect : function (fun, apply) {
+        iselect : function (fun) {
                 var self = this;
                 return Enumerator(function () {
                         do {
                                 var val = self.next();
-                        } while (!fun[apply || "call"](this, val));
+                        } while (!this._call(fun, val));
                         return val;
                 });
@@ -250 +250 @@
                 do {
                         var ret = this.next();
-                } while (!fun[apply || "call"](this, ret));
+                } while (!this._call(fun, ret));
                 return ret;
         },
@@ -341 +341 @@
          *
          */
-        itake : function (a, apply) {
+        itake : function (a) {
                 var self = this;
                 if (typeof(a) == "number") { // take
@@ -355 +355 @@
                         return Enumerator(function () {
                                 var ret = self.next();
-                                if (a[apply || "call"](this, ret))
+                                if (this._call(a, ret))
                                         return ret;
                                 else
@@ -371 +371 @@
          * Receiver must be finite.
          */
-        take : function (a, apply) {
-                return this.itake(a, apply).toArray();
+        take : function (a) {
+                return this.itake(a).toArray();
         },
 
@@ -382 +382 @@
          *     E().countup().idrop(2).take(10); //=> [2, 3, 4, 5, 6, 7, 8, 9, 10, 11]
          */
-        idrop : function (a, apply) {
+        idrop : function (a) {
                 var self = this, i;
                 if (typeof(a) == "number") {   // drop
@@ -389 +389 @@
                 } else
                 if (typeof(a) == "function") { // dropwhile
-                        while (a[apply || "call"](this, i = this.next())) true;
+                        while (this._call(a, i = this.next())) true;
                         return Enumerator(function () {
                                 this.next = self.next;
@@ -406 +406 @@
          * Receiver must be finite.
          */
-        drop : function (a, apply) {
-                return this.idrop(a, apply).toArray();
+        drop : function (a) {
+                return this.idrop(a).toArray();
         },
 
@@ -423 +423 @@
          * Receiver must be finite.
          */
-        every : function (fun, apply) {
+        every : function (fun) {
                 try {
-                        while (!(fun[apply || "call"](this, this.next()) === false)) 1;
+                        while (!(this._call(fun, this.next()) === false)) 1;
                         return false;
                 } catch (e) {
@@ -446 +446 @@
          * Receiver must be finite.
          */
-        some : function (fun, apply) {
+        some : function (fun) {
                 try {
-                        while (!(fun[apply || "call"](this, this.next()) === true)) 1;
+                        while (!(this._call(fun, this.next()) === true)) 1;
                         return true;
                 } catch (e) {
@@ -464 +464 @@
          *         log(item);  // a, b, c
          *         log(index); // 0, 1, 2
-         *     }, "apply");
+         *     });
          */
         withIndex : function (start) {
@@ -481 +481 @@
                 var start = this.next() || 0;
                 return Enumerator(function () { return start++ });
+        },
+
+        _call : function (fun, arg) {
+                var m = (fun.toString().split("{",2)[0].indexOf(",") == -1) ? "call" : "apply";
+                return fun[m](this, arg);
         }
 };

lang/javascript/jsenumerator/trunk/test.js

@@ -234 +234 @@
         expect("apply", [3, 5], E([[1, 2], [2, 3]]).map(function (x, y) {
                 return x + y;
-        }, "apply"));
+        }));
 }).
 tests("imap", function () {
@@ -241 +241 @@
         }).toArray());
 
-        expect("apply", [1, 4, 9], E([[1], [2], [3]]).imap(function (i) {
+        expect("apply", [1, 4, 9], E([[1, "a"], [2, "b"], [3, "c"]]).imap(function (i, _) {
                 return i * i;
-        }, "apply").toArray());
+        }).toArray());
 }).
 tests("each", function () {
@@ -261 +261 @@
 
         ret = [];
-        E([[ 1 ], [ 2 ], [ 3 ]]).each(function (i) {
+        E([[ 1, "a" ], [ 2, "b"], [ 3, "c" ]]).each(function (i, _) {
                 ret.push(i);
-        }, "apply");
+        });
         expect("Basic", [1, 2, 3], ret);
 
         ret = [];
-        E([[ 1 ], [ 2 ], [ 3 ]]).each(function (i) {
+        E([[ 1, "a" ], [ 2, "b"], [ 3, "c" ]]).each(function (i, _) {
                 ret.push(i);
                 throw Enumerator.StopIteration;
-        }, "apply");
+        });
         expect("Basic", [1], ret);
 }).
@@ -297 +297 @@
         }).toArray());
 
-        expect("Basic", [[ 4 ], [ 5 ]], E([[ 1 ], [ 2 ], [ 3 ], [ 4 ], [ 5 ]]).iselect(function (i) {
+        expect("Basic", [[ 4 ], [ 5 ]], E([[ 1 ], [ 2 ], [ 3 ], [ 4 ], [ 5 ]]).iselect(function (i, _) {
                 return i > 3;
-        }, "apply").toArray());
-
-        expect("Basic", [[ 4 ], [ 5 ]], E([[ 1 ], [ 2 ], [ 3 ], [ 4 ], [ 5 ]]).ifilter(function (i) {
+        }).toArray());
+
+        expect("Basic", [[ 4 ], [ 5 ]], E([[ 1 ], [ 2 ], [ 3 ], [ 4 ], [ 5 ]]).ifilter(function (i, _) {
                 return i > 3;
-        }, "apply").toArray());
+        }).toArray());
 }).
 tests("find", function () {
@@ -310 +310 @@
         }));
 
-        expect("apply", [ 4 ], E([[ 1 ], [ 2 ], [ 3 ], [ 4 ], [ 5 ]]).find(function (i) {
+        expect("apply", [ 4, "d" ], E([[ 1, "a"], [ 2, "b" ], [ 3, "c" ], [ 4, "d" ], [ 5, "e" ]]).find(function (i, _) {
                 return i > 3;
-        }, "apply"));
+        }));
 }).
 tests("reduce", function () {
@@ -402 +402 @@
                 E(["a", "b", "c", "d"]).izip(E([1, 2, 3]).cycle()).withIndex().iselect(function (item, index) {
                         return index % 2 == 0;
-                }, "apply").toArray()
+                }).toArray()
         );
 
@@ -416 +416 @@
                 .imap(function (num, fizz, buzz) {
                         return fizz + buzz || num;
-                }, "apply")
+                })
                 .take(20);
         expect("FizzBuzz", fizzbuzzA, fizzbuzz);