Changeset 39097

Timestamp:

01/05/12 13:40:20 (17 months ago)

Author:

dankogai

Message:

c2 = new Math.Complex(c1); // now copies the instance

Files:

• lang/javascript/math-complex/trunk/complex.js (modified) (4 diffs)

lang/javascript/math-complex/trunk/complex.js

@@ -1 +1 @@
 /*
- * $Id: complex.js,v 0.10 2012/01/04 08:57:08 dankogai Exp dankogai $
+ * $Id: complex.js,v 0.11 2012/01/05 04:31:57 dankogai Exp dankogai $
  *
  *  Licensed under the MIT license.
@@ -12 +12 @@
     if (global.Math.Complex) return;
     Math.Complex = function Complex(re, im) {
-        if (this instanceof Math.Complex) {
+        if (re instanceof Math.Complex) {
+            return new Math.Complex(re.re, re.im);
+        } else if (this instanceof Math.Complex) {
             this.re = re ? 0 + re : 0;
             this.im = im ? 0 + im : 0;
@@ -35 +37 @@
         for (var p in methods) CPLX.prototype[p] = methods[p];
         for (var p in methods) CPLX[p] = (function(method) {
-            return function() {
-                var args = slice.call(arguments),
-                    self = args.shift();
+            return function(self) {
                 if (! (self instanceof CPLX)) self = new CPLX(self);
-                return method.apply(self, args);
+                return method.apply(self, slice.call(arguments, 1));
             }
         })(methods[p]);
@@ -150 +150 @@
     });
     /* functions exported for convenience */
-    global.cplx  = function(re, im) { return new CPLX(re, im) };
+    global.cplx = function(re, im) { return new CPLX(re, im) };
     global.cplxe = function(abs, arg) {
         return new CPLX(abs * Math.cos(arg), abs * Math.sin(arg));