X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=src%2Forg%2Fibex%2Fjs%2FJSDate.java;h=8d267d238353cdef81de930516c0ee641dce916c;hb=36b48aab36d33bd862a9ce81ac69f57fd0a94484;hp=b90da68c039c14459eb30f2e549c591e6cf21567;hpb=361d18aff8f32e60fb8b6c5c52744a9f1e9890be;p=org.ibex.js.git

diff --git a/src/org/ibex/js/JSDate.java b/src/org/ibex/js/JSDate.java
index b90da68..8d267d2 100644
--- a/src/org/ibex/js/JSDate.java
+++ b/src/org/ibex/js/JSDate.java
@@ -61,62 +61,60 @@ public class JSDate extends JS.Immutable {
     public JS call(JS method, JS[] args) throws JSExn {
         switch(args.length) {
             case 0: {
-                //#switch(Script.toString(method))
-                case "toString": return Script.S(date_format(date, FORMATSPEC_FULL));
-                case "toTimeString": return Script.S(date_format(date, FORMATSPEC_TIME));
-                case "toDateString": return Script.S(date_format(date, FORMATSPEC_DATE));
-                case "toLocaleString": return Script.S(toLocaleString(date));
-                case "toLocaleTimeString": return Script.S(toLocaleTimeString(date));
-                case "toLocaleDateString": return Script.S(toLocaleDateString(date));
-                case "toUTCString": return Script.S(toUTCString(date));
-                case "valueOf": return Script.N(this.date);
-                case "getTime": return Script.N(this.date);
-                case "getYear": return Script.N(getYear(date));
-                case "getFullYear": return Script.N(YearFromTime(LocalTime(date)));
-                case "getUTCFullYear": return Script.N(YearFromTime(date));
-                case "getMonth": return Script.N(MonthFromTime(LocalTime(date)));
-                case "getUTCMonth": return Script.N(MonthFromTime(date));
-                case "getDate": return Script.N(DateFromTime(LocalTime(date)));
-                case "getUTCDate": return Script.N(DateFromTime(date));
-                case "getDay": return Script.N(WeekDay(LocalTime(date)));
-                case "getUTCDay": return Script.N(WeekDay(date));
-                case "getHours": return Script.N(HourFromTime(LocalTime(date)));
-                case "getUTCHours": return Script.N(HourFromTime(date));
-                case "getMinutes": return Script.N(MinFromTime(LocalTime(date)));
-                case "getUTCMinutes": return Script.N(MinFromTime(date));
-                case "getSeconds": return Script.N(SecFromTime(LocalTime(date)));
-                case "getUTCSeconds": return Script.N(SecFromTime(date));
-                case "getMilliseconds": return Script.N(msFromTime(LocalTime(date)));
-                case "getUTCMilliseconds": return Script.N(msFromTime(date));
-                case "getTimezoneOffset": return Script.N(getTimezoneOffset(date));
+                //#switch(JSU.toString(method))
+                case "toString": return JSU.S(date_format(date, FORMATSPEC_FULL));
+                case "toTimeString": return JSU.S(date_format(date, FORMATSPEC_TIME));
+                case "toDateString": return JSU.S(date_format(date, FORMATSPEC_DATE));
+                case "toLocaleString": return JSU.S(toLocaleString(date));
+                case "toLocaleTimeString": return JSU.S(toLocaleTimeString(date));
+                case "toLocaleDateString": return JSU.S(toLocaleDateString(date));
+                case "toUTCString": return JSU.S(toUTCString(date));
+                case "valueOf": return JSU.N(this.date);
+                case "getTime": return JSU.N(this.date);
+                case "getYear": return JSU.N(getYear(date));
+                case "getFullYear": return JSU.N(YearFromTime(LocalTime(date)));
+                case "getUTCFullYear": return JSU.N(YearFromTime(date));
+                case "getMonth": return JSU.N(MonthFromTime(LocalTime(date)));
+                case "getUTCMonth": return JSU.N(MonthFromTime(date));
+                case "getDate": return JSU.N(DateFromTime(LocalTime(date)));
+                case "getUTCDate": return JSU.N(DateFromTime(date));
+                case "getDay": return JSU.N(WeekDay(LocalTime(date)));
+                case "getUTCDay": return JSU.N(WeekDay(date));
+                case "getHours": return JSU.N(HourFromTime(LocalTime(date)));
+                case "getUTCHours": return JSU.N(HourFromTime(date));
+                case "getMinutes": return JSU.N(MinFromTime(LocalTime(date)));
+                case "getUTCMinutes": return JSU.N(MinFromTime(date));
+                case "getSeconds": return JSU.N(SecFromTime(LocalTime(date)));
+                case "getUTCSeconds": return JSU.N(SecFromTime(date));
+                case "getMilliseconds": return JSU.N(msFromTime(LocalTime(date)));
+                case "getUTCMilliseconds": return JSU.N(msFromTime(date));
+                case "getTimezoneOffset": return JSU.N(getTimezoneOffset(date));
                 //#end
                 return super.call(method, args);
             }
             case 1: {
-                //#switch(Script.toString(method))
-                case "setTime": return Script.N(this.setTime(Script.toDouble(args[0])));
-                case "setYear": return Script.N(this.setYear(Script.toDouble(args[0])));
+                //#switch(JSU.toString(method))
+                case "setTime": return JSU.N(this.setTime(JSU.toDouble(args[0])));
+                case "setYear": return JSU.N(this.setYear(JSU.toDouble(args[0])));
                 //#end
                 // fall through
             }
             default: {
-                JS[] args = new JS[nargs];
-                for(int i=0; i<nargs; i++) args[i] = i==0 ? a0 : i==1 ? a1 : i==2 ? a2 : rest[i-3];
-                //#switch(Script.toString(method))
-                case "setMilliseconds": return Script.N(this.makeTime(args, 1, true));
-                case "setUTCMilliseconds": return Script.N(this.makeTime(args, 1, false));
-                case "setSeconds": return Script.N(this.makeTime(args, 2, true));
-                case "setUTCSeconds": return Script.N(this.makeTime(args, 2, false));
-                case "setMinutes": return Script.N(this.makeTime(args, 3, true));
-                case "setUTCMinutes": return Script.N(this.makeTime(args, 3, false));
-                case "setHours": return Script.N(this.makeTime(args, 4, true));
-                case "setUTCHours": return Script.N(this.makeTime(args, 4, false));
-                case "setDate": return Script.N(this.makeDate(args, 1, true));
-                case "setUTCDate": return Script.N(this.makeDate(args, 1, false));
-                case "setMonth": return Script.N(this.makeDate(args, 2, true));
-                case "setUTCMonth": return Script.N(this.makeDate(args, 2, false));
-                case "setFullYear": return Script.N(this.makeDate(args, 3, true));
-                case "setUTCFullYear": return Script.N(this.makeDate(args, 3, false));
+                //#switch(JSU.toString(method))
+                case "setMilliseconds": return JSU.N(this.makeTime(args, 1, true));
+                case "setUTCMilliseconds": return JSU.N(this.makeTime(args, 1, false));
+                case "setSeconds": return JSU.N(this.makeTime(args, 2, true));
+                case "setUTCSeconds": return JSU.N(this.makeTime(args, 2, false));
+                case "setMinutes": return JSU.N(this.makeTime(args, 3, true));
+                case "setUTCMinutes": return JSU.N(this.makeTime(args, 3, false));
+                case "setHours": return JSU.N(this.makeTime(args, 4, true));
+                case "setUTCHours": return JSU.N(this.makeTime(args, 4, false));
+                case "setDate": return JSU.N(this.makeDate(args, 1, true));
+                case "setUTCDate": return JSU.N(this.makeDate(args, 1, false));
+                case "setMonth": return JSU.N(this.makeDate(args, 2, true));
+                case "setUTCMonth": return JSU.N(this.makeDate(args, 2, false));
+                case "setFullYear": return JSU.N(this.makeDate(args, 3, true));
+                case "setUTCFullYear": return JSU.N(this.makeDate(args, 3, false));
                 //#end
             }
         }
@@ -124,7 +122,7 @@ public class JSDate extends JS.Immutable {
     }
 
     public JS get(JS key) throws JSExn {
-        //#switch(Script.toString(key))
+        //#switch(JSU.toString(key))
         case "toString": return METHOD;
         case "toTimeString": return METHOD;
         case "toDateString": return METHOD;
@@ -540,7 +538,7 @@ public class JSDate extends JS.Immutable {
                 if (d != d || Double.isInfinite(d)) {
                     return Double.NaN;
                 }
-                array[loop] = Script.toDouble(args[loop]);
+                array[loop] = JSU.toDouble(args[loop]);
             } else {
                 array[loop] = 0;
             }
@@ -559,7 +557,7 @@ public class JSDate extends JS.Immutable {
                               array[3], array[4], array[5], array[6]);
         d = TimeClip(d);
         return d;
-        //        return Script.N(d);
+        //        return JSU.N(d);
     }
 
     /*
@@ -889,8 +887,14 @@ public class JSDate extends JS.Immutable {
         return result.toString();
     }
 
-    private static double _toNumber(JS o) throws JSExn { return Script.toDouble(o); }
-    private static double _toNumber(JS[] o, int index) throws JSExn { return Script.toDouble(o[index]); }
+    private static double _toNumber(JS o) throws JSExn { return JSU.toDouble(o); }
+    private static double _toNumber(JS[] o, int index) throws JSExn { return JSU.toDouble(o[index]); }
+
+    public JSDate(long l) throws JSExn {
+        this.date = (double)l;
+        thisTimeZone = java.util.TimeZone.getDefault();
+        LocalTZA = thisTimeZone.getRawOffset();
+    }
 
     public JSDate(JS[] args) throws JSExn {
 
@@ -902,8 +906,8 @@ public class JSDate extends JS.Immutable {
             }
             case 1: {
                 double date;
-                if(Script.isString(a0))
-                    date = date_parseString(Script.toString(a0));
+                if(JSU.isString(args[0]))
+                    date = date_parseString(JSU.toString(args[0]));
                 else
                     date = _toNumber(args[0]);
                 obj.date = TimeClip(date);
@@ -912,9 +916,9 @@ public class JSDate extends JS.Immutable {
             default: {
                 // multiple arguments; year, month, day etc.
                 double array[] = new double[MAXARGS];
-                array[0] = Script.toDouble(args[0]);
-                array[1] = Script.toDouble(args[1]);
-                if (args.length >= 2) array[2] = Script.toDouble(args[2]);
+                array[0] = JSU.toDouble(args[0]);
+                array[1] = JSU.toDouble(args[1]);
+                if (args.length >= 2) array[2] = JSU.toDouble(args[2]);
                 for (int i=0; i < args.length; i++) {
                     double d = _toNumber(args[i]);
                     if (d != d || Double.isInfinite(d)) {