diff options
author | Lars Knoll <lars.knoll@digia.com> | 2013-09-12 11:13:03 +0200 |
---|---|---|
committer | The Qt Project <gerrit-noreply@qt-project.org> | 2013-09-18 13:13:47 +0200 |
commit | 16f92ad85cf665d863ded5eeaaa7fc3f90820b3f (patch) | |
tree | 74b3477b9d6c023730835f1c478ceb6eaec68a2b /src/qml/jsruntime/qv4dateobject.cpp | |
parent | 7d4e61dd824706984030c58684fa844ff9cde251 (diff) |
Convert builtin methods to return a ReturnedValue
Change-Id: I6b75adbf53a5be0deab023d2eed98ce2a7915551
Reviewed-by: Simon Hausmann <simon.hausmann@digia.com>
Diffstat (limited to 'src/qml/jsruntime/qv4dateobject.cpp')
-rw-r--r-- | src/qml/jsruntime/qv4dateobject.cpp | 198 |
1 files changed, 99 insertions, 99 deletions
diff --git a/src/qml/jsruntime/qv4dateobject.cpp b/src/qml/jsruntime/qv4dateobject.cpp index de56fcd5f3..26e9a4af0e 100644 --- a/src/qml/jsruntime/qv4dateobject.cpp +++ b/src/qml/jsruntime/qv4dateobject.cpp @@ -768,12 +768,12 @@ double DatePrototype::getThisDate(ExecutionContext *ctx) } } -Value DatePrototype::method_parse(SimpleCallContext *ctx) +ReturnedValue DatePrototype::method_parse(SimpleCallContext *ctx) { - return Value::fromDouble(ParseString(ctx->argument(0).toString(ctx)->toQString())); + return Encode(ParseString(ctx->argument(0).toString(ctx)->toQString())); } -Value DatePrototype::method_UTC(SimpleCallContext *ctx) +ReturnedValue DatePrototype::method_UTC(SimpleCallContext *ctx) { const int numArgs = ctx->argumentCount; if (numArgs >= 2) { @@ -788,221 +788,221 @@ Value DatePrototype::method_UTC(SimpleCallContext *ctx) year += 1900; double t = MakeDate(MakeDay(year, month, day), MakeTime(hours, mins, secs, ms)); - return Value::fromDouble(TimeClip(t)); + return Encode(TimeClip(t)); } - return Value::undefinedValue(); + return Encode::undefined(); } -Value DatePrototype::method_now(SimpleCallContext *ctx) +ReturnedValue DatePrototype::method_now(SimpleCallContext *ctx) { Q_UNUSED(ctx); double t = currentTime(); - return Value::fromDouble(t); + return Encode(t); } -Value DatePrototype::method_toString(SimpleCallContext *ctx) +ReturnedValue DatePrototype::method_toString(SimpleCallContext *ctx) { double t = getThisDate(ctx); - return Value::fromString(ctx, ToString(t)); + return Value::fromString(ctx, ToString(t)).asReturnedValue(); } -Value DatePrototype::method_toDateString(SimpleCallContext *ctx) +ReturnedValue DatePrototype::method_toDateString(SimpleCallContext *ctx) { double t = getThisDate(ctx); - return Value::fromString(ctx, ToDateString(t)); + return Value::fromString(ctx, ToDateString(t)).asReturnedValue(); } -Value DatePrototype::method_toTimeString(SimpleCallContext *ctx) +ReturnedValue DatePrototype::method_toTimeString(SimpleCallContext *ctx) { double t = getThisDate(ctx); - return Value::fromString(ctx, ToTimeString(t)); + return Value::fromString(ctx, ToTimeString(t)).asReturnedValue(); } -Value DatePrototype::method_toLocaleString(SimpleCallContext *ctx) +ReturnedValue DatePrototype::method_toLocaleString(SimpleCallContext *ctx) { double t = getThisDate(ctx); - return Value::fromString(ctx, ToLocaleString(t)); + return Value::fromString(ctx, ToLocaleString(t)).asReturnedValue(); } -Value DatePrototype::method_toLocaleDateString(SimpleCallContext *ctx) +ReturnedValue DatePrototype::method_toLocaleDateString(SimpleCallContext *ctx) { double t = getThisDate(ctx); - return Value::fromString(ctx, ToLocaleDateString(t)); + return Value::fromString(ctx, ToLocaleDateString(t)).asReturnedValue(); } -Value DatePrototype::method_toLocaleTimeString(SimpleCallContext *ctx) +ReturnedValue DatePrototype::method_toLocaleTimeString(SimpleCallContext *ctx) { double t = getThisDate(ctx); - return Value::fromString(ctx, ToLocaleTimeString(t)); + return Value::fromString(ctx, ToLocaleTimeString(t)).asReturnedValue(); } -Value DatePrototype::method_valueOf(SimpleCallContext *ctx) +ReturnedValue DatePrototype::method_valueOf(SimpleCallContext *ctx) { double t = getThisDate(ctx); - return Value::fromDouble(t); + return Encode(t); } -Value DatePrototype::method_getTime(SimpleCallContext *ctx) +ReturnedValue DatePrototype::method_getTime(SimpleCallContext *ctx) { double t = getThisDate(ctx); - return Value::fromDouble(t); + return Encode(t); } -Value DatePrototype::method_getYear(SimpleCallContext *ctx) +ReturnedValue DatePrototype::method_getYear(SimpleCallContext *ctx) { double t = getThisDate(ctx); if (! std::isnan(t)) t = YearFromTime(LocalTime(t)) - 1900; - return Value::fromDouble(t); + return Encode(t); } -Value DatePrototype::method_getFullYear(SimpleCallContext *ctx) +ReturnedValue DatePrototype::method_getFullYear(SimpleCallContext *ctx) { double t = getThisDate(ctx); if (! std::isnan(t)) t = YearFromTime(LocalTime(t)); - return Value::fromDouble(t); + return Encode(t); } -Value DatePrototype::method_getUTCFullYear(SimpleCallContext *ctx) +ReturnedValue DatePrototype::method_getUTCFullYear(SimpleCallContext *ctx) { double t = getThisDate(ctx); if (! std::isnan(t)) t = YearFromTime(t); - return Value::fromDouble(t); + return Encode(t); } -Value DatePrototype::method_getMonth(SimpleCallContext *ctx) +ReturnedValue DatePrototype::method_getMonth(SimpleCallContext *ctx) { double t = getThisDate(ctx); if (! std::isnan(t)) t = MonthFromTime(LocalTime(t)); - return Value::fromDouble(t); + return Encode(t); } -Value DatePrototype::method_getUTCMonth(SimpleCallContext *ctx) +ReturnedValue DatePrototype::method_getUTCMonth(SimpleCallContext *ctx) { double t = getThisDate(ctx); if (! std::isnan(t)) t = MonthFromTime(t); - return Value::fromDouble(t); + return Encode(t); } -Value DatePrototype::method_getDate(SimpleCallContext *ctx) +ReturnedValue DatePrototype::method_getDate(SimpleCallContext *ctx) { double t = getThisDate(ctx); if (! std::isnan(t)) t = DateFromTime(LocalTime(t)); - return Value::fromDouble(t); + return Encode(t); } -Value DatePrototype::method_getUTCDate(SimpleCallContext *ctx) +ReturnedValue DatePrototype::method_getUTCDate(SimpleCallContext *ctx) { double t = getThisDate(ctx); if (! std::isnan(t)) t = DateFromTime(t); - return Value::fromDouble(t); + return Encode(t); } -Value DatePrototype::method_getDay(SimpleCallContext *ctx) +ReturnedValue DatePrototype::method_getDay(SimpleCallContext *ctx) { double t = getThisDate(ctx); if (! std::isnan(t)) t = WeekDay(LocalTime(t)); - return Value::fromDouble(t); + return Encode(t); } -Value DatePrototype::method_getUTCDay(SimpleCallContext *ctx) +ReturnedValue DatePrototype::method_getUTCDay(SimpleCallContext *ctx) { double t = getThisDate(ctx); if (! std::isnan(t)) t = WeekDay(t); - return Value::fromDouble(t); + return Encode(t); } -Value DatePrototype::method_getHours(SimpleCallContext *ctx) +ReturnedValue DatePrototype::method_getHours(SimpleCallContext *ctx) { double t = getThisDate(ctx); if (! std::isnan(t)) t = HourFromTime(LocalTime(t)); - return Value::fromDouble(t); + return Encode(t); } -Value DatePrototype::method_getUTCHours(SimpleCallContext *ctx) +ReturnedValue DatePrototype::method_getUTCHours(SimpleCallContext *ctx) { double t = getThisDate(ctx); if (! std::isnan(t)) t = HourFromTime(t); - return Value::fromDouble(t); + return Encode(t); } -Value DatePrototype::method_getMinutes(SimpleCallContext *ctx) +ReturnedValue DatePrototype::method_getMinutes(SimpleCallContext *ctx) { double t = getThisDate(ctx); if (! std::isnan(t)) t = MinFromTime(LocalTime(t)); - return Value::fromDouble(t); + return Encode(t); } -Value DatePrototype::method_getUTCMinutes(SimpleCallContext *ctx) +ReturnedValue DatePrototype::method_getUTCMinutes(SimpleCallContext *ctx) { double t = getThisDate(ctx); if (! std::isnan(t)) t = MinFromTime(t); - return Value::fromDouble(t); + return Encode(t); } -Value DatePrototype::method_getSeconds(SimpleCallContext *ctx) +ReturnedValue DatePrototype::method_getSeconds(SimpleCallContext *ctx) { double t = getThisDate(ctx); if (! std::isnan(t)) t = SecFromTime(LocalTime(t)); - return Value::fromDouble(t); + return Encode(t); } -Value DatePrototype::method_getUTCSeconds(SimpleCallContext *ctx) +ReturnedValue DatePrototype::method_getUTCSeconds(SimpleCallContext *ctx) { double t = getThisDate(ctx); if (! std::isnan(t)) t = SecFromTime(t); - return Value::fromDouble(t); + return Encode(t); } -Value DatePrototype::method_getMilliseconds(SimpleCallContext *ctx) +ReturnedValue DatePrototype::method_getMilliseconds(SimpleCallContext *ctx) { double t = getThisDate(ctx); if (! std::isnan(t)) t = msFromTime(LocalTime(t)); - return Value::fromDouble(t); + return Encode(t); } -Value DatePrototype::method_getUTCMilliseconds(SimpleCallContext *ctx) +ReturnedValue DatePrototype::method_getUTCMilliseconds(SimpleCallContext *ctx) { double t = getThisDate(ctx); if (! std::isnan(t)) t = msFromTime(t); - return Value::fromDouble(t); + return Encode(t); } -Value DatePrototype::method_getTimezoneOffset(SimpleCallContext *ctx) +ReturnedValue DatePrototype::method_getTimezoneOffset(SimpleCallContext *ctx) { double t = getThisDate(ctx); if (! std::isnan(t)) t = (t - LocalTime(t)) / msPerMinute; - return Value::fromDouble(t); + return Encode(t); } -Value DatePrototype::method_setTime(SimpleCallContext *ctx) +ReturnedValue DatePrototype::method_setTime(SimpleCallContext *ctx) { DateObject *self = ctx->thisObject.asDateObject(); if (!self) ctx->throwTypeError(); self->value.setDouble(TimeClip(ctx->argument(0).toNumber())); - return self->value; + return self->value.asReturnedValue(); } -Value DatePrototype::method_setMilliseconds(SimpleCallContext *ctx) +ReturnedValue DatePrototype::method_setMilliseconds(SimpleCallContext *ctx) { DateObject *self = ctx->thisObject.asDateObject(); if (!self) @@ -1011,10 +1011,10 @@ Value DatePrototype::method_setMilliseconds(SimpleCallContext *ctx) double t = LocalTime(self->value.asDouble()); double ms = ctx->argument(0).toNumber(); self->value.setDouble(TimeClip(UTC(MakeDate(Day(t), MakeTime(HourFromTime(t), MinFromTime(t), SecFromTime(t), ms))))); - return self->value; + return self->value.asReturnedValue(); } -Value DatePrototype::method_setUTCMilliseconds(SimpleCallContext *ctx) +ReturnedValue DatePrototype::method_setUTCMilliseconds(SimpleCallContext *ctx) { DateObject *self = ctx->thisObject.asDateObject(); if (!self) @@ -1023,10 +1023,10 @@ Value DatePrototype::method_setUTCMilliseconds(SimpleCallContext *ctx) double t = self->value.asDouble(); double ms = ctx->argument(0).toNumber(); self->value.setDouble(TimeClip(UTC(MakeDate(Day(t), MakeTime(HourFromTime(t), MinFromTime(t), SecFromTime(t), ms))))); - return self->value; + return self->value.asReturnedValue(); } -Value DatePrototype::method_setSeconds(SimpleCallContext *ctx) +ReturnedValue DatePrototype::method_setSeconds(SimpleCallContext *ctx) { DateObject *self = ctx->thisObject.asDateObject(); if (!self) @@ -1037,10 +1037,10 @@ Value DatePrototype::method_setSeconds(SimpleCallContext *ctx) double ms = (ctx->argumentCount < 2) ? msFromTime(t) : ctx->argument(1).toNumber(); t = TimeClip(UTC(MakeDate(Day(t), MakeTime(HourFromTime(t), MinFromTime(t), sec, ms)))); self->value.setDouble(t); - return self->value; + return self->value.asReturnedValue(); } -Value DatePrototype::method_setUTCSeconds(SimpleCallContext *ctx) +ReturnedValue DatePrototype::method_setUTCSeconds(SimpleCallContext *ctx) { DateObject *self = ctx->thisObject.asDateObject(); if (!self) @@ -1051,10 +1051,10 @@ Value DatePrototype::method_setUTCSeconds(SimpleCallContext *ctx) double ms = (ctx->argumentCount < 2) ? msFromTime(t) : ctx->argument(1).toNumber(); t = TimeClip(UTC(MakeDate(Day(t), MakeTime(HourFromTime(t), MinFromTime(t), sec, ms)))); self->value.setDouble(t); - return self->value; + return self->value.asReturnedValue(); } -Value DatePrototype::method_setMinutes(SimpleCallContext *ctx) +ReturnedValue DatePrototype::method_setMinutes(SimpleCallContext *ctx) { DateObject *self = ctx->thisObject.asDateObject(); if (!self) @@ -1066,10 +1066,10 @@ Value DatePrototype::method_setMinutes(SimpleCallContext *ctx) double ms = (ctx->argumentCount < 3) ? msFromTime(t) : ctx->argument(2).toNumber(); t = TimeClip(UTC(MakeDate(Day(t), MakeTime(HourFromTime(t), min, sec, ms)))); self->value.setDouble(t); - return self->value; + return self->value.asReturnedValue(); } -Value DatePrototype::method_setUTCMinutes(SimpleCallContext *ctx) +ReturnedValue DatePrototype::method_setUTCMinutes(SimpleCallContext *ctx) { DateObject *self = ctx->thisObject.asDateObject(); if (!self) @@ -1081,10 +1081,10 @@ Value DatePrototype::method_setUTCMinutes(SimpleCallContext *ctx) double ms = (ctx->argumentCount < 3) ? msFromTime(t) : ctx->argument(2).toNumber(); t = TimeClip(UTC(MakeDate(Day(t), MakeTime(HourFromTime(t), min, sec, ms)))); self->value.setDouble(t); - return self->value; + return self->value.asReturnedValue(); } -Value DatePrototype::method_setHours(SimpleCallContext *ctx) +ReturnedValue DatePrototype::method_setHours(SimpleCallContext *ctx) { DateObject *self = ctx->thisObject.asDateObject(); if (!self) @@ -1097,10 +1097,10 @@ Value DatePrototype::method_setHours(SimpleCallContext *ctx) double ms = (ctx->argumentCount < 4) ? msFromTime(t) : ctx->argument(3).toNumber(); t = TimeClip(UTC(MakeDate(Day(t), MakeTime(hour, min, sec, ms)))); self->value.setDouble(t); - return self->value; + return self->value.asReturnedValue(); } -Value DatePrototype::method_setUTCHours(SimpleCallContext *ctx) +ReturnedValue DatePrototype::method_setUTCHours(SimpleCallContext *ctx) { DateObject *self = ctx->thisObject.asDateObject(); if (!self) @@ -1113,10 +1113,10 @@ Value DatePrototype::method_setUTCHours(SimpleCallContext *ctx) double ms = (ctx->argumentCount < 4) ? msFromTime(t) : ctx->argument(3).toNumber(); t = TimeClip(UTC(MakeDate(Day(t), MakeTime(hour, min, sec, ms)))); self->value.setDouble(t); - return self->value; + return self->value.asReturnedValue(); } -Value DatePrototype::method_setDate(SimpleCallContext *ctx) +ReturnedValue DatePrototype::method_setDate(SimpleCallContext *ctx) { DateObject *self = ctx->thisObject.asDateObject(); if (!self) @@ -1126,10 +1126,10 @@ Value DatePrototype::method_setDate(SimpleCallContext *ctx) double date = ctx->argument(0).toNumber(); t = TimeClip(UTC(MakeDate(MakeDay(YearFromTime(t), MonthFromTime(t), date), TimeWithinDay(t)))); self->value.setDouble(t); - return self->value; + return self->value.asReturnedValue(); } -Value DatePrototype::method_setUTCDate(SimpleCallContext *ctx) +ReturnedValue DatePrototype::method_setUTCDate(SimpleCallContext *ctx) { DateObject *self = ctx->thisObject.asDateObject(); if (!self) @@ -1139,10 +1139,10 @@ Value DatePrototype::method_setUTCDate(SimpleCallContext *ctx) double date = ctx->argument(0).toNumber(); t = TimeClip(UTC(MakeDate(MakeDay(YearFromTime(t), MonthFromTime(t), date), TimeWithinDay(t)))); self->value.setDouble(t); - return self->value; + return self->value.asReturnedValue(); } -Value DatePrototype::method_setMonth(SimpleCallContext *ctx) +ReturnedValue DatePrototype::method_setMonth(SimpleCallContext *ctx) { DateObject *self = ctx->thisObject.asDateObject(); if (!self) @@ -1153,10 +1153,10 @@ Value DatePrototype::method_setMonth(SimpleCallContext *ctx) double date = (ctx->argumentCount < 2) ? DateFromTime(t) : ctx->argument(1).toNumber(); t = TimeClip(UTC(MakeDate(MakeDay(YearFromTime(t), month, date), TimeWithinDay(t)))); self->value.setDouble(t); - return self->value; + return self->value.asReturnedValue(); } -Value DatePrototype::method_setUTCMonth(SimpleCallContext *ctx) +ReturnedValue DatePrototype::method_setUTCMonth(SimpleCallContext *ctx) { DateObject *self = ctx->thisObject.asDateObject(); if (!self) @@ -1167,10 +1167,10 @@ Value DatePrototype::method_setUTCMonth(SimpleCallContext *ctx) double date = (ctx->argumentCount < 2) ? DateFromTime(t) : ctx->argument(1).toNumber(); t = TimeClip(UTC(MakeDate(MakeDay(YearFromTime(t), month, date), TimeWithinDay(t)))); self->value.setDouble(t); - return self->value; + return self->value.asReturnedValue(); } -Value DatePrototype::method_setYear(SimpleCallContext *ctx) +ReturnedValue DatePrototype::method_setYear(SimpleCallContext *ctx) { DateObject *self = ctx->thisObject.asDateObject(); if (!self) @@ -1193,10 +1193,10 @@ Value DatePrototype::method_setYear(SimpleCallContext *ctx) r = TimeClip(r); } self->value.setDouble(r); - return self->value; + return self->value.asReturnedValue(); } -Value DatePrototype::method_setUTCFullYear(SimpleCallContext *ctx) +ReturnedValue DatePrototype::method_setUTCFullYear(SimpleCallContext *ctx) { DateObject *self = ctx->thisObject.asDateObject(); if (!self) @@ -1208,10 +1208,10 @@ Value DatePrototype::method_setUTCFullYear(SimpleCallContext *ctx) double date = (ctx->argumentCount < 3) ? DateFromTime(t) : ctx->argument(2).toNumber(); t = TimeClip(UTC(MakeDate(MakeDay(year, month, date), TimeWithinDay(t)))); self->value.setDouble(t); - return self->value; + return self->value.asReturnedValue(); } -Value DatePrototype::method_setFullYear(SimpleCallContext *ctx) +ReturnedValue DatePrototype::method_setFullYear(SimpleCallContext *ctx) { DateObject *self = ctx->thisObject.asDateObject(); if (!self) @@ -1225,17 +1225,17 @@ Value DatePrototype::method_setFullYear(SimpleCallContext *ctx) double date = (ctx->argumentCount < 3) ? DateFromTime(t) : ctx->argument(2).toNumber(); t = TimeClip(UTC(MakeDate(MakeDay(year, month, date), TimeWithinDay(t)))); self->value.setDouble(t); - return self->value; + return self->value.asReturnedValue(); } -Value DatePrototype::method_toUTCString(SimpleCallContext *ctx) +ReturnedValue DatePrototype::method_toUTCString(SimpleCallContext *ctx) { DateObject *self = ctx->thisObject.asDateObject(); if (!self) ctx->throwTypeError(); double t = self->value.asDouble(); - return Value::fromString(ctx, ToUTCString(t)); + return Value::fromString(ctx, ToUTCString(t)).asReturnedValue(); } static void addZeroPrefixedInt(QString &str, int num, int nDigits) @@ -1251,7 +1251,7 @@ static void addZeroPrefixedInt(QString &str, int num, int nDigits) } } -Value DatePrototype::method_toISOString(SimpleCallContext *ctx) +ReturnedValue DatePrototype::method_toISOString(SimpleCallContext *ctx) { DateObject *self = ctx->thisObject.asDateObject(); if (!self) @@ -1265,7 +1265,7 @@ Value DatePrototype::method_toISOString(SimpleCallContext *ctx) int year = (int)YearFromTime(t); if (year < 0 || year > 9999) { if (qAbs(year) >= 1000000) - return Value::fromString(ctx, QStringLiteral("Invalid Date")); + return Value::fromString(ctx, QStringLiteral("Invalid Date")).asReturnedValue(); result += year < 0 ? '-' : '+'; year = qAbs(year); addZeroPrefixedInt(result, year, 6); @@ -1286,17 +1286,17 @@ Value DatePrototype::method_toISOString(SimpleCallContext *ctx) addZeroPrefixedInt(result, msFromTime(t), 3); result += 'Z'; - return Value::fromString(ctx, result); + return Value::fromString(ctx, result).asReturnedValue(); } -Value DatePrototype::method_toJSON(SimpleCallContext *ctx) +ReturnedValue DatePrototype::method_toJSON(SimpleCallContext *ctx) { Scope scope(ctx); ScopedValue O(scope, __qmljs_to_object(ctx, ValueRef(&ctx->thisObject))); ScopedValue tv(scope, __qmljs_to_primitive(O, NUMBER_HINT)); if (tv->isNumber() && !std::isfinite(tv->toNumber())) - return Value::nullValue(); + return Encode::null(); ScopedValue v(scope, O->objectValue()->get(ctx->engine->newString(QStringLiteral("toISOString")))); FunctionObject *toIso = v->asFunctionObject(); @@ -1306,7 +1306,7 @@ Value DatePrototype::method_toJSON(SimpleCallContext *ctx) ScopedCallData callData(scope, 0); callData->thisObject = ctx->thisObject; - return Value::fromReturnedValue(toIso->call(callData)); + return toIso->call(callData); } void DatePrototype::timezoneUpdated() |