From b2bf89d53c84a28e9f0b4791f27db5a2f4607fbf Mon Sep 17 00:00:00 2001 From: Lars Knoll Date: Wed, 30 Jan 2013 16:25:57 +0100 Subject: Remove some unused methods Change-Id: Ib487078db163e03bb0bd1be762f1aa0da04434b4 Reviewed-by: Simon Hausmann --- src/v4/qmljs_engine.cpp | 51 +------------------------------------------- src/v4/qmljs_engine.h | 14 ------------ src/v4/qmljs_environment.cpp | 2 +- src/v4/qv4mathobject.cpp | 2 ++ 4 files changed, 4 insertions(+), 65 deletions(-) diff --git a/src/v4/qmljs_engine.cpp b/src/v4/qmljs_engine.cpp index f17da76e..55121cd1 100644 --- a/src/v4/qmljs_engine.cpp +++ b/src/v4/qmljs_engine.cpp @@ -196,7 +196,7 @@ ExecutionEngine::ExecutionEngine(EvalISelFactory *factory) glo->defineDefaultProperty(rootContext, QStringLiteral("SyntaxError"), syntaxErrorCtor); glo->defineDefaultProperty(rootContext, QStringLiteral("TypeError"), typeErrorCtor); glo->defineDefaultProperty(rootContext, QStringLiteral("URIError"), uRIErrorCtor); - glo->defineDefaultProperty(rootContext, QStringLiteral("Math"), Value::fromObject(newMathObject(rootContext))); + glo->defineDefaultProperty(rootContext, QStringLiteral("Math"), Value::fromObject(new (memoryManager) MathObject(rootContext))); glo->defineDefaultProperty(rootContext, QStringLiteral("JSON"), Value::fromObject(new (memoryManager) JsonObject(rootContext))); glo->defineReadonlyProperty(this, QStringLiteral("undefined"), Value::undefinedValue()); @@ -275,11 +275,6 @@ Object *ExecutionEngine::newObject() return object; } -FunctionObject *ExecutionEngine::newObjectCtor(ExecutionContext *ctx) -{ - return new (memoryManager) ObjectCtor(ctx); -} - String *ExecutionEngine::newString(const QString &s) { return new (memoryManager) String(s); @@ -290,8 +285,6 @@ String *ExecutionEngine::newIdentifier(const QString &text) return identifierCache->insert(text); } - - Object *ExecutionEngine::newStringObject(ExecutionContext *ctx, const Value &value) { StringObject *object = new (memoryManager) StringObject(ctx, value); @@ -299,11 +292,6 @@ Object *ExecutionEngine::newStringObject(ExecutionContext *ctx, const Value &val return object; } -FunctionObject *ExecutionEngine::newStringCtor(ExecutionContext *ctx) -{ - return new (memoryManager) StringCtor(ctx); -} - Object *ExecutionEngine::newNumberObject(const Value &value) { NumberObject *object = new (memoryManager) NumberObject(value); @@ -311,11 +299,6 @@ Object *ExecutionEngine::newNumberObject(const Value &value) return object; } -FunctionObject *ExecutionEngine::newNumberCtor(ExecutionContext *ctx) -{ - return new (memoryManager) NumberCtor(ctx); -} - Object *ExecutionEngine::newBooleanObject(const Value &value) { Object *object = new (memoryManager) BooleanObject(value); @@ -323,11 +306,6 @@ Object *ExecutionEngine::newBooleanObject(const Value &value) return object; } -FunctionObject *ExecutionEngine::newBooleanCtor(ExecutionContext *ctx) -{ - return new (memoryManager) BooleanCtor(ctx); -} - Object *ExecutionEngine::newFunctionObject(ExecutionContext *ctx) { Object *object = new (memoryManager) FunctionObject(ctx); @@ -349,11 +327,6 @@ ArrayObject *ExecutionEngine::newArrayObject(ExecutionContext *ctx, const Array return object; } -FunctionObject *ExecutionEngine::newArrayCtor(ExecutionContext *ctx) -{ - return new (memoryManager) ArrayCtor(ctx); -} - Object *ExecutionEngine::newDateObject(const Value &value) { Object *object = new (memoryManager) DateObject(value); @@ -361,11 +334,6 @@ Object *ExecutionEngine::newDateObject(const Value &value) return object; } -FunctionObject *ExecutionEngine::newDateCtor(ExecutionContext *ctx) -{ - return new (memoryManager) DateCtor(ctx); -} - RegExpObject *ExecutionEngine::newRegExpObject(const QString &pattern, int flags) { bool global = (flags & IR::RegExp::RegExp_Global); @@ -386,11 +354,6 @@ RegExpObject *ExecutionEngine::newRegExpObject(PassRefPtr re, bool globa return object; } -FunctionObject *ExecutionEngine::newRegExpCtor(ExecutionContext *ctx) -{ - return new (memoryManager) RegExpCtor(ctx); -} - Object *ExecutionEngine::newErrorObject(const Value &value) { ErrorObject *object = new (memoryManager) ErrorObject(this, value); @@ -423,18 +386,6 @@ Object *ExecutionEngine::newURIErrorObject(ExecutionContext *ctx, Value message) return new (memoryManager) URIErrorObject(ctx, message); } -Object *ExecutionEngine::newMathObject(ExecutionContext *ctx) -{ - MathObject *object = new (memoryManager) MathObject(ctx); - object->prototype = objectPrototype; - return object; -} - -Object *ExecutionEngine::newActivationObject() -{ - return new (memoryManager) Object(); -} - Object *ExecutionEngine::newForEachIteratorObject(ExecutionContext *ctx, Object *o) { return new (memoryManager) ForEachIteratorObject(ctx, o); diff --git a/src/v4/qmljs_engine.h b/src/v4/qmljs_engine.h index 0f82e5d7..013a2b6a 100644 --- a/src/v4/qmljs_engine.h +++ b/src/v4/qmljs_engine.h @@ -188,33 +188,22 @@ struct Q_V4_EXPORT ExecutionEngine BoundFunction *newBoundFunction(ExecutionContext *scope, FunctionObject *target, Value boundThis, const QVector &boundArgs); Object *newObject(); - FunctionObject *newObjectCtor(ExecutionContext *ctx); String *newString(const QString &s); String *newIdentifier(const QString &text); - Object *newStringObject(ExecutionContext *ctx, const Value &value); - FunctionObject *newStringCtor(ExecutionContext *ctx); - Object *newNumberObject(const Value &value); - FunctionObject *newNumberCtor(ExecutionContext *ctx); - Object *newBooleanObject(const Value &value); - FunctionObject *newBooleanCtor(ExecutionContext *ctx); - Object *newFunctionObject(ExecutionContext *ctx); ArrayObject *newArrayObject(ExecutionContext *ctx); ArrayObject *newArrayObject(ExecutionContext *ctx, const Array &value); - FunctionObject *newArrayCtor(ExecutionContext *ctx); Object *newDateObject(const Value &value); - FunctionObject *newDateCtor(ExecutionContext *ctx); RegExpObject *newRegExpObject(const QString &pattern, int flags); RegExpObject *newRegExpObject(PassRefPtr re, bool global); - FunctionObject *newRegExpCtor(ExecutionContext *ctx); Object *newErrorObject(const Value &value); Object *newSyntaxErrorObject(ExecutionContext *ctx, DiagnosticMessage *message); @@ -223,9 +212,6 @@ struct Q_V4_EXPORT ExecutionEngine Object *newRangeErrorObject(ExecutionContext *ctx, const QString &message); Object *newURIErrorObject(ExecutionContext *ctx, Value message); - Object *newMathObject(ExecutionContext *ctx); - Object *newActivationObject(); - Object *newForEachIteratorObject(ExecutionContext *ctx, Object *o); void requireArgumentsAccessors(int n); diff --git a/src/v4/qmljs_environment.cpp b/src/v4/qmljs_environment.cpp index 67f5994d..8ff93c1b 100644 --- a/src/v4/qmljs_environment.cpp +++ b/src/v4/qmljs_environment.cpp @@ -100,7 +100,7 @@ bool ExecutionContext::hasBinding(String *name) const void ExecutionContext::createMutableBinding(String *name, bool deletable) { if (!activation) - activation = engine->newActivationObject(); + activation = engine->newObject(); if (activation->__hasProperty__(this, name)) return; diff --git a/src/v4/qv4mathobject.cpp b/src/v4/qv4mathobject.cpp index e40faba8..eae50c4d 100644 --- a/src/v4/qv4mathobject.cpp +++ b/src/v4/qv4mathobject.cpp @@ -40,6 +40,7 @@ ****************************************************************************/ #include "qv4mathobject.h" +#include "qv4objectproto.h" #include #include @@ -52,6 +53,7 @@ static const double qt_PI = 2.0 * ::asin(1.0); MathObject::MathObject(ExecutionContext *ctx) { type = Type_MathObject; + prototype = ctx->engine->objectPrototype; defineReadonlyProperty(ctx->engine, QStringLiteral("E"), Value::fromDouble(::exp(1.0))); defineReadonlyProperty(ctx->engine, QStringLiteral("LN2"), Value::fromDouble(::log(2.0))); -- cgit v1.2.3