From a0690ab1ebc844675f2eb4ed9f1087497c92768e Mon Sep 17 00:00:00 2001 From: Lars Knoll Date: Tue, 16 Oct 2012 13:13:44 +0200 Subject: [PATCH] Convert string literals to new calling convention Change-Id: I8dd6b1975351c36230ed512c55944c9b748ca38b Reviewed-by: Simon Hausmann --- qmljs_runtime.cpp | 36 ++++++++++++++++++------------------ qmljs_runtime.h | 40 ++++++++++++++++++++-------------------- 2 files changed, 38 insertions(+), 38 deletions(-) diff --git a/qmljs_runtime.cpp b/qmljs_runtime.cpp index 16ec991..c4b56de 100644 --- a/qmljs_runtime.cpp +++ b/qmljs_runtime.cpp @@ -410,49 +410,49 @@ void __qmljs_init_native_function(Context *ctx, Value *result, void (*code)(Cont __qmljs_init_object(result, ctx->engine->newNativeFunction(ctx, code)); } -void __qmljs_string_literal_undefined(Context *ctx, Value *result) +Value __qmljs_string_literal_undefined(Context *ctx) { - *result = Value::fromString(ctx->engine->identifier(QStringLiteral("undefined"))); + return Value::fromString(ctx->engine->identifier(QStringLiteral("undefined"))); } -void __qmljs_string_literal_null(Context *ctx, Value *result) +Value __qmljs_string_literal_null(Context *ctx) { - *result = Value::fromString(ctx->engine->identifier(QStringLiteral("null"))); + return Value::fromString(ctx->engine->identifier(QStringLiteral("null"))); } -void __qmljs_string_literal_true(Context *ctx, Value *result) +Value __qmljs_string_literal_true(Context *ctx) { - *result = Value::fromString(ctx->engine->identifier(QStringLiteral("true"))); + return Value::fromString(ctx->engine->identifier(QStringLiteral("true"))); } -void __qmljs_string_literal_false(Context *ctx, Value *result) +Value __qmljs_string_literal_false(Context *ctx) { - *result = Value::fromString(ctx->engine->identifier(QStringLiteral("false"))); + return Value::fromString(ctx->engine->identifier(QStringLiteral("false"))); } -void __qmljs_string_literal_object(Context *ctx, Value *result) +Value __qmljs_string_literal_object(Context *ctx) { - *result = Value::fromString(ctx->engine->identifier(QStringLiteral("object"))); + return Value::fromString(ctx->engine->identifier(QStringLiteral("object"))); } -void __qmljs_string_literal_boolean(Context *ctx, Value *result) +Value __qmljs_string_literal_boolean(Context *ctx) { - *result = Value::fromString(ctx->engine->identifier(QStringLiteral("boolean"))); + return Value::fromString(ctx->engine->identifier(QStringLiteral("boolean"))); } -void __qmljs_string_literal_number(Context *ctx, Value *result) +Value __qmljs_string_literal_number(Context *ctx) { - *result = Value::fromString(ctx->engine->identifier(QStringLiteral("number"))); + return Value::fromString(ctx->engine->identifier(QStringLiteral("number"))); } -void __qmljs_string_literal_string(Context *ctx, Value *result) +Value __qmljs_string_literal_string(Context *ctx) { - *result = Value::fromString(ctx->engine->identifier(QStringLiteral("string"))); + return Value::fromString(ctx->engine->identifier(QStringLiteral("string"))); } -void __qmljs_string_literal_function(Context *ctx, Value *result) +Value __qmljs_string_literal_function(Context *ctx) { - *result = Value::fromString(ctx->engine->identifier(QStringLiteral("function"))); + return Value::fromString(ctx->engine->identifier(QStringLiteral("function"))); } void __qmljs_delete_subscript(Context *ctx, Value *result, Value *base, Value *index) diff --git a/qmljs_runtime.h b/qmljs_runtime.h index 5d9b8f6..47021f9 100644 --- a/qmljs_runtime.h +++ b/qmljs_runtime.h @@ -110,15 +110,15 @@ void __qmljs_init_native_function(Context *ctx, Value *result, void (*code)(Cont uint __qmljs_is_function(Context *ctx, const Value *value); // string literals -void __qmljs_string_literal_undefined(Context *ctx, Value *result); -void __qmljs_string_literal_null(Context *ctx, Value *result); -void __qmljs_string_literal_true(Context *ctx, Value *result); -void __qmljs_string_literal_false(Context *ctx, Value *result); -void __qmljs_string_literal_object(Context *ctx, Value *result); -void __qmljs_string_literal_boolean(Context *ctx, Value *result); -void __qmljs_string_literal_number(Context *ctx, Value *result); -void __qmljs_string_literal_string(Context *ctx, Value *result); -void __qmljs_string_literal_function(Context *ctx, Value *result); +Value __qmljs_string_literal_undefined(Context *ctx); +Value __qmljs_string_literal_null(Context *ctx); +Value __qmljs_string_literal_true(Context *ctx); +Value __qmljs_string_literal_false(Context *ctx); +Value __qmljs_string_literal_object(Context *ctx); +Value __qmljs_string_literal_boolean(Context *ctx); +Value __qmljs_string_literal_number(Context *ctx); +Value __qmljs_string_literal_string(Context *ctx); +Value __qmljs_string_literal_function(Context *ctx); // strings String *__qmljs_string_from_utf8(Context *ctx, const char *s); @@ -807,16 +807,16 @@ inline void __qmljs_to_string(Context *ctx, Value *result, const Value *value) { switch (value->type()) { case Value::Undefined_Type: - __qmljs_string_literal_undefined(ctx, result); + *result = __qmljs_string_literal_undefined(ctx); break; case Value::Null_Type: - __qmljs_string_literal_null(ctx, result); + *result = __qmljs_string_literal_null(ctx); break; case Value::Boolean_Type: if (value->booleanValue()) - __qmljs_string_literal_true(ctx, result); + *result = __qmljs_string_literal_true(ctx); else - __qmljs_string_literal_false(ctx, result); + *result = __qmljs_string_literal_false(ctx); break; case Value::String_Type: *result = *value; @@ -899,26 +899,26 @@ inline void __qmljs_typeof(Context *ctx, Value *result, const Value *value) { switch (value->type()) { case Value::Undefined_Type: - __qmljs_string_literal_undefined(ctx, result); + *result = __qmljs_string_literal_undefined(ctx); break; case Value::Null_Type: - __qmljs_string_literal_object(ctx, result); + *result = __qmljs_string_literal_object(ctx); break; case Value::Boolean_Type: - __qmljs_string_literal_boolean(ctx, result); + *result = __qmljs_string_literal_boolean(ctx); break; case Value::String_Type: - __qmljs_string_literal_string(ctx, result); + *result = __qmljs_string_literal_string(ctx); break; case Value::Object_Type: if (__qmljs_is_callable(ctx, value)) - __qmljs_string_literal_function(ctx, result); + *result = __qmljs_string_literal_function(ctx); else - __qmljs_string_literal_object(ctx, result); // ### implementation-defined + *result = __qmljs_string_literal_object(ctx); // ### implementation-defined break; case Value::Integer_Type: case Value::Double_Type: - __qmljs_string_literal_number(ctx, result); + *result = __qmljs_string_literal_number(ctx); break; } } -- 2.7.4