From fee823ed6adc77db563468539b47b9d10e02e5c8 Mon Sep 17 00:00:00 2001 From: Aaron Kennedy Date: Mon, 10 Oct 2011 16:38:07 +1000 Subject: [PATCH] Rename QDeclarativeV4 -> QV4 Change-Id: Ic35e0ad1663cafe4aa535594dc3999a2d317ce0e Reviewed-on: http://codereview.qt-project.org/6301 Reviewed-by: Aaron Kennedy Sanity-Review: Aaron Kennedy --- src/declarative/qml/qdeclarativecompiler.cpp | 6 +- src/declarative/qml/qdeclarativecontext.cpp | 2 +- src/declarative/qml/qdeclarativecontext_p.h | 4 +- src/declarative/qml/qdeclarativevme.cpp | 4 +- ...{qdeclarativev4bindings.cpp => qv4bindings.cpp} | 58 +++--- ...{qdeclarativev4bindings_p.h => qv4bindings_p.h} | 26 +-- ...{qdeclarativev4compiler.cpp => qv4compiler.cpp} | 108 +++++------ ...{qdeclarativev4compiler_p.h => qv4compiler_p.h} | 16 +- ...clarativev4compiler_p_p.h => qv4compiler_p_p.h} | 16 +- ...arativev4instruction.cpp => qv4instruction.cpp} | 6 +- ...arativev4instruction_p.h => qv4instruction_p.h} | 6 +- .../qml/v4/{qdeclarativev4ir.cpp => qv4ir.cpp} | 2 +- .../qml/v4/{qdeclarativev4ir_p.h => qv4ir_p.h} | 8 +- ...declarativev4irbuilder.cpp => qv4irbuilder.cpp} | 210 ++++++++++----------- ...declarativev4irbuilder_p.h => qv4irbuilder_p.h} | 14 +- .../{qdeclarativev4program_p.h => qv4program_p.h} | 18 +- src/declarative/qml/v4/v4.pri | 24 +-- src/declarative/qml/v8/qv8bindings_p.h | 1 - tests/auto/declarative/declarative.pro | 2 +- .../data/conditionalExpr.qml | 0 .../{qdeclarativev4 => v4}/data/doubleBoolJump.qml | 0 .../{qdeclarativev4 => v4}/data/fetchException.qml | 0 .../{qdeclarativev4 => v4}/data/logicalOr.2.qml | 0 .../{qdeclarativev4 => v4}/data/logicalOr.qml | 0 .../data/nestedObjectAccess.qml | 0 .../{qdeclarativev4 => v4}/data/nullQObject.qml | 0 .../data/qrealToIntRounding.qml | 0 .../data/subscriptionsInConditionalExpressions.qml | 0 .../{qdeclarativev4 => v4}/data/unaryMinus.qml | 0 .../data/unnecessaryReeval.qml | 0 .../{qdeclarativev4 => v4}/testtypes.cpp | 0 .../declarative/{qdeclarativev4 => v4}/testtypes.h | 0 .../tst_qdeclarativev4.cpp => v4/tst_v4.cpp} | 32 ++-- .../qdeclarativev4.pro => v4/v4.pro} | 2 +- 34 files changed, 282 insertions(+), 283 deletions(-) rename src/declarative/qml/v4/{qdeclarativev4bindings.cpp => qv4bindings.cpp} (95%) rename src/declarative/qml/v4/{qdeclarativev4bindings_p.h => qv4bindings_p.h} (87%) rename src/declarative/qml/v4/{qdeclarativev4compiler.cpp => qv4compiler.cpp} (90%) rename src/declarative/qml/v4/{qdeclarativev4compiler_p.h => qv4compiler_p.h} (91%) rename src/declarative/qml/v4/{qdeclarativev4compiler_p_p.h => qv4compiler_p_p.h} (95%) rename src/declarative/qml/v4/{qdeclarativev4instruction.cpp => qv4instruction.cpp} (99%) rename src/declarative/qml/v4/{qdeclarativev4instruction_p.h => qv4instruction_p.h} (98%) rename src/declarative/qml/v4/{qdeclarativev4ir.cpp => qv4ir.cpp} (99%) rename src/declarative/qml/v4/{qdeclarativev4ir_p.h => qv4ir_p.h} (99%) rename src/declarative/qml/v4/{qdeclarativev4irbuilder.cpp => qv4irbuilder.cpp} (82%) rename src/declarative/qml/v4/{qdeclarativev4irbuilder_p.h => qv4irbuilder_p.h} (96%) rename src/declarative/qml/v4/{qdeclarativev4program_p.h => qv4program_p.h} (87%) rename tests/auto/declarative/{qdeclarativev4 => v4}/data/conditionalExpr.qml (100%) rename tests/auto/declarative/{qdeclarativev4 => v4}/data/doubleBoolJump.qml (100%) rename tests/auto/declarative/{qdeclarativev4 => v4}/data/fetchException.qml (100%) rename tests/auto/declarative/{qdeclarativev4 => v4}/data/logicalOr.2.qml (100%) rename tests/auto/declarative/{qdeclarativev4 => v4}/data/logicalOr.qml (100%) rename tests/auto/declarative/{qdeclarativev4 => v4}/data/nestedObjectAccess.qml (100%) rename tests/auto/declarative/{qdeclarativev4 => v4}/data/nullQObject.qml (100%) rename tests/auto/declarative/{qdeclarativev4 => v4}/data/qrealToIntRounding.qml (100%) rename tests/auto/declarative/{qdeclarativev4 => v4}/data/subscriptionsInConditionalExpressions.qml (100%) rename tests/auto/declarative/{qdeclarativev4 => v4}/data/unaryMinus.qml (100%) rename tests/auto/declarative/{qdeclarativev4 => v4}/data/unnecessaryReeval.qml (100%) rename tests/auto/declarative/{qdeclarativev4 => v4}/testtypes.cpp (100%) rename tests/auto/declarative/{qdeclarativev4 => v4}/testtypes.h (100%) rename tests/auto/declarative/{qdeclarativev4/tst_qdeclarativev4.cpp => v4/tst_v4.cpp} (89%) rename tests/auto/declarative/{qdeclarativev4/qdeclarativev4.pro => v4/v4.pro} (87%) diff --git a/src/declarative/qml/qdeclarativecompiler.cpp b/src/declarative/qml/qdeclarativecompiler.cpp index c736c3f..0582a43 100644 --- a/src/declarative/qml/qdeclarativecompiler.cpp +++ b/src/declarative/qml/qdeclarativecompiler.cpp @@ -61,7 +61,7 @@ #include "qdeclarativescriptstring.h" #include "private/qdeclarativeglobal_p.h" #include "private/qdeclarativebinding_p.h" -#include "private/qdeclarativev4compiler_p.h" +#include "private/qv4compiler_p.h" #include #include @@ -3298,12 +3298,12 @@ bool QDeclarativeCompiler::completeComponentBuild() aliasObject = compileState->aliasingObjects.next(aliasObject)) COMPILE_CHECK(buildDynamicMeta(aliasObject, ResolveAliases)); - QDeclarativeV4Compiler::Expression expr(unit->imports()); + QV4Compiler::Expression expr(unit->imports()); expr.component = compileState->root; expr.ids = &compileState->ids; expr.importCache = output->importCache; - QDeclarativeV4Compiler bindingCompiler; + QV4Compiler bindingCompiler; QList sharedBindings; diff --git a/src/declarative/qml/qdeclarativecontext.cpp b/src/declarative/qml/qdeclarativecontext.cpp index 73f05e4..fc5091e 100644 --- a/src/declarative/qml/qdeclarativecontext.cpp +++ b/src/declarative/qml/qdeclarativecontext.cpp @@ -47,7 +47,7 @@ #include "private/qdeclarativeengine_p.h" #include "qdeclarativeengine.h" #include "qdeclarativeinfo.h" -#include "private/qdeclarativev4bindings_p.h" +#include "private/qv4bindings_p.h" #include "private/qv8bindings_p.h" #include diff --git a/src/declarative/qml/qdeclarativecontext_p.h b/src/declarative/qml/qdeclarativecontext_p.h index 05750b0..6fd8957 100644 --- a/src/declarative/qml/qdeclarativecontext_p.h +++ b/src/declarative/qml/qdeclarativecontext_p.h @@ -80,7 +80,7 @@ class QDeclarativeEngine; class QDeclarativeExpression; class QDeclarativeExpressionPrivate; class QDeclarativeAbstractExpression; -class QDeclarativeV4Bindings; +class QV4Bindings; class QDeclarativeContextData; class QDeclarativeContextPrivate : public QObjectPrivate @@ -206,7 +206,7 @@ public: QDeclarativeComponentAttached *componentAttached; // Optimized binding objects. Needed for deferred properties. - QDeclarativeV4Bindings *v4bindings; + QV4Bindings *v4bindings; QV8Bindings *v8bindings; // Return the outermost id for obj, if any. diff --git a/src/declarative/qml/qdeclarativevme.cpp b/src/declarative/qml/qdeclarativevme.cpp index dbef83b..a1c45c4 100644 --- a/src/declarative/qml/qdeclarativevme.cpp +++ b/src/declarative/qml/qdeclarativevme.cpp @@ -58,7 +58,7 @@ #include "private/qdeclarativevmemetaobject_p.h" #include "private/qdeclarativebinding_p_p.h" #include "private/qdeclarativecontext_p.h" -#include "private/qdeclarativev4bindings_p.h" +#include "private/qv4bindings_p.h" #include "private/qv8bindings_p.h" #include "private/qdeclarativeglobal_p.h" #include "private/qfinitestack_p.h" @@ -306,7 +306,7 @@ QObject *QDeclarativeVME::run(QList *errors, CTXT->setIdPropertyData(COMP->contextCaches.at(instr.contextCache)); if (instr.compiledBinding != -1) { const char *v4data = DATAS.at(instr.compiledBinding).constData(); - CTXT->v4bindings = new QDeclarativeV4Bindings(v4data, CTXT, COMP); + CTXT->v4bindings = new QV4Bindings(v4data, CTXT, COMP); } if (states.count() == 1) { rootContext = CTXT; diff --git a/src/declarative/qml/v4/qdeclarativev4bindings.cpp b/src/declarative/qml/v4/qv4bindings.cpp similarity index 95% rename from src/declarative/qml/v4/qdeclarativev4bindings.cpp rename to src/declarative/qml/v4/qv4bindings.cpp index df2ce7b..b5229ae 100644 --- a/src/declarative/qml/v4/qdeclarativev4bindings.cpp +++ b/src/declarative/qml/v4/qv4bindings.cpp @@ -41,10 +41,10 @@ // #define REGISTER_CLEANUP_DEBUG -#include "private/qdeclarativev4bindings_p.h" -#include "private/qdeclarativev4program_p.h" -#include "private/qdeclarativev4compiler_p.h" -#include "private/qdeclarativev4compiler_p_p.h" +#include "private/qv4bindings_p.h" +#include "private/qv4program_p.h" +#include "private/qv4compiler_p.h" +#include "private/qv4compiler_p_p.h" #include #include @@ -187,12 +187,12 @@ void Register::init(Type type) } // end of anonymous namespace -QDeclarativeV4Bindings::QDeclarativeV4Bindings(const char *programData, +QV4Bindings::QV4Bindings(const char *programData, QDeclarativeContextData *context, QDeclarativeRefCount *ref) : subscriptions(0), program(0), dataRef(0), bindings(0) { - program = (QDeclarativeV4Program *)programData; + program = (QV4Program *)programData; dataRef = ref; if (dataRef) dataRef->addref(); @@ -204,14 +204,14 @@ QDeclarativeV4Bindings::QDeclarativeV4Bindings(const char *programData, } } -QDeclarativeV4Bindings::~QDeclarativeV4Bindings() +QV4Bindings::~QV4Bindings() { delete [] bindings; delete [] subscriptions; subscriptions = 0; if (dataRef) dataRef->release(); } -QDeclarativeAbstractBinding *QDeclarativeV4Bindings::configBinding(int index, QObject *target, +QDeclarativeAbstractBinding *QV4Bindings::configBinding(int index, QObject *target, QObject *scope, int property) { Binding *rv = bindings + index; @@ -227,7 +227,7 @@ QDeclarativeAbstractBinding *QDeclarativeV4Bindings::configBinding(int index, QO return rv; } -void QDeclarativeV4Bindings::Binding::setEnabled(bool e, QDeclarativePropertyPrivate::WriteFlags flags) +void QV4Bindings::Binding::setEnabled(bool e, QDeclarativePropertyPrivate::WriteFlags flags) { if (enabled != e) { enabled = e; @@ -236,14 +236,14 @@ void QDeclarativeV4Bindings::Binding::setEnabled(bool e, QDeclarativePropertyPri } } -void QDeclarativeV4Bindings::Binding::update(QDeclarativePropertyPrivate::WriteFlags flags) +void QV4Bindings::Binding::update(QDeclarativePropertyPrivate::WriteFlags flags) { QDeclarativeDebugTrace::startRange(QDeclarativeDebugTrace::Binding); parent->run(this, flags); QDeclarativeDebugTrace::endRange(QDeclarativeDebugTrace::Binding); } -void QDeclarativeV4Bindings::Binding::destroy() +void QV4Bindings::Binding::destroy() { enabled = false; removeFromObject(); @@ -252,18 +252,18 @@ void QDeclarativeV4Bindings::Binding::destroy() parent->release(); } -void QDeclarativeV4Bindings::Subscription::subscriptionCallback(QDeclarativeNotifierEndpoint *e) +void QV4Bindings::Subscription::subscriptionCallback(QDeclarativeNotifierEndpoint *e) { Subscription *s = static_cast(e); s->bindings->subscriptionNotify(s->method); } -void QDeclarativeV4Bindings::subscriptionNotify(int id) +void QV4Bindings::subscriptionNotify(int id) { - QDeclarativeV4Program::BindingReferenceList *list = program->signalTable(id); + QV4Program::BindingReferenceList *list = program->signalTable(id); for (quint32 ii = 0; ii < list->count; ++ii) { - QDeclarativeV4Program::BindingReference *bindingRef = list->bindings + ii; + QV4Program::BindingReference *bindingRef = list->bindings + ii; Binding *binding = bindings + bindingRef->binding; if (binding->executedBlocks & bindingRef->blockMask) @@ -271,7 +271,7 @@ void QDeclarativeV4Bindings::subscriptionNotify(int id) } } -void QDeclarativeV4Bindings::run(Binding *binding, QDeclarativePropertyPrivate::WriteFlags flags) +void QV4Bindings::run(Binding *binding, QDeclarativePropertyPrivate::WriteFlags flags) { if (!binding->enabled) return; @@ -317,13 +317,13 @@ void QDeclarativeV4Bindings::run(Binding *binding, QDeclarativePropertyPrivate:: } -void QDeclarativeV4Bindings::unsubscribe(int subIndex) +void QV4Bindings::unsubscribe(int subIndex) { Subscription *sub = (subscriptions + subIndex); sub->disconnect(); } -void QDeclarativeV4Bindings::subscribeId(QDeclarativeContextData *p, int idIndex, int subIndex) +void QV4Bindings::subscribeId(QDeclarativeContextData *p, int idIndex, int subIndex) { unsubscribe(subIndex); @@ -335,7 +335,7 @@ void QDeclarativeV4Bindings::subscribeId(QDeclarativeContextData *p, int idIndex } } -void QDeclarativeV4Bindings::subscribe(QObject *o, int notifyIndex, int subIndex) +void QV4Bindings::subscribe(QObject *o, int notifyIndex, int subIndex) { Subscription *sub = (subscriptions + subIndex); sub->bindings = this; @@ -544,7 +544,7 @@ static void testBindingResult(const QString &binding, int line, int column, iserror = true; if (iserror) { - qWarning().nospace() << "QDeclarativeV4: Optimization error @" << context->url.toString().toUtf8().constData() << ":" << line << ":" << column; + qWarning().nospace() << "QV4: Optimization error @" << context->url.toString().toUtf8().constData() << ":" << line << ":" << column; qWarning().nospace() << " Binding: " << binding; qWarning().nospace() << " QtScript: " << qtscriptResult.constData(); @@ -561,7 +561,7 @@ static void testBindingException(const QString &binding, int line, int column, if (!expression.hasError()) { QByteArray qtscriptResult = testResultToString(value, isUndefined); - qWarning().nospace() << "QDeclarativeV4: Optimization error @" << context->url.toString().toUtf8().constData() << ":" << line << ":" << column; + qWarning().nospace() << "QV4: Optimization error @" << context->url.toString().toUtf8().constData() << ":" << line << ":" << column; qWarning().nospace() << " Binding: " << binding; qWarning().nospace() << " QtScript: " << qtscriptResult.constData(); qWarning().nospace() << " V4: exception"; @@ -569,7 +569,7 @@ static void testBindingException(const QString &binding, int line, int column, } static void throwException(int id, QDeclarativeDelayedError *error, - QDeclarativeV4Program *program, QDeclarativeContextData *context, + QV4Program *program, QDeclarativeContextData *context, const QString &description = QString()) { error->error.setUrl(context->url); @@ -589,9 +589,9 @@ static void throwException(int id, QDeclarativeDelayedError *error, QDeclarativeEnginePrivate::warning(context->engine, error->error); } -const qreal QDeclarativeV4Bindings::D32 = 4294967296.0; +const qreal QV4Bindings::D32 = 4294967296.0; -qint32 QDeclarativeV4Bindings::toInt32(qreal n) +qint32 QV4Bindings::toInt32(qreal n) { if (qIsNaN(n) || qIsInf(n) || (n == 0)) return 0; @@ -611,7 +611,7 @@ qint32 QDeclarativeV4Bindings::toInt32(qreal n) return qint32 (n); } -inline quint32 QDeclarativeV4Bindings::toUint32(qreal n) +inline quint32 QV4Bindings::toUint32(qreal n) { if (qIsNaN(n) || qIsInf(n) || (n == 0)) return 0; @@ -654,11 +654,11 @@ inline quint32 QDeclarativeV4Bindings::toUint32(qreal n) } #ifdef QML_THREADED_INTERPRETER -void **QDeclarativeV4Bindings::getDecodeInstrTable() +void **QV4Bindings::getDecodeInstrTable() { static void **decode_instr; if (!decode_instr) { - QDeclarativeV4Bindings *dummy = new QDeclarativeV4Bindings(0, 0, 0); + QV4Bindings *dummy = new QV4Bindings(0, 0, 0); quint32 executedBlocks = 0; dummy->run(0, executedBlocks, 0, 0, 0, 0, QDeclarativePropertyPrivate::BypassInterceptor, @@ -669,7 +669,7 @@ void **QDeclarativeV4Bindings::getDecodeInstrTable() } #endif -void QDeclarativeV4Bindings::run(int instrIndex, quint32 &executedBlocks, +void QV4Bindings::run(int instrIndex, quint32 &executedBlocks, QDeclarativeContextData *context, QDeclarativeDelayedError *error, QObject *scope, QObject *output, QDeclarativePropertyPrivate::WriteFlags storeFlags @@ -1411,7 +1411,7 @@ void QDeclarativeV4Bindings::run(int instrIndex, quint32 &executedBlocks, // nothing to do #else default: - qFatal("QDeclarativeV4: Unknown instruction %d encountered.", instr->common.type); + qFatal("QV4: Unknown instruction %d encountered.", instr->common.type); break; } // switch diff --git a/src/declarative/qml/v4/qdeclarativev4bindings_p.h b/src/declarative/qml/v4/qv4bindings_p.h similarity index 87% rename from src/declarative/qml/v4/qdeclarativev4bindings_p.h rename to src/declarative/qml/v4/qv4bindings_p.h index d69d75b..8d68863 100644 --- a/src/declarative/qml/v4/qdeclarativev4bindings_p.h +++ b/src/declarative/qml/v4/qv4bindings_p.h @@ -39,8 +39,8 @@ ** ****************************************************************************/ -#ifndef QDECLARATIVEV4BINDINGS_P_H -#define QDECLARATIVEV4BINDINGS_P_H +#ifndef QV4BINDINGS_P_H +#define QV4BINDINGS_P_H // // W A R N I N G @@ -55,21 +55,21 @@ #include "private/qdeclarativeexpression_p.h" #include "private/qdeclarativebinding_p.h" -#include "private/qdeclarativev4instruction_p.h" +#include "private/qv4instruction_p.h" QT_BEGIN_HEADER QT_BEGIN_NAMESPACE -class QDeclarativeV4Program; -class QDeclarativeV4Bindings : public QDeclarativeAbstractExpression, +class QV4Program; +class QV4Bindings : public QDeclarativeAbstractExpression, public QDeclarativeRefCount { - Q_DECLARE_TR_FUNCTIONS(QDeclarativeV4Bindings) + Q_DECLARE_TR_FUNCTIONS(QV4Bindings) public: - QDeclarativeV4Bindings(const char *program, QDeclarativeContextData *context, + QV4Bindings(const char *program, QDeclarativeContextData *context, QDeclarativeRefCount *); - virtual ~QDeclarativeV4Bindings(); + virtual ~QV4Bindings(); QDeclarativeAbstractBinding *configBinding(int index, QObject *target, QObject *scope, int property); @@ -79,7 +79,7 @@ public: #endif private: - Q_DISABLE_COPY(QDeclarativeV4Bindings) + Q_DISABLE_COPY(QV4Bindings) struct Binding : public QDeclarativeAbstractBinding, public QDeclarativeDelayedError { Binding() : enabled(false), updating(0), property(0), @@ -98,14 +98,14 @@ private: QObject *target; quint32 executedBlocks; - QDeclarativeV4Bindings *parent; + QV4Bindings *parent; }; struct Subscription : public QDeclarativeNotifierEndpoint { Subscription() : bindings(0), method(-1) { callback = &subscriptionCallback; } static void subscriptionCallback(QDeclarativeNotifierEndpoint *e); - QDeclarativeV4Bindings *bindings; + QV4Bindings *bindings; int method; }; friend class Subscription; @@ -115,7 +115,7 @@ private: void subscriptionNotify(int); void run(Binding *, QDeclarativePropertyPrivate::WriteFlags flags); - QDeclarativeV4Program *program; + QV4Program *program; QDeclarativeRefCount *dataRef; Binding *bindings; @@ -143,5 +143,5 @@ QT_END_NAMESPACE QT_END_HEADER -#endif // QDECLARATIVEV4BINDINGS_P_H +#endif // QV4BINDINGS_P_H diff --git a/src/declarative/qml/v4/qdeclarativev4compiler.cpp b/src/declarative/qml/v4/qv4compiler.cpp similarity index 90% rename from src/declarative/qml/v4/qdeclarativev4compiler.cpp rename to src/declarative/qml/v4/qv4compiler.cpp index 35ec924..ba739a9 100644 --- a/src/declarative/qml/v4/qdeclarativev4compiler.cpp +++ b/src/declarative/qml/v4/qv4compiler.cpp @@ -39,11 +39,11 @@ ** ****************************************************************************/ -#include "qdeclarativev4compiler_p.h" -#include "qdeclarativev4compiler_p_p.h" -#include "qdeclarativev4program_p.h" -#include "qdeclarativev4ir_p.h" -#include "qdeclarativev4irbuilder_p.h" +#include "qv4compiler_p.h" +#include "qv4compiler_p_p.h" +#include "qv4program_p.h" +#include "qv4ir_p.h" +#include "qv4irbuilder_p.h" #include #include @@ -61,7 +61,7 @@ DEFINE_BOOL_CONFIG_OPTION(qmlBindingsTestEnv, QML_BINDINGS_TEST) static bool qmlBindingsTest = false; using namespace QDeclarativeJS; -QDeclarativeV4CompilerPrivate::QDeclarativeV4CompilerPrivate() +QV4CompilerPrivate::QV4CompilerPrivate() : _function(0) , _block(0) , _discarded(false) { } @@ -69,7 +69,7 @@ QDeclarativeV4CompilerPrivate::QDeclarativeV4CompilerPrivate() // // tracing // -void QDeclarativeV4CompilerPrivate::trace(int line, int column) +void QV4CompilerPrivate::trace(int line, int column) { bytecode.clear(); @@ -176,7 +176,7 @@ void QDeclarativeV4CompilerPrivate::trace(int line, int column) } } -void QDeclarativeV4CompilerPrivate::trace(QVector *blocks) +void QV4CompilerPrivate::trace(QVector *blocks) { for (int i = 0; i < _function->basicBlocks.size(); ++i) { IR::BasicBlock *block = _function->basicBlocks.at(i); @@ -194,7 +194,7 @@ void QDeclarativeV4CompilerPrivate::trace(QVector *blocks) } } -void QDeclarativeV4CompilerPrivate::traceExpression(IR::Expr *e, quint8 r) +void QV4CompilerPrivate::traceExpression(IR::Expr *e, quint8 r) { if (!e) { discard(); @@ -208,7 +208,7 @@ void QDeclarativeV4CompilerPrivate::traceExpression(IR::Expr *e, quint8 r) // // expressions // -void QDeclarativeV4CompilerPrivate::visitConst(IR::Const *e) +void QV4CompilerPrivate::visitConst(IR::Const *e) { switch (e->type) { case IR::BoolType: { @@ -239,12 +239,12 @@ void QDeclarativeV4CompilerPrivate::visitConst(IR::Const *e) } } -void QDeclarativeV4CompilerPrivate::visitString(IR::String *e) +void QV4CompilerPrivate::visitString(IR::String *e) { registerLiteralString(currentReg, e->value); } -void QDeclarativeV4CompilerPrivate::visitName(IR::Name *e) +void QV4CompilerPrivate::visitName(IR::Name *e) { if (e->base) { // fetch the object and store it in reg. @@ -384,7 +384,7 @@ void QDeclarativeV4CompilerPrivate::visitName(IR::Name *e) } // switch } -void QDeclarativeV4CompilerPrivate::visitTemp(IR::Temp *e) +void QV4CompilerPrivate::visitTemp(IR::Temp *e) { if (currentReg != e->index) { Instr::Copy i; @@ -394,7 +394,7 @@ void QDeclarativeV4CompilerPrivate::visitTemp(IR::Temp *e) } } -void QDeclarativeV4CompilerPrivate::visitUnop(IR::Unop *e) +void QV4CompilerPrivate::visitUnop(IR::Unop *e) { quint8 src = currentReg; @@ -492,7 +492,7 @@ void QDeclarativeV4CompilerPrivate::visitUnop(IR::Unop *e) } // switch } -void QDeclarativeV4CompilerPrivate::convertToReal(IR::Expr *expr, int reg) +void QV4CompilerPrivate::convertToReal(IR::Expr *expr, int reg) { if (expr->type == IR::RealType) return; @@ -520,7 +520,7 @@ void QDeclarativeV4CompilerPrivate::convertToReal(IR::Expr *expr, int reg) } // switch } -void QDeclarativeV4CompilerPrivate::convertToInt(IR::Expr *expr, int reg) +void QV4CompilerPrivate::convertToInt(IR::Expr *expr, int reg) { if (expr->type == IR::IntType) return; @@ -548,7 +548,7 @@ void QDeclarativeV4CompilerPrivate::convertToInt(IR::Expr *expr, int reg) } // switch } -void QDeclarativeV4CompilerPrivate::convertToBool(IR::Expr *expr, int reg) +void QV4CompilerPrivate::convertToBool(IR::Expr *expr, int reg) { if (expr->type == IR::BoolType) return; @@ -582,7 +582,7 @@ void QDeclarativeV4CompilerPrivate::convertToBool(IR::Expr *expr, int reg) } // switch } -quint8 QDeclarativeV4CompilerPrivate::instructionOpcode(IR::Binop *e) +quint8 QV4CompilerPrivate::instructionOpcode(IR::Binop *e) { switch (e->op) { case IR::OpInvalid: @@ -679,7 +679,7 @@ quint8 QDeclarativeV4CompilerPrivate::instructionOpcode(IR::Binop *e) return V4Instr::Noop; } -void QDeclarativeV4CompilerPrivate::visitBinop(IR::Binop *e) +void QV4CompilerPrivate::visitBinop(IR::Binop *e) { int left = currentReg; int right = currentReg + 1; @@ -774,7 +774,7 @@ void QDeclarativeV4CompilerPrivate::visitBinop(IR::Binop *e) } } -void QDeclarativeV4CompilerPrivate::visitCall(IR::Call *call) +void QV4CompilerPrivate::visitCall(IR::Call *call) { if (IR::Name *name = call->base->asName()) { IR::Expr *arg = call->onlyArgument(); @@ -824,12 +824,12 @@ void QDeclarativeV4CompilerPrivate::visitCall(IR::Call *call) // // statements // -void QDeclarativeV4CompilerPrivate::visitExp(IR::Exp *s) +void QV4CompilerPrivate::visitExp(IR::Exp *s) { traceExpression(s->expr, currentReg); } -void QDeclarativeV4CompilerPrivate::visitMove(IR::Move *s) +void QV4CompilerPrivate::visitMove(IR::Move *s) { IR::Temp *target = s->target->asTemp(); Q_ASSERT(target != 0); @@ -893,7 +893,7 @@ void QDeclarativeV4CompilerPrivate::visitMove(IR::Move *s) } } -void QDeclarativeV4CompilerPrivate::visitJump(IR::Jump *s) +void QV4CompilerPrivate::visitJump(IR::Jump *s) { patches.append(Patch(s->target, bytecode.size())); @@ -902,7 +902,7 @@ void QDeclarativeV4CompilerPrivate::visitJump(IR::Jump *s) gen(i); } -void QDeclarativeV4CompilerPrivate::visitCJump(IR::CJump *s) +void QV4CompilerPrivate::visitCJump(IR::CJump *s) { traceExpression(s->cond, currentReg); @@ -914,7 +914,7 @@ void QDeclarativeV4CompilerPrivate::visitCJump(IR::CJump *s) gen(i); } -void QDeclarativeV4CompilerPrivate::visitRet(IR::Ret *s) +void QV4CompilerPrivate::visitRet(IR::Ret *s) { Q_ASSERT(s->expr != 0); @@ -969,9 +969,9 @@ void QDeclarativeV4CompilerPrivate::visitRet(IR::Ret *s) gen(store); } -void QDeclarativeV4Compiler::dump(const QByteArray &programData) +void QV4Compiler::dump(const QByteArray &programData) { - const QDeclarativeV4Program *program = (const QDeclarativeV4Program *)programData.constData(); + const QV4Program *program = (const QV4Program *)programData.constData(); qWarning() << "Program.bindings:" << program->bindings; qWarning() << "Program.dataLength:" << program->dataLength; @@ -989,7 +989,7 @@ void QDeclarativeV4Compiler::dump(const QByteArray &programData) Clear the state associated with attempting to compile a specific binding. This does not clear the global "committed binding" states. */ -void QDeclarativeV4CompilerPrivate::resetInstanceState() +void QV4CompilerPrivate::resetInstanceState() { data = committed.data; exceptions = committed.exceptions; @@ -1008,7 +1008,7 @@ section. Returns the index for the committed binding. */ -int QDeclarativeV4CompilerPrivate::commitCompile() +int QV4CompilerPrivate::commitCompile() { int rv = committed.count(); committed.offsets << committed.bytecode.count(); @@ -1021,7 +1021,7 @@ int QDeclarativeV4CompilerPrivate::commitCompile() return rv; } -bool QDeclarativeV4CompilerPrivate::compile(QDeclarativeJS::AST::Node *node) +bool QV4CompilerPrivate::compile(QDeclarativeJS::AST::Node *node) { resetInstanceState(); @@ -1044,7 +1044,7 @@ bool QDeclarativeV4CompilerPrivate::compile(QDeclarativeJS::AST::Node *node) IR::Function thisFunction(&pool), *function = &thisFunction; - QDeclarativeV4IRBuilder irBuilder(expression, engine); + QV4IRBuilder irBuilder(expression, engine); if (!irBuilder(function, node)) return false; @@ -1076,7 +1076,7 @@ bool QDeclarativeV4CompilerPrivate::compile(QDeclarativeJS::AST::Node *node) } // Returns a reg -int QDeclarativeV4CompilerPrivate::registerLiteralString(quint8 reg, const QStringRef &str) +int QV4CompilerPrivate::registerLiteralString(quint8 reg, const QStringRef &str) { // ### string cleanup @@ -1094,7 +1094,7 @@ int QDeclarativeV4CompilerPrivate::registerLiteralString(quint8 reg, const QStri } // Returns an identifier offset -int QDeclarativeV4CompilerPrivate::registerString(const QString &string) +int QV4CompilerPrivate::registerString(const QString &string) { Q_ASSERT(!string.isEmpty()); @@ -1122,7 +1122,7 @@ int QDeclarativeV4CompilerPrivate::registerString(const QString &string) /*! Returns true if the current expression has not already subscribed to \a sub in currentBlockMask. */ -bool QDeclarativeV4CompilerPrivate::blockNeedsSubscription(const QStringList &sub) +bool QV4CompilerPrivate::blockNeedsSubscription(const QStringList &sub) { QString str = sub.join(QLatin1String(".")); @@ -1137,7 +1137,7 @@ bool QDeclarativeV4CompilerPrivate::blockNeedsSubscription(const QStringList &su return !(*uiter & currentBlockMask); } -int QDeclarativeV4CompilerPrivate::subscriptionIndex(const QStringList &sub) +int QV4CompilerPrivate::subscriptionIndex(const QStringList &sub) { QString str = sub.join(QLatin1String(".")); int *iter = subscriptionIds.value(str); @@ -1154,7 +1154,7 @@ int QDeclarativeV4CompilerPrivate::subscriptionIndex(const QStringList &sub) return *iter; } -quint32 QDeclarativeV4CompilerPrivate::subscriptionBlockMask(const QStringList &sub) +quint32 QV4CompilerPrivate::subscriptionBlockMask(const QStringList &sub) { QString str = sub.join(QLatin1String(".")); @@ -1167,7 +1167,7 @@ quint32 QDeclarativeV4CompilerPrivate::subscriptionBlockMask(const QStringList & return *uiter; } -quint8 QDeclarativeV4CompilerPrivate::exceptionId(quint32 line, quint32 column) +quint8 QV4CompilerPrivate::exceptionId(quint32 line, quint32 column) { quint8 rv = 0xFF; if (exceptions.count() < 0xFF) { @@ -1180,7 +1180,7 @@ quint8 QDeclarativeV4CompilerPrivate::exceptionId(quint32 line, quint32 column) return rv; } -quint8 QDeclarativeV4CompilerPrivate::exceptionId(QDeclarativeJS::AST::ExpressionNode *n) +quint8 QV4CompilerPrivate::exceptionId(QDeclarativeJS::AST::ExpressionNode *n) { quint8 rv = 0xFF; if (n && exceptions.count() < 0xFF) { @@ -1190,13 +1190,13 @@ quint8 QDeclarativeV4CompilerPrivate::exceptionId(QDeclarativeJS::AST::Expressio return rv; } -QDeclarativeV4Compiler::QDeclarativeV4Compiler() -: d(new QDeclarativeV4CompilerPrivate) +QV4Compiler::QV4Compiler() +: d(new QV4CompilerPrivate) { qmlBindingsTest |= qmlBindingsTestEnv(); } -QDeclarativeV4Compiler::~QDeclarativeV4Compiler() +QV4Compiler::~QV4Compiler() { delete d; d = 0; } @@ -1204,7 +1204,7 @@ QDeclarativeV4Compiler::~QDeclarativeV4Compiler() /* Returns true if any bindings were compiled. */ -bool QDeclarativeV4Compiler::isValid() const +bool QV4Compiler::isValid() const { return !d->committed.bytecode.isEmpty(); } @@ -1212,7 +1212,7 @@ bool QDeclarativeV4Compiler::isValid() const /* -1 on failure, otherwise the binding index to use. */ -int QDeclarativeV4Compiler::compile(const Expression &expression, QDeclarativeEnginePrivate *engine) +int QV4Compiler::compile(const Expression &expression, QDeclarativeEnginePrivate *engine) { if (!expression.expression.asAST()) return false; @@ -1232,7 +1232,7 @@ int QDeclarativeV4Compiler::compile(const Expression &expression, QDeclarativeEn } } -QByteArray QDeclarativeV4CompilerPrivate::buildSignalTable() const +QByteArray QV4CompilerPrivate::buildSignalTable() const { QHash > > table; @@ -1258,7 +1258,7 @@ QByteArray QDeclarativeV4CompilerPrivate::buildSignalTable() const return QByteArray((const char *)header.constData(), header.count() * sizeof(quint32)); } -QByteArray QDeclarativeV4CompilerPrivate::buildExceptionData() const +QByteArray QV4CompilerPrivate::buildExceptionData() const { QByteArray rv; rv.resize(committed.exceptions.count() * sizeof(quint64)); @@ -1269,16 +1269,16 @@ QByteArray QDeclarativeV4CompilerPrivate::buildExceptionData() const /* Returns the compiled program. */ -QByteArray QDeclarativeV4Compiler::program() const +QByteArray QV4Compiler::program() const { QByteArray programData; if (isValid()) { - QDeclarativeV4Program prog; + QV4Program prog; prog.bindings = d->committed.count(); Bytecode bc; - QDeclarativeV4CompilerPrivate::Instr::Jump jump; + QV4CompilerPrivate::Instr::Jump jump; jump.reg = -1; for (int ii = 0; ii < d->committed.count(); ++ii) { @@ -1306,15 +1306,15 @@ QByteArray QDeclarativeV4Compiler::program() const prog.subscriptions = d->committed.subscriptionIds.count(); prog.identifiers = d->committed.registeredStrings.count(); prog.instructionCount = bytecode.count(); - int size = sizeof(QDeclarativeV4Program) + bytecode.count(); + int size = sizeof(QV4Program) + bytecode.count(); size += prog.dataLength; programData.resize(size); - memcpy(programData.data(), &prog, sizeof(QDeclarativeV4Program)); + memcpy(programData.data(), &prog, sizeof(QV4Program)); if (prog.dataLength) - memcpy((char *)((QDeclarativeV4Program *)programData.data())->data(), data.constData(), + memcpy((char *)((QV4Program *)programData.data())->data(), data.constData(), data.size()); - memcpy((char *)((QDeclarativeV4Program *)programData.data())->instructions(), bytecode.constData(), + memcpy((char *)((QV4Program *)programData.data())->instructions(), bytecode.constData(), bytecode.count()); } @@ -1327,13 +1327,13 @@ QByteArray QDeclarativeV4Compiler::program() const qWarning().nospace() << " " << iter->first << "\t-> " << iter->second; } - QDeclarativeV4Compiler::dump(programData); + QV4Compiler::dump(programData); } return programData; } -void QDeclarativeV4Compiler::enableBindingsTest(bool e) +void QV4Compiler::enableBindingsTest(bool e) { if (e) qmlBindingsTest = true; diff --git a/src/declarative/qml/v4/qdeclarativev4compiler_p.h b/src/declarative/qml/v4/qv4compiler_p.h similarity index 91% rename from src/declarative/qml/v4/qdeclarativev4compiler_p.h rename to src/declarative/qml/v4/qv4compiler_p.h index 0ed78bf..9fafaf9 100644 --- a/src/declarative/qml/v4/qdeclarativev4compiler_p.h +++ b/src/declarative/qml/v4/qv4compiler_p.h @@ -39,8 +39,8 @@ ** ****************************************************************************/ -#ifndef QDECLARATIVEV4COMPILER_P_H -#define QDECLARATIVEV4COMPILER_P_H +#ifndef QV4COMPILER_P_H +#define QV4COMPILER_P_H // // W A R N I N G @@ -62,12 +62,12 @@ QT_BEGIN_HEADER QT_BEGIN_NAMESPACE class QDeclarativeTypeNameCache; -class QDeclarativeV4CompilerPrivate; -class Q_AUTOTEST_EXPORT QDeclarativeV4Compiler +class QV4CompilerPrivate; +class Q_AUTOTEST_EXPORT QV4Compiler { public: - QDeclarativeV4Compiler(); - ~QDeclarativeV4Compiler(); + QV4Compiler(); + ~QV4Compiler(); // Returns true if bindings were compiled bool isValid() const; @@ -93,12 +93,12 @@ public: static void dump(const QByteArray &); static void enableBindingsTest(bool); private: - QDeclarativeV4CompilerPrivate *d; + QV4CompilerPrivate *d; }; QT_END_NAMESPACE QT_END_HEADER -#endif // QDECLARATIVEV4COMPILER_P_H +#endif // QV4COMPILER_P_H diff --git a/src/declarative/qml/v4/qdeclarativev4compiler_p_p.h b/src/declarative/qml/v4/qv4compiler_p_p.h similarity index 95% rename from src/declarative/qml/v4/qdeclarativev4compiler_p_p.h rename to src/declarative/qml/v4/qv4compiler_p_p.h index aba713b..f4dd454 100644 --- a/src/declarative/qml/v4/qdeclarativev4compiler_p_p.h +++ b/src/declarative/qml/v4/qv4compiler_p_p.h @@ -39,8 +39,8 @@ ** ****************************************************************************/ -#ifndef QDECLARATIVEV4COMPILER_P_P_H -#define QDECLARATIVEV4COMPILER_P_P_H +#ifndef QV4COMPILER_P_P_H +#define QV4COMPILER_P_P_H // // W A R N I N G @@ -53,8 +53,8 @@ // We mean it. // -#include "qdeclarativev4instruction_p.h" -#include "qdeclarativev4ir_p.h" +#include "qv4instruction_p.h" +#include "qv4ir_p.h" #include #include #include @@ -141,16 +141,16 @@ private: Container _container; }; -class QDeclarativeV4CompilerPrivate: protected QDeclarativeJS::IR::ExprVisitor, +class QV4CompilerPrivate: protected QDeclarativeJS::IR::ExprVisitor, protected QDeclarativeJS::IR::StmtVisitor { public: - QDeclarativeV4CompilerPrivate(); + QV4CompilerPrivate(); void resetInstanceState(); int commitCompile(); - const QDeclarativeV4Compiler::Expression *expression; + const QV4Compiler::Expression *expression; QDeclarativeEnginePrivate *engine; QString contextName() const { return QLatin1String("$$$SCOPE_") + QString::number((quintptr)expression->context, 16); } @@ -273,5 +273,5 @@ Q_DECLARE_METATYPE(QDeclarative1AnchorLine) QT_END_HEADER -#endif // QDECLARATIVEV4COMPILER_P_P_H +#endif // QV4COMPILER_P_P_H diff --git a/src/declarative/qml/v4/qdeclarativev4instruction.cpp b/src/declarative/qml/v4/qv4instruction.cpp similarity index 99% rename from src/declarative/qml/v4/qdeclarativev4instruction.cpp rename to src/declarative/qml/v4/qv4instruction.cpp index e9556d6..411e96b 100644 --- a/src/declarative/qml/v4/qdeclarativev4instruction.cpp +++ b/src/declarative/qml/v4/qv4instruction.cpp @@ -39,8 +39,8 @@ ** ****************************************************************************/ -#include "qdeclarativev4instruction_p.h" -#include "qdeclarativev4bindings_p.h" +#include "qv4instruction_p.h" +#include "qv4bindings_p.h" #include #include @@ -344,7 +344,7 @@ void Bytecode::dump(const char *start, const char *end) const Bytecode::Bytecode() { #ifdef QML_THREADED_INTERPRETER - decodeInstr = QDeclarativeV4Bindings::getDecodeInstrTable(); + decodeInstr = QV4Bindings::getDecodeInstrTable(); #endif } diff --git a/src/declarative/qml/v4/qdeclarativev4instruction_p.h b/src/declarative/qml/v4/qv4instruction_p.h similarity index 98% rename from src/declarative/qml/v4/qdeclarativev4instruction_p.h rename to src/declarative/qml/v4/qv4instruction_p.h index 3a125f7..343df80 100644 --- a/src/declarative/qml/v4/qdeclarativev4instruction_p.h +++ b/src/declarative/qml/v4/qv4instruction_p.h @@ -39,8 +39,8 @@ ** ****************************************************************************/ -#ifndef QDECLARATIVEV4INSTRUCTION_P_H -#define QDECLARATIVEV4INSTRUCTION_P_H +#ifndef QV4INSTRUCTION_P_H +#define QV4INSTRUCTION_P_H // // W A R N I N G @@ -419,5 +419,5 @@ QT_END_NAMESPACE QT_END_HEADER -#endif // QDECLARATIVEV4INSTRUCTION_P_H +#endif // QV4INSTRUCTION_P_H diff --git a/src/declarative/qml/v4/qdeclarativev4ir.cpp b/src/declarative/qml/v4/qv4ir.cpp similarity index 99% rename from src/declarative/qml/v4/qdeclarativev4ir.cpp rename to src/declarative/qml/v4/qv4ir.cpp index 7490efe..ec3ffc9 100644 --- a/src/declarative/qml/v4/qdeclarativev4ir.cpp +++ b/src/declarative/qml/v4/qv4ir.cpp @@ -39,7 +39,7 @@ ** ****************************************************************************/ -#include "qdeclarativev4ir_p.h" +#include "qv4ir_p.h" #include #include diff --git a/src/declarative/qml/v4/qdeclarativev4ir_p.h b/src/declarative/qml/v4/qv4ir_p.h similarity index 99% rename from src/declarative/qml/v4/qdeclarativev4ir_p.h rename to src/declarative/qml/v4/qv4ir_p.h index 2c8f658..86b0d9d 100644 --- a/src/declarative/qml/v4/qdeclarativev4ir_p.h +++ b/src/declarative/qml/v4/qv4ir_p.h @@ -39,8 +39,8 @@ ** ****************************************************************************/ -#ifndef QDECLARATIVEV4IR_P_H -#define QDECLARATIVEV4IR_P_H +#ifndef QV4IR_P_H +#define QV4IR_P_H // // W A R N I N G @@ -58,7 +58,7 @@ #include #include #include -#include +#include #include #include @@ -602,4 +602,4 @@ QT_END_NAMESPACE QT_END_HEADER -#endif // QDECLARATIVEV4IR_P_H +#endif // QV4IR_P_H diff --git a/src/declarative/qml/v4/qdeclarativev4irbuilder.cpp b/src/declarative/qml/v4/qv4irbuilder.cpp similarity index 82% rename from src/declarative/qml/v4/qdeclarativev4irbuilder.cpp rename to src/declarative/qml/v4/qv4irbuilder.cpp index 51afe75..760c2bc 100644 --- a/src/declarative/qml/v4/qdeclarativev4irbuilder.cpp +++ b/src/declarative/qml/v4/qv4irbuilder.cpp @@ -39,8 +39,8 @@ ** ****************************************************************************/ -#include "qdeclarativev4irbuilder_p.h" -#include "qdeclarativev4compiler_p_p.h" +#include "qv4irbuilder_p.h" +#include "qv4compiler_p_p.h" #include // For AnchorLine #include @@ -83,13 +83,13 @@ static IR::Type irTypeFromVariantType(int t, QDeclarativeEnginePrivate *engine, } } -QDeclarativeV4IRBuilder::QDeclarativeV4IRBuilder(const QDeclarativeV4Compiler::Expression *expr, +QV4IRBuilder::QV4IRBuilder(const QV4Compiler::Expression *expr, QDeclarativeEnginePrivate *engine) : m_expression(expr), m_engine(engine), _function(0), _block(0), _discard(false) { } -bool QDeclarativeV4IRBuilder::operator()(QDeclarativeJS::IR::Function *function, +bool QV4IRBuilder::operator()(QDeclarativeJS::IR::Function *function, QDeclarativeJS::AST::Node *ast) { bool discarded = false; @@ -129,7 +129,7 @@ bool QDeclarativeV4IRBuilder::operator()(QDeclarativeJS::IR::Function *function, return !discarded; } -bool QDeclarativeV4IRBuilder::buildName(QList &name, +bool QV4IRBuilder::buildName(QList &name, AST::Node *node, QList *nodes) { @@ -152,13 +152,13 @@ bool QDeclarativeV4IRBuilder::buildName(QList &name, return true; } -void QDeclarativeV4IRBuilder::discard() +void QV4IRBuilder::discard() { _discard = true; } -QDeclarativeV4IRBuilder::ExprResult -QDeclarativeV4IRBuilder::expression(AST::ExpressionNode *ast) +QV4IRBuilder::ExprResult +QV4IRBuilder::expression(AST::ExpressionNode *ast) { ExprResult r; if (ast) { @@ -176,7 +176,7 @@ QDeclarativeV4IRBuilder::expression(AST::ExpressionNode *ast) return r; } -void QDeclarativeV4IRBuilder::condition(AST::ExpressionNode *ast, IR::BasicBlock *iftrue, IR::BasicBlock *iffalse) +void QV4IRBuilder::condition(AST::ExpressionNode *ast, IR::BasicBlock *iftrue, IR::BasicBlock *iffalse) { if (! ast) return; @@ -202,8 +202,8 @@ void QDeclarativeV4IRBuilder::condition(AST::ExpressionNode *ast, IR::BasicBlock } } -QDeclarativeV4IRBuilder::ExprResult -QDeclarativeV4IRBuilder::statement(AST::Statement *ast) +QV4IRBuilder::ExprResult +QV4IRBuilder::statement(AST::Statement *ast) { ExprResult r; if (ast) { @@ -221,12 +221,12 @@ QDeclarativeV4IRBuilder::statement(AST::Statement *ast) return r; } -void QDeclarativeV4IRBuilder::sourceElement(AST::SourceElement *ast) +void QV4IRBuilder::sourceElement(AST::SourceElement *ast) { accept(ast); } -void QDeclarativeV4IRBuilder::implicitCvt(ExprResult &expr, IR::Type type) +void QV4IRBuilder::implicitCvt(ExprResult &expr, IR::Type type) { if (expr.type() == type) return; // nothing to do @@ -237,97 +237,97 @@ void QDeclarativeV4IRBuilder::implicitCvt(ExprResult &expr, IR::Type type) } // QML -bool QDeclarativeV4IRBuilder::visit(AST::UiProgram *) +bool QV4IRBuilder::visit(AST::UiProgram *) { Q_ASSERT(!"unreachable"); return false; } -bool QDeclarativeV4IRBuilder::visit(AST::UiImportList *) +bool QV4IRBuilder::visit(AST::UiImportList *) { Q_ASSERT(!"unreachable"); return false; } -bool QDeclarativeV4IRBuilder::visit(AST::UiImport *) +bool QV4IRBuilder::visit(AST::UiImport *) { Q_ASSERT(!"unreachable"); return false; } -bool QDeclarativeV4IRBuilder::visit(AST::UiPublicMember *) +bool QV4IRBuilder::visit(AST::UiPublicMember *) { Q_ASSERT(!"unreachable"); return false; } -bool QDeclarativeV4IRBuilder::visit(AST::UiSourceElement *) +bool QV4IRBuilder::visit(AST::UiSourceElement *) { Q_ASSERT(!"unreachable"); return false; } -bool QDeclarativeV4IRBuilder::visit(AST::UiObjectDefinition *) +bool QV4IRBuilder::visit(AST::UiObjectDefinition *) { Q_ASSERT(!"unreachable"); return false; } -bool QDeclarativeV4IRBuilder::visit(AST::UiObjectInitializer *) +bool QV4IRBuilder::visit(AST::UiObjectInitializer *) { Q_ASSERT(!"unreachable"); return false; } -bool QDeclarativeV4IRBuilder::visit(AST::UiObjectBinding *) +bool QV4IRBuilder::visit(AST::UiObjectBinding *) { Q_ASSERT(!"unreachable"); return false; } -bool QDeclarativeV4IRBuilder::visit(AST::UiScriptBinding *) +bool QV4IRBuilder::visit(AST::UiScriptBinding *) { Q_ASSERT(!"unreachable"); return false; } -bool QDeclarativeV4IRBuilder::visit(AST::UiArrayBinding *) +bool QV4IRBuilder::visit(AST::UiArrayBinding *) { Q_ASSERT(!"unreachable"); return false; } -bool QDeclarativeV4IRBuilder::visit(AST::UiObjectMemberList *) +bool QV4IRBuilder::visit(AST::UiObjectMemberList *) { Q_ASSERT(!"unreachable"); return false; } -bool QDeclarativeV4IRBuilder::visit(AST::UiArrayMemberList *) +bool QV4IRBuilder::visit(AST::UiArrayMemberList *) { Q_ASSERT(!"unreachable"); return false; } -bool QDeclarativeV4IRBuilder::visit(AST::UiQualifiedId *) +bool QV4IRBuilder::visit(AST::UiQualifiedId *) { Q_ASSERT(!"unreachable"); return false; } -bool QDeclarativeV4IRBuilder::visit(AST::UiSignature *) +bool QV4IRBuilder::visit(AST::UiSignature *) { Q_ASSERT(!"unreachable"); return false; } -bool QDeclarativeV4IRBuilder::visit(AST::UiFormalList *) +bool QV4IRBuilder::visit(AST::UiFormalList *) { Q_ASSERT(!"unreachable"); return false; } -bool QDeclarativeV4IRBuilder::visit(AST::UiFormal *) +bool QV4IRBuilder::visit(AST::UiFormal *) { Q_ASSERT(!"unreachable"); return false; @@ -335,50 +335,50 @@ bool QDeclarativeV4IRBuilder::visit(AST::UiFormal *) // JS -bool QDeclarativeV4IRBuilder::visit(AST::Program *) +bool QV4IRBuilder::visit(AST::Program *) { Q_ASSERT(!"unreachable"); return false; } -bool QDeclarativeV4IRBuilder::visit(AST::SourceElements *) +bool QV4IRBuilder::visit(AST::SourceElements *) { Q_ASSERT(!"unreachable"); return false; } -bool QDeclarativeV4IRBuilder::visit(AST::FunctionSourceElement *) +bool QV4IRBuilder::visit(AST::FunctionSourceElement *) { Q_ASSERT(!"unreachable"); return false; } -bool QDeclarativeV4IRBuilder::visit(AST::StatementSourceElement *) +bool QV4IRBuilder::visit(AST::StatementSourceElement *) { Q_ASSERT(!"unreachable"); return false; } // object literals -bool QDeclarativeV4IRBuilder::visit(AST::PropertyNameAndValueList *) +bool QV4IRBuilder::visit(AST::PropertyNameAndValueList *) { Q_ASSERT(!"unreachable"); return false; } -bool QDeclarativeV4IRBuilder::visit(AST::IdentifierPropertyName *) +bool QV4IRBuilder::visit(AST::IdentifierPropertyName *) { Q_ASSERT(!"unreachable"); return false; } -bool QDeclarativeV4IRBuilder::visit(AST::StringLiteralPropertyName *) +bool QV4IRBuilder::visit(AST::StringLiteralPropertyName *) { Q_ASSERT(!"unreachable"); return false; } -bool QDeclarativeV4IRBuilder::visit(AST::NumericLiteralPropertyName *) +bool QV4IRBuilder::visit(AST::NumericLiteralPropertyName *) { Q_ASSERT(!"unreachable"); return false; @@ -386,13 +386,13 @@ bool QDeclarativeV4IRBuilder::visit(AST::NumericLiteralPropertyName *) // array literals -bool QDeclarativeV4IRBuilder::visit(AST::ElementList *) +bool QV4IRBuilder::visit(AST::ElementList *) { Q_ASSERT(!"unreachable"); return false; } -bool QDeclarativeV4IRBuilder::visit(AST::Elision *) +bool QV4IRBuilder::visit(AST::Elision *) { Q_ASSERT(!"unreachable"); return false; @@ -400,29 +400,29 @@ bool QDeclarativeV4IRBuilder::visit(AST::Elision *) // function calls -bool QDeclarativeV4IRBuilder::visit(AST::ArgumentList *) +bool QV4IRBuilder::visit(AST::ArgumentList *) { Q_ASSERT(!"unreachable"); return false; } // expressions -bool QDeclarativeV4IRBuilder::visit(AST::ObjectLiteral *) +bool QV4IRBuilder::visit(AST::ObjectLiteral *) { return false; } -bool QDeclarativeV4IRBuilder::visit(AST::ArrayLiteral *) +bool QV4IRBuilder::visit(AST::ArrayLiteral *) { return false; } -bool QDeclarativeV4IRBuilder::visit(AST::ThisExpression *) +bool QV4IRBuilder::visit(AST::ThisExpression *) { return false; } -bool QDeclarativeV4IRBuilder::visit(AST::IdentifierExpression *ast) +bool QV4IRBuilder::visit(AST::IdentifierExpression *ast) { const quint32 line = ast->identifierToken.startLine; const quint32 column = ast->identifierToken.startColumn; @@ -514,35 +514,35 @@ bool QDeclarativeV4IRBuilder::visit(AST::IdentifierExpression *ast) return false; } -bool QDeclarativeV4IRBuilder::visit(AST::NullExpression *) +bool QV4IRBuilder::visit(AST::NullExpression *) { // ### TODO: cx format _expr.code = _block->CONST(IR::NullType, 0); return false; } -bool QDeclarativeV4IRBuilder::visit(AST::TrueLiteral *) +bool QV4IRBuilder::visit(AST::TrueLiteral *) { // ### TODO: cx format _expr.code = _block->CONST(IR::BoolType, 1); return false; } -bool QDeclarativeV4IRBuilder::visit(AST::FalseLiteral *) +bool QV4IRBuilder::visit(AST::FalseLiteral *) { // ### TODO: cx format _expr.code = _block->CONST(IR::BoolType, 0); return false; } -bool QDeclarativeV4IRBuilder::visit(AST::StringLiteral *ast) +bool QV4IRBuilder::visit(AST::StringLiteral *ast) { // ### TODO: cx format _expr.code = _block->STRING(ast->value); return false; } -bool QDeclarativeV4IRBuilder::visit(AST::NumericLiteral *ast) +bool QV4IRBuilder::visit(AST::NumericLiteral *ast) { if (_expr.hint == ExprResult::cx) { _expr.format = ExprResult::cx; @@ -553,22 +553,22 @@ bool QDeclarativeV4IRBuilder::visit(AST::NumericLiteral *ast) return false; } -bool QDeclarativeV4IRBuilder::visit(AST::RegExpLiteral *) +bool QV4IRBuilder::visit(AST::RegExpLiteral *) { return false; } -bool QDeclarativeV4IRBuilder::visit(AST::NestedExpression *) +bool QV4IRBuilder::visit(AST::NestedExpression *) { return true; // the value of the nested expression } -bool QDeclarativeV4IRBuilder::visit(AST::ArrayMemberExpression *) +bool QV4IRBuilder::visit(AST::ArrayMemberExpression *) { return false; } -bool QDeclarativeV4IRBuilder::visit(AST::FieldMemberExpression *ast) +bool QV4IRBuilder::visit(AST::FieldMemberExpression *ast) { if (IR::Expr *left = expression(ast->base)) { if (IR::Name *baseName = left->asName()) { @@ -677,22 +677,22 @@ bool QDeclarativeV4IRBuilder::visit(AST::FieldMemberExpression *ast) return false; } -bool QDeclarativeV4IRBuilder::preVisit(AST::Node *) +bool QV4IRBuilder::preVisit(AST::Node *) { return ! _discard; } -bool QDeclarativeV4IRBuilder::visit(AST::NewMemberExpression *) +bool QV4IRBuilder::visit(AST::NewMemberExpression *) { return false; } -bool QDeclarativeV4IRBuilder::visit(AST::NewExpression *) +bool QV4IRBuilder::visit(AST::NewExpression *) { return false; } -bool QDeclarativeV4IRBuilder::visit(AST::CallExpression *ast) +bool QV4IRBuilder::visit(AST::CallExpression *ast) { QList names; QList nameNodes; @@ -729,42 +729,42 @@ bool QDeclarativeV4IRBuilder::visit(AST::CallExpression *ast) return false; } -bool QDeclarativeV4IRBuilder::visit(AST::PostIncrementExpression *) +bool QV4IRBuilder::visit(AST::PostIncrementExpression *) { return false; } -bool QDeclarativeV4IRBuilder::visit(AST::PostDecrementExpression *) +bool QV4IRBuilder::visit(AST::PostDecrementExpression *) { return false; } -bool QDeclarativeV4IRBuilder::visit(AST::DeleteExpression *) +bool QV4IRBuilder::visit(AST::DeleteExpression *) { return false; } -bool QDeclarativeV4IRBuilder::visit(AST::VoidExpression *) +bool QV4IRBuilder::visit(AST::VoidExpression *) { return false; } -bool QDeclarativeV4IRBuilder::visit(AST::TypeOfExpression *) +bool QV4IRBuilder::visit(AST::TypeOfExpression *) { return false; } -bool QDeclarativeV4IRBuilder::visit(AST::PreIncrementExpression *) +bool QV4IRBuilder::visit(AST::PreIncrementExpression *) { return false; } -bool QDeclarativeV4IRBuilder::visit(AST::PreDecrementExpression *) +bool QV4IRBuilder::visit(AST::PreDecrementExpression *) { return false; } -bool QDeclarativeV4IRBuilder::visit(AST::UnaryPlusExpression *ast) +bool QV4IRBuilder::visit(AST::UnaryPlusExpression *ast) { ExprResult expr = expression(ast->expression); if (expr.isNot(IR::InvalidType)) { @@ -781,7 +781,7 @@ bool QDeclarativeV4IRBuilder::visit(AST::UnaryPlusExpression *ast) return false; } -bool QDeclarativeV4IRBuilder::visit(AST::UnaryMinusExpression *ast) +bool QV4IRBuilder::visit(AST::UnaryMinusExpression *ast) { ExprResult expr = expression(ast->expression); if (expr.isNot(IR::InvalidType)) { @@ -799,7 +799,7 @@ bool QDeclarativeV4IRBuilder::visit(AST::UnaryMinusExpression *ast) return false; } -bool QDeclarativeV4IRBuilder::visit(AST::TildeExpression *ast) +bool QV4IRBuilder::visit(AST::TildeExpression *ast) { ExprResult expr = expression(ast->expression); if (expr.isNot(IR::InvalidType)) { @@ -816,7 +816,7 @@ bool QDeclarativeV4IRBuilder::visit(AST::TildeExpression *ast) return false; } -bool QDeclarativeV4IRBuilder::visit(AST::NotExpression *ast) +bool QV4IRBuilder::visit(AST::NotExpression *ast) { ExprResult expr = expression(ast->expression); @@ -840,7 +840,7 @@ bool QDeclarativeV4IRBuilder::visit(AST::NotExpression *ast) return false; } -void QDeclarativeV4IRBuilder::binop(AST::BinaryExpression *ast, ExprResult left, ExprResult right) +void QV4IRBuilder::binop(AST::BinaryExpression *ast, ExprResult left, ExprResult right) { if (IR::Type t = maxType(left.type(), right.type())) { implicitCvt(left, t); @@ -857,7 +857,7 @@ void QDeclarativeV4IRBuilder::binop(AST::BinaryExpression *ast, ExprResult left, } } -bool QDeclarativeV4IRBuilder::visit(AST::BinaryExpression *ast) +bool QV4IRBuilder::visit(AST::BinaryExpression *ast) { switch (ast->op) { case QSOperator::And: { @@ -1071,7 +1071,7 @@ bool QDeclarativeV4IRBuilder::visit(AST::BinaryExpression *ast) return false; } -bool QDeclarativeV4IRBuilder::visit(AST::ConditionalExpression *ast) +bool QV4IRBuilder::visit(AST::ConditionalExpression *ast) { IR::BasicBlock *iftrue = _function->newBasicBlock(); IR::BasicBlock *iffalse = _function->newBasicBlock(); @@ -1101,7 +1101,7 @@ bool QDeclarativeV4IRBuilder::visit(AST::ConditionalExpression *ast) return false; } -bool QDeclarativeV4IRBuilder::visit(AST::Expression *ast) +bool QV4IRBuilder::visit(AST::Expression *ast) { _block->EXP(expression(ast->left)); _expr = expression(ast->right); @@ -1111,7 +1111,7 @@ bool QDeclarativeV4IRBuilder::visit(AST::Expression *ast) // statements -bool QDeclarativeV4IRBuilder::visit(AST::Block *ast) +bool QV4IRBuilder::visit(AST::Block *ast) { if (ast->statements && ! ast->statements->next) { // we have one and only one statement @@ -1121,32 +1121,32 @@ bool QDeclarativeV4IRBuilder::visit(AST::Block *ast) return false; } -bool QDeclarativeV4IRBuilder::visit(AST::StatementList *) +bool QV4IRBuilder::visit(AST::StatementList *) { return false; } -bool QDeclarativeV4IRBuilder::visit(AST::VariableStatement *) +bool QV4IRBuilder::visit(AST::VariableStatement *) { return false; } -bool QDeclarativeV4IRBuilder::visit(AST::VariableDeclarationList *) +bool QV4IRBuilder::visit(AST::VariableDeclarationList *) { return false; } -bool QDeclarativeV4IRBuilder::visit(AST::VariableDeclaration *) +bool QV4IRBuilder::visit(AST::VariableDeclaration *) { return false; } -bool QDeclarativeV4IRBuilder::visit(AST::EmptyStatement *) +bool QV4IRBuilder::visit(AST::EmptyStatement *) { return false; } -bool QDeclarativeV4IRBuilder::visit(AST::ExpressionStatement *ast) +bool QV4IRBuilder::visit(AST::ExpressionStatement *ast) { if (ast->expression) { // return the value of this expression @@ -1156,7 +1156,7 @@ bool QDeclarativeV4IRBuilder::visit(AST::ExpressionStatement *ast) return false; } -bool QDeclarativeV4IRBuilder::visit(AST::IfStatement *ast) +bool QV4IRBuilder::visit(AST::IfStatement *ast) { if (! ast->ko) { // This is an if statement without an else branch. @@ -1191,48 +1191,48 @@ bool QDeclarativeV4IRBuilder::visit(AST::IfStatement *ast) return false; } -bool QDeclarativeV4IRBuilder::visit(AST::DoWhileStatement *) +bool QV4IRBuilder::visit(AST::DoWhileStatement *) { return false; } -bool QDeclarativeV4IRBuilder::visit(AST::WhileStatement *) +bool QV4IRBuilder::visit(AST::WhileStatement *) { return false; } -bool QDeclarativeV4IRBuilder::visit(AST::ForStatement *) +bool QV4IRBuilder::visit(AST::ForStatement *) { return false; } -bool QDeclarativeV4IRBuilder::visit(AST::LocalForStatement *) +bool QV4IRBuilder::visit(AST::LocalForStatement *) { return false; } -bool QDeclarativeV4IRBuilder::visit(AST::ForEachStatement *) +bool QV4IRBuilder::visit(AST::ForEachStatement *) { return false; } -bool QDeclarativeV4IRBuilder::visit(AST::LocalForEachStatement *) +bool QV4IRBuilder::visit(AST::LocalForEachStatement *) { discard(); return false; } -bool QDeclarativeV4IRBuilder::visit(AST::ContinueStatement *) +bool QV4IRBuilder::visit(AST::ContinueStatement *) { return false; } -bool QDeclarativeV4IRBuilder::visit(AST::BreakStatement *) +bool QV4IRBuilder::visit(AST::BreakStatement *) { return false; } -bool QDeclarativeV4IRBuilder::visit(AST::ReturnStatement *ast) +bool QV4IRBuilder::visit(AST::ReturnStatement *ast) { if (ast->expression) { // return the value of the expression @@ -1242,82 +1242,82 @@ bool QDeclarativeV4IRBuilder::visit(AST::ReturnStatement *ast) return false; } -bool QDeclarativeV4IRBuilder::visit(AST::WithStatement *) +bool QV4IRBuilder::visit(AST::WithStatement *) { return false; } -bool QDeclarativeV4IRBuilder::visit(AST::SwitchStatement *) +bool QV4IRBuilder::visit(AST::SwitchStatement *) { return false; } -bool QDeclarativeV4IRBuilder::visit(AST::CaseBlock *) +bool QV4IRBuilder::visit(AST::CaseBlock *) { return false; } -bool QDeclarativeV4IRBuilder::visit(AST::CaseClauses *) +bool QV4IRBuilder::visit(AST::CaseClauses *) { return false; } -bool QDeclarativeV4IRBuilder::visit(AST::CaseClause *) +bool QV4IRBuilder::visit(AST::CaseClause *) { return false; } -bool QDeclarativeV4IRBuilder::visit(AST::DefaultClause *) +bool QV4IRBuilder::visit(AST::DefaultClause *) { return false; } -bool QDeclarativeV4IRBuilder::visit(AST::LabelledStatement *) +bool QV4IRBuilder::visit(AST::LabelledStatement *) { return false; } -bool QDeclarativeV4IRBuilder::visit(AST::ThrowStatement *) +bool QV4IRBuilder::visit(AST::ThrowStatement *) { return false; } -bool QDeclarativeV4IRBuilder::visit(AST::TryStatement *) +bool QV4IRBuilder::visit(AST::TryStatement *) { return false; } -bool QDeclarativeV4IRBuilder::visit(AST::Catch *) +bool QV4IRBuilder::visit(AST::Catch *) { return false; } -bool QDeclarativeV4IRBuilder::visit(AST::Finally *) +bool QV4IRBuilder::visit(AST::Finally *) { return false; } -bool QDeclarativeV4IRBuilder::visit(AST::FunctionDeclaration *) +bool QV4IRBuilder::visit(AST::FunctionDeclaration *) { return false; } -bool QDeclarativeV4IRBuilder::visit(AST::FunctionExpression *) +bool QV4IRBuilder::visit(AST::FunctionExpression *) { return false; } -bool QDeclarativeV4IRBuilder::visit(AST::FormalParameterList *) +bool QV4IRBuilder::visit(AST::FormalParameterList *) { return false; } -bool QDeclarativeV4IRBuilder::visit(AST::FunctionBody *) +bool QV4IRBuilder::visit(AST::FunctionBody *) { return false; } -bool QDeclarativeV4IRBuilder::visit(AST::DebuggerStatement *) +bool QV4IRBuilder::visit(AST::DebuggerStatement *) { return false; } diff --git a/src/declarative/qml/v4/qdeclarativev4irbuilder_p.h b/src/declarative/qml/v4/qv4irbuilder_p.h similarity index 96% rename from src/declarative/qml/v4/qdeclarativev4irbuilder_p.h rename to src/declarative/qml/v4/qv4irbuilder_p.h index 004e3a1..28df5c4 100644 --- a/src/declarative/qml/v4/qdeclarativev4irbuilder_p.h +++ b/src/declarative/qml/v4/qv4irbuilder_p.h @@ -39,21 +39,21 @@ ** ****************************************************************************/ -#ifndef QDECLARATIVEV4IRBUILDER_P_H -#define QDECLARATIVEV4IRBUILDER_P_H +#ifndef QV4IRBUILDER_P_H +#define QV4IRBUILDER_P_H #include -#include "qdeclarativev4ir_p.h" +#include "qv4ir_p.h" QT_BEGIN_HEADER QT_BEGIN_NAMESPACE -class QDeclarativeV4IRBuilder : public QDeclarativeJS::AST::Visitor +class QV4IRBuilder : public QDeclarativeJS::AST::Visitor { public: - QDeclarativeV4IRBuilder(const QDeclarativeV4Compiler::Expression *, QDeclarativeEnginePrivate *); + QV4IRBuilder(const QV4Compiler::Expression *, QDeclarativeEnginePrivate *); bool operator()(QDeclarativeJS::IR::Function *, QDeclarativeJS::AST::Node *); @@ -226,7 +226,7 @@ private: QList *nodes); void discard(); - const QDeclarativeV4Compiler::Expression *m_expression; + const QV4Compiler::Expression *m_expression; QDeclarativeEnginePrivate *m_engine; QDeclarativeJS::IR::Function *_function; @@ -240,4 +240,4 @@ QT_END_NAMESPACE QT_END_HEADER -#endif // QDECLARATIVEV4IRBUILDER_P_H +#endif // QV4IRBUILDER_P_H diff --git a/src/declarative/qml/v4/qdeclarativev4program_p.h b/src/declarative/qml/v4/qv4program_p.h similarity index 87% rename from src/declarative/qml/v4/qdeclarativev4program_p.h rename to src/declarative/qml/v4/qv4program_p.h index 6874677..d0b919f 100644 --- a/src/declarative/qml/v4/qdeclarativev4program_p.h +++ b/src/declarative/qml/v4/qv4program_p.h @@ -39,8 +39,8 @@ ** ****************************************************************************/ -#ifndef QDECLARATIVEV4PROGRAM_P_H -#define QDECLARATIVEV4PROGRAM_P_H +#ifndef QV4PROGRAM_P_H +#define QV4PROGRAM_P_H // // W A R N I N G @@ -53,13 +53,13 @@ // We mean it. // -#include "qdeclarativev4instruction_p.h" +#include "qv4instruction_p.h" QT_BEGIN_HEADER QT_BEGIN_NAMESPACE -struct QDeclarativeV4Program { +struct QV4Program { quint32 bindings; quint32 dataLength; quint32 signalTableOffset; @@ -98,17 +98,17 @@ enum QDeclarativeRegisterType { QVariantType, }; -const char *QDeclarativeV4Program::data() const +const char *QV4Program::data() const { - return ((const char *)this) + sizeof(QDeclarativeV4Program); + return ((const char *)this) + sizeof(QV4Program); } -const char *QDeclarativeV4Program::instructions() const +const char *QV4Program::instructions() const { return (const char *)(data() + dataLength); } -QDeclarativeV4Program::BindingReferenceList *QDeclarativeV4Program::signalTable(int signalIndex) const +QV4Program::BindingReferenceList *QV4Program::signalTable(int signalIndex) const { quint32 *signalTable = (quint32 *)(data() + signalTableOffset); return (BindingReferenceList *)(signalTable + signalTable[signalIndex]); @@ -118,5 +118,5 @@ QT_END_NAMESPACE QT_END_HEADER -#endif // QDECLARATIVEV4PROGRAM_P_H +#endif // QV4PROGRAM_P_H diff --git a/src/declarative/qml/v4/v4.pri b/src/declarative/qml/v4/v4.pri index 085f0ae..a96975d 100644 --- a/src/declarative/qml/v4/v4.pri +++ b/src/declarative/qml/v4/v4.pri @@ -1,17 +1,17 @@ INCLUDEPATH += $$PWD HEADERS += \ - $$PWD/qdeclarativev4compiler_p.h \ - $$PWD/qdeclarativev4compiler_p_p.h \ - $$PWD/qdeclarativev4ir_p.h \ - $$PWD/qdeclarativev4irbuilder_p.h \ - $$PWD/qdeclarativev4instruction_p.h \ - $$PWD/qdeclarativev4bindings_p.h \ - $$PWD/qdeclarativev4program_p.h \ + $$PWD/qv4compiler_p.h \ + $$PWD/qv4compiler_p_p.h \ + $$PWD/qv4ir_p.h \ + $$PWD/qv4irbuilder_p.h \ + $$PWD/qv4instruction_p.h \ + $$PWD/qv4bindings_p.h \ + $$PWD/qv4program_p.h \ SOURCES += \ - $$PWD/qdeclarativev4compiler.cpp \ - $$PWD/qdeclarativev4ir.cpp \ - $$PWD/qdeclarativev4irbuilder.cpp \ - $$PWD/qdeclarativev4instruction.cpp \ - $$PWD/qdeclarativev4bindings.cpp \ + $$PWD/qv4compiler.cpp \ + $$PWD/qv4ir.cpp \ + $$PWD/qv4irbuilder.cpp \ + $$PWD/qv4instruction.cpp \ + $$PWD/qv4bindings.cpp \ diff --git a/src/declarative/qml/v8/qv8bindings_p.h b/src/declarative/qml/v8/qv8bindings_p.h index 3b3aed2..9b6fb84 100644 --- a/src/declarative/qml/v8/qv8bindings_p.h +++ b/src/declarative/qml/v8/qv8bindings_p.h @@ -55,7 +55,6 @@ #include "private/qdeclarativeexpression_p.h" #include "private/qdeclarativebinding_p.h" -#include "private/qdeclarativev4instruction_p.h" QT_BEGIN_HEADER diff --git a/tests/auto/declarative/declarative.pro b/tests/auto/declarative/declarative.pro index c9b54b2..5569eb6 100644 --- a/tests/auto/declarative/declarative.pro +++ b/tests/auto/declarative/declarative.pro @@ -58,7 +58,7 @@ PRIVATETESTS += \ qdeclarativeworkerscript \ qdeclarativexmllistmodel \ qpacketprotocol \ - qdeclarativev4 + v4 SGTESTS = \ qsganimatedimage \ diff --git a/tests/auto/declarative/qdeclarativev4/data/conditionalExpr.qml b/tests/auto/declarative/v4/data/conditionalExpr.qml similarity index 100% rename from tests/auto/declarative/qdeclarativev4/data/conditionalExpr.qml rename to tests/auto/declarative/v4/data/conditionalExpr.qml diff --git a/tests/auto/declarative/qdeclarativev4/data/doubleBoolJump.qml b/tests/auto/declarative/v4/data/doubleBoolJump.qml similarity index 100% rename from tests/auto/declarative/qdeclarativev4/data/doubleBoolJump.qml rename to tests/auto/declarative/v4/data/doubleBoolJump.qml diff --git a/tests/auto/declarative/qdeclarativev4/data/fetchException.qml b/tests/auto/declarative/v4/data/fetchException.qml similarity index 100% rename from tests/auto/declarative/qdeclarativev4/data/fetchException.qml rename to tests/auto/declarative/v4/data/fetchException.qml diff --git a/tests/auto/declarative/qdeclarativev4/data/logicalOr.2.qml b/tests/auto/declarative/v4/data/logicalOr.2.qml similarity index 100% rename from tests/auto/declarative/qdeclarativev4/data/logicalOr.2.qml rename to tests/auto/declarative/v4/data/logicalOr.2.qml diff --git a/tests/auto/declarative/qdeclarativev4/data/logicalOr.qml b/tests/auto/declarative/v4/data/logicalOr.qml similarity index 100% rename from tests/auto/declarative/qdeclarativev4/data/logicalOr.qml rename to tests/auto/declarative/v4/data/logicalOr.qml diff --git a/tests/auto/declarative/qdeclarativev4/data/nestedObjectAccess.qml b/tests/auto/declarative/v4/data/nestedObjectAccess.qml similarity index 100% rename from tests/auto/declarative/qdeclarativev4/data/nestedObjectAccess.qml rename to tests/auto/declarative/v4/data/nestedObjectAccess.qml diff --git a/tests/auto/declarative/qdeclarativev4/data/nullQObject.qml b/tests/auto/declarative/v4/data/nullQObject.qml similarity index 100% rename from tests/auto/declarative/qdeclarativev4/data/nullQObject.qml rename to tests/auto/declarative/v4/data/nullQObject.qml diff --git a/tests/auto/declarative/qdeclarativev4/data/qrealToIntRounding.qml b/tests/auto/declarative/v4/data/qrealToIntRounding.qml similarity index 100% rename from tests/auto/declarative/qdeclarativev4/data/qrealToIntRounding.qml rename to tests/auto/declarative/v4/data/qrealToIntRounding.qml diff --git a/tests/auto/declarative/qdeclarativev4/data/subscriptionsInConditionalExpressions.qml b/tests/auto/declarative/v4/data/subscriptionsInConditionalExpressions.qml similarity index 100% rename from tests/auto/declarative/qdeclarativev4/data/subscriptionsInConditionalExpressions.qml rename to tests/auto/declarative/v4/data/subscriptionsInConditionalExpressions.qml diff --git a/tests/auto/declarative/qdeclarativev4/data/unaryMinus.qml b/tests/auto/declarative/v4/data/unaryMinus.qml similarity index 100% rename from tests/auto/declarative/qdeclarativev4/data/unaryMinus.qml rename to tests/auto/declarative/v4/data/unaryMinus.qml diff --git a/tests/auto/declarative/qdeclarativev4/data/unnecessaryReeval.qml b/tests/auto/declarative/v4/data/unnecessaryReeval.qml similarity index 100% rename from tests/auto/declarative/qdeclarativev4/data/unnecessaryReeval.qml rename to tests/auto/declarative/v4/data/unnecessaryReeval.qml diff --git a/tests/auto/declarative/qdeclarativev4/testtypes.cpp b/tests/auto/declarative/v4/testtypes.cpp similarity index 100% rename from tests/auto/declarative/qdeclarativev4/testtypes.cpp rename to tests/auto/declarative/v4/testtypes.cpp diff --git a/tests/auto/declarative/qdeclarativev4/testtypes.h b/tests/auto/declarative/v4/testtypes.h similarity index 100% rename from tests/auto/declarative/qdeclarativev4/testtypes.h rename to tests/auto/declarative/v4/testtypes.h diff --git a/tests/auto/declarative/qdeclarativev4/tst_qdeclarativev4.cpp b/tests/auto/declarative/v4/tst_v4.cpp similarity index 89% rename from tests/auto/declarative/qdeclarativev4/tst_qdeclarativev4.cpp rename to tests/auto/declarative/v4/tst_v4.cpp index 85f51c5..4c04e15 100644 --- a/tests/auto/declarative/qdeclarativev4/tst_qdeclarativev4.cpp +++ b/tests/auto/declarative/v4/tst_v4.cpp @@ -46,7 +46,7 @@ #include #include -#include +#include #include "testtypes.h" @@ -61,11 +61,11 @@ inline QUrl TEST_FILE(const char *filename) return TEST_FILE(QLatin1String(filename)); } -class tst_qdeclarativev4 : public QObject +class tst_v4 : public QObject { Q_OBJECT public: - tst_qdeclarativev4() {} + tst_v4() {} private slots: void initTestCase(); @@ -82,7 +82,7 @@ private: QDeclarativeEngine engine; }; -void tst_qdeclarativev4::initTestCase() +void tst_v4::initTestCase() { registerTypes(); } @@ -91,14 +91,14 @@ static int v4ErrorsMsgCount = 0; static void v4ErrorsMsgHandler(QtMsgType, const char *message) { QByteArray m(message); - if (m.contains("QDeclarativeV4")) + if (m.contains("QV4")) v4ErrorsMsgCount++; } -void tst_qdeclarativev4::qtscript() +void tst_v4::qtscript() { QFETCH(QString, file); - QDeclarativeV4Compiler::enableBindingsTest(true); + QV4Compiler::enableBindingsTest(true); QDeclarativeComponent component(&engine, TEST_FILE(file)); @@ -112,10 +112,10 @@ void tst_qdeclarativev4::qtscript() QCOMPARE(v4ErrorsMsgCount, 0); - QDeclarativeV4Compiler::enableBindingsTest(false); + QV4Compiler::enableBindingsTest(false); } -void tst_qdeclarativev4::qtscript_data() +void tst_v4::qtscript_data() { QTest::addColumn("file"); @@ -128,7 +128,7 @@ void tst_qdeclarativev4::qtscript_data() QTest::newRow("null qobject") << "nullQObject.qml"; } -void tst_qdeclarativev4::unnecessaryReeval() +void tst_v4::unnecessaryReeval() { QDeclarativeComponent component(&engine, TEST_FILE("unnecessaryReeval.qml")); @@ -161,7 +161,7 @@ void tst_qdeclarativev4::unnecessaryReeval() delete o; } -void tst_qdeclarativev4::logicalOr() +void tst_v4::logicalOr() { { QDeclarativeComponent component(&engine, TEST_FILE("logicalOr.qml")); @@ -190,7 +190,7 @@ void tst_qdeclarativev4::logicalOr() } } -void tst_qdeclarativev4::conditionalExpr() +void tst_v4::conditionalExpr() { { QDeclarativeComponent component(&engine, TEST_FILE("conditionalExpr.qml")); @@ -209,7 +209,7 @@ void tst_qdeclarativev4::conditionalExpr() // This would previously use the metaObject of the root element to result the nested access. // That is, the index for accessing "result" would have been RootObject::result, instead of // NestedObject::result. -void tst_qdeclarativev4::nestedObjectAccess() +void tst_v4::nestedObjectAccess() { QDeclarativeComponent component(&engine, TEST_FILE("nestedObjectAccess.qml")); @@ -224,7 +224,7 @@ void tst_qdeclarativev4::nestedObjectAccess() delete o; } -void tst_qdeclarativev4::subscriptionsInConditionalExpressions() +void tst_v4::subscriptionsInConditionalExpressions() { QDeclarativeComponent component(&engine, TEST_FILE("subscriptionsInConditionalExpressions.qml")); @@ -239,6 +239,6 @@ void tst_qdeclarativev4::subscriptionsInConditionalExpressions() delete o; } -QTEST_MAIN(tst_qdeclarativev4) +QTEST_MAIN(tst_v4) -#include "tst_qdeclarativev4.moc" +#include "tst_v4.moc" diff --git a/tests/auto/declarative/qdeclarativev4/qdeclarativev4.pro b/tests/auto/declarative/v4/v4.pro similarity index 87% rename from tests/auto/declarative/qdeclarativev4/qdeclarativev4.pro rename to tests/auto/declarative/v4/v4.pro index 6021dc9..6a9574d 100644 --- a/tests/auto/declarative/qdeclarativev4/qdeclarativev4.pro +++ b/tests/auto/declarative/v4/v4.pro @@ -2,7 +2,7 @@ CONFIG += testcase TARGET = tst_qdeclarativev4 macx:CONFIG -= app_bundle -SOURCES += tst_qdeclarativev4.cpp \ +SOURCES += tst_v4.cpp \ testtypes.cpp HEADERS += testtypes.h -- 2.7.4