aboutsummaryrefslogtreecommitdiffstats
path: root/src/qml/jsruntime/qv4runtime_p.h
diff options
context:
space:
mode:
Diffstat (limited to 'src/qml/jsruntime/qv4runtime_p.h')
-rw-r--r--src/qml/jsruntime/qv4runtime_p.h56
1 files changed, 28 insertions, 28 deletions
diff --git a/src/qml/jsruntime/qv4runtime_p.h b/src/qml/jsruntime/qv4runtime_p.h
index 6b3325898c..a9e8e01232 100644
--- a/src/qml/jsruntime/qv4runtime_p.h
+++ b/src/qml/jsruntime/qv4runtime_p.h
@@ -311,10 +311,10 @@ inline QV4::ReturnedValue __qmljs_uminus(const QV4::ValueRef value)
// +0 != -0, so we need to convert to double when negating 0
if (value->isInteger() && value->integerValue())
- return QV4::Value::fromInt32(-value->integerValue()).asReturnedValue();
+ return QV4::Primitive::fromInt32(-value->integerValue()).asReturnedValue();
else {
double n = __qmljs_to_number(value);
- return QV4::Value::fromDouble(-n).asReturnedValue();
+ return QV4::Primitive::fromDouble(-n).asReturnedValue();
}
}
@@ -345,11 +345,11 @@ inline ReturnedValue __qmljs_bit_or(const QV4::ValueRef left, const QV4::ValueRe
TRACE2(left, right);
if (QV4::Value::integerCompatible(*left, *right))
- return QV4::Value::fromInt32(left->integerValue() | right->integerValue()).asReturnedValue();
+ return QV4::Primitive::fromInt32(left->integerValue() | right->integerValue()).asReturnedValue();
int lval = left->toInt32();
int rval = right->toInt32();
- return QV4::Value::fromInt32(lval | rval).asReturnedValue();
+ return QV4::Primitive::fromInt32(lval | rval).asReturnedValue();
}
inline ReturnedValue __qmljs_bit_xor(const QV4::ValueRef left, const QV4::ValueRef right)
@@ -357,11 +357,11 @@ inline ReturnedValue __qmljs_bit_xor(const QV4::ValueRef left, const QV4::ValueR
TRACE2(left, right);
if (QV4::Value::integerCompatible(*left, *right))
- return QV4::Value::fromInt32(left->integerValue() ^ right->integerValue()).asReturnedValue();
+ return QV4::Primitive::fromInt32(left->integerValue() ^ right->integerValue()).asReturnedValue();
int lval = left->toInt32();
int rval = right->toInt32();
- return QV4::Value::fromInt32(lval ^ rval).asReturnedValue();
+ return QV4::Primitive::fromInt32(lval ^ rval).asReturnedValue();
}
inline ReturnedValue __qmljs_bit_and(const QV4::ValueRef left, const QV4::ValueRef right)
@@ -369,11 +369,11 @@ inline ReturnedValue __qmljs_bit_and(const QV4::ValueRef left, const QV4::ValueR
TRACE2(left, right);
if (QV4::Value::integerCompatible(*left, *right))
- return QV4::Value::fromInt32(left->integerValue() & right->integerValue()).asReturnedValue();
+ return QV4::Primitive::fromInt32(left->integerValue() & right->integerValue()).asReturnedValue();
int lval = left->toInt32();
int rval = right->toInt32();
- return QV4::Value::fromInt32(lval & rval).asReturnedValue();
+ return QV4::Primitive::fromInt32(lval & rval).asReturnedValue();
}
inline QV4::ReturnedValue __qmljs_add(QV4::ExecutionContext *ctx, const QV4::ValueRef left, const QV4::ValueRef right)
@@ -384,7 +384,7 @@ inline QV4::ReturnedValue __qmljs_add(QV4::ExecutionContext *ctx, const QV4::Val
return add_int32(left->integerValue(), right->integerValue()).asReturnedValue();
if (QV4::Value::bothDouble(*left, *right))
- return QV4::Value::fromDouble(left->doubleValue() + right->doubleValue()).asReturnedValue();
+ return QV4::Primitive::fromDouble(left->doubleValue() + right->doubleValue()).asReturnedValue();
return __qmljs_add_helper(ctx, left, right);
}
@@ -398,7 +398,7 @@ inline QV4::ReturnedValue __qmljs_sub(const QV4::ValueRef left, const QV4::Value
double lval = __qmljs_to_number(left);
double rval = __qmljs_to_number(right);
- return QV4::Value::fromDouble(lval - rval).asReturnedValue();
+ return QV4::Primitive::fromDouble(lval - rval).asReturnedValue();
}
inline QV4::ReturnedValue __qmljs_mul(const QV4::ValueRef left, const QV4::ValueRef right)
@@ -410,7 +410,7 @@ inline QV4::ReturnedValue __qmljs_mul(const QV4::ValueRef left, const QV4::Value
double lval = __qmljs_to_number(left);
double rval = __qmljs_to_number(right);
- return QV4::Value::fromDouble(lval * rval).asReturnedValue();
+ return QV4::Primitive::fromDouble(lval * rval).asReturnedValue();
}
inline QV4::ReturnedValue __qmljs_div(const QV4::ValueRef left, const QV4::ValueRef right)
@@ -419,7 +419,7 @@ inline QV4::ReturnedValue __qmljs_div(const QV4::ValueRef left, const QV4::Value
double lval = __qmljs_to_number(left);
double rval = __qmljs_to_number(right);
- return QV4::Value::fromDouble(lval / rval).asReturnedValue();
+ return QV4::Primitive::fromDouble(lval / rval).asReturnedValue();
}
inline QV4::ReturnedValue __qmljs_mod(const QV4::ValueRef left, const QV4::ValueRef right)
@@ -429,12 +429,12 @@ inline QV4::ReturnedValue __qmljs_mod(const QV4::ValueRef left, const QV4::Value
if (QV4::Value::integerCompatible(*left, *right) && right->integerValue() != 0) {
int intRes = left->integerValue() % right->integerValue();
if (intRes != 0 || left->integerValue() >= 0)
- return QV4::Value::fromInt32(intRes).asReturnedValue();
+ return QV4::Primitive::fromInt32(intRes).asReturnedValue();
}
double lval = __qmljs_to_number(left);
double rval = __qmljs_to_number(right);
- return QV4::Value::fromDouble(std::fmod(lval, rval)).asReturnedValue();
+ return QV4::Primitive::fromDouble(std::fmod(lval, rval)).asReturnedValue();
}
inline QV4::ReturnedValue __qmljs_shl(const QV4::ValueRef left, const QV4::ValueRef right)
@@ -442,11 +442,11 @@ inline QV4::ReturnedValue __qmljs_shl(const QV4::ValueRef left, const QV4::Value
TRACE2(left, right);
if (QV4::Value::integerCompatible(*left, *right))
- return QV4::Value::fromInt32(left->integerValue() << ((uint(right->integerValue()) & 0x1f))).asReturnedValue();
+ return QV4::Primitive::fromInt32(left->integerValue() << ((uint(right->integerValue()) & 0x1f))).asReturnedValue();
int lval = left->toInt32();
unsigned rval = right->toUInt32() & 0x1f;
- return QV4::Value::fromInt32(lval << rval).asReturnedValue();
+ return QV4::Primitive::fromInt32(lval << rval).asReturnedValue();
}
inline QV4::ReturnedValue __qmljs_shr(const QV4::ValueRef left, const QV4::ValueRef right)
@@ -454,11 +454,11 @@ inline QV4::ReturnedValue __qmljs_shr(const QV4::ValueRef left, const QV4::Value
TRACE2(left, right);
if (QV4::Value::integerCompatible(*left, *right))
- return QV4::Value::fromInt32(left->integerValue() >> ((uint(right->integerValue()) & 0x1f))).asReturnedValue();
+ return QV4::Primitive::fromInt32(left->integerValue() >> ((uint(right->integerValue()) & 0x1f))).asReturnedValue();
int lval = left->toInt32();
unsigned rval = right->toUInt32() & 0x1f;
- return QV4::Value::fromInt32(lval >> rval).asReturnedValue();
+ return QV4::Primitive::fromInt32(lval >> rval).asReturnedValue();
}
inline QV4::ReturnedValue __qmljs_ushr(const QV4::ValueRef left, const QV4::ValueRef right)
@@ -475,51 +475,51 @@ inline QV4::ReturnedValue __qmljs_ushr(const QV4::ValueRef left, const QV4::Valu
}
if (res > INT_MAX)
- return QV4::Value::fromDouble(res).asReturnedValue();
+ return QV4::Primitive::fromDouble(res).asReturnedValue();
else
- return QV4::Value::fromInt32(res).asReturnedValue();
+ return QV4::Primitive::fromInt32(res).asReturnedValue();
}
inline QV4::ReturnedValue __qmljs_gt(const QV4::ValueRef left, const QV4::ValueRef right)
{
TRACE2(left, right);
- return QV4::Value::fromBoolean(__qmljs_cmp_gt(left, right)).asReturnedValue();
+ return QV4::Primitive::fromBoolean(__qmljs_cmp_gt(left, right)).asReturnedValue();
}
inline QV4::ReturnedValue __qmljs_lt(const QV4::ValueRef left, const QV4::ValueRef right)
{
TRACE2(left, right);
- return QV4::Value::fromBoolean(__qmljs_cmp_lt(left, right)).asReturnedValue();
+ return QV4::Primitive::fromBoolean(__qmljs_cmp_lt(left, right)).asReturnedValue();
}
inline QV4::ReturnedValue __qmljs_ge(const QV4::ValueRef left, const QV4::ValueRef right)
{
TRACE2(left, right);
- return QV4::Value::fromBoolean(__qmljs_cmp_ge(left, right)).asReturnedValue();
+ return QV4::Primitive::fromBoolean(__qmljs_cmp_ge(left, right)).asReturnedValue();
}
inline QV4::ReturnedValue __qmljs_le(const QV4::ValueRef left, const QV4::ValueRef right)
{
TRACE2(left, right);
- return QV4::Value::fromBoolean(__qmljs_cmp_le(left, right)).asReturnedValue();
+ return QV4::Primitive::fromBoolean(__qmljs_cmp_le(left, right)).asReturnedValue();
}
inline QV4::ReturnedValue __qmljs_eq(const QV4::ValueRef left, const QV4::ValueRef right)
{
TRACE2(left, right);
- return QV4::Value::fromBoolean(__qmljs_cmp_eq(left, right)).asReturnedValue();
+ return QV4::Primitive::fromBoolean(__qmljs_cmp_eq(left, right)).asReturnedValue();
}
inline QV4::ReturnedValue __qmljs_ne(const QV4::ValueRef left, const QV4::ValueRef right)
{
TRACE2(left, right);
- return QV4::Value::fromBoolean(!__qmljs_cmp_eq(left, right)).asReturnedValue();
+ return QV4::Primitive::fromBoolean(!__qmljs_cmp_eq(left, right)).asReturnedValue();
}
inline QV4::ReturnedValue __qmljs_se(const QV4::ValueRef left, const QV4::ValueRef right)
@@ -527,7 +527,7 @@ inline QV4::ReturnedValue __qmljs_se(const QV4::ValueRef left, const QV4::ValueR
TRACE2(left, right);
bool r = __qmljs_strict_equal(left, right);
- return QV4::Value::fromBoolean(r).asReturnedValue();
+ return QV4::Primitive::fromBoolean(r).asReturnedValue();
}
inline QV4::ReturnedValue __qmljs_sne(const QV4::ValueRef left, const QV4::ValueRef right)
@@ -535,7 +535,7 @@ inline QV4::ReturnedValue __qmljs_sne(const QV4::ValueRef left, const QV4::Value
TRACE2(left, right);
bool r = ! __qmljs_strict_equal(left, right);
- return QV4::Value::fromBoolean(r).asReturnedValue();
+ return QV4::Primitive::fromBoolean(r).asReturnedValue();
}
inline QV4::Bool __qmljs_cmp_eq(const QV4::ValueRef left, const QV4::ValueRef right)
generated by cgit v1.2.3 (git 2.25.1) at 2024-06-03 17:31:40 +0000