corysanin/tubestation
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge MC -> JM

Browse Source
This commit is contained in:
Brian Hackett
2011-07-15 14:40:15 -07:00
parent 966e60ebab 2a937b6496
commit b4f1169cc2
1037 changed files with 28242 additions and 13051 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
js/src/jsdate.cpp
View File

@@ -600,7 +600,7 @@ date_msecFromArgs(JSContext *cx, uintN argc, Value *argv, jsdouble *rval)
for (loop = 0; loop < MAXARGS; loop++) {
if (loop < argc) {
jsdouble d;
if (!ValueToNumber(cx, argv[loop], &d))
if (!ToNumber(cx, argv[loop], &d))
return JS_FALSE;
/* return NaN if any arg is not finite */
if (!JSDOUBLE_IS_FINITE(d)) {
@@ -1712,7 +1712,7 @@ date_setTime(JSContext *cx, uintN argc, Value *vp)
}
jsdouble result;
if (!ValueToNumber(cx, vp[2], &result))
if (!ToNumber(cx, vp[2], &result))
return false;
return SetUTCTime(cx, obj, TIMECLIP(result), vp);
@@ -1762,7 +1762,7 @@ date_makeTime(JSContext *cx, uintN maxargs, JSBool local, uintN argc, Value *vp)
argv = vp + 2;
for (i = 0; i < argc; i++) {
if (!ValueToNumber(cx, argv[i], &args[i]))
if (!ToNumber(cx, argv[i], &args[i]))
return false;
if (!JSDOUBLE_IS_FINITE(args[i])) {
SetDateToNaN(cx, obj, vp);
@@ -1887,7 +1887,7 @@ date_makeDate(JSContext *cx, uintN maxargs, JSBool local, uintN argc, Value *vp)
argv = vp + 2;
for (i = 0; i < argc; i++) {
if (!ValueToNumber(cx, argv[i], &args[i]))
if (!ToNumber(cx, argv[i], &args[i]))
return JS_FALSE;
if (!JSDOUBLE_IS_FINITE(args[i])) {
SetDateToNaN(cx, obj, vp);
@@ -1988,7 +1988,7 @@ date_setYear(JSContext *cx, uintN argc, Value *vp)
}
jsdouble year;
if (!ValueToNumber(cx, vp[2], &year))
if (!ToNumber(cx, vp[2], &year))
return false;
if (!JSDOUBLE_IS_FINITE(year)) {
SetDateToNaN(cx, obj, vp);
@@ -2565,7 +2565,7 @@ js_Date(JSContext *cx, uintN argc, Value *vp)
} else if (argc == 1) {
if (!argv[0].isString()) {
/* the argument is a millisecond number */
if (!ValueToNumber(cx, argv[0], &d))
if (!ToNumber(cx, argv[0], &d))
return false;
d = TIMECLIP(d);
} else {