From 12e55eaa653107982de9b88f6459f0e16660a35e Mon Sep 17 00:00:00 2001 From: Simon Hausmann Date: Tue, 18 Mar 2014 23:39:02 +0100 Subject: Cleanup: Remove last traces of QQmlScript What remains is the code for removing .pragma from script source code (and replacing it with white-space to preserve line/column numbers). The previous code even returned the value of the pragmas, but for the remaining caller sites that value isn't used, so we can just return void. Change-Id: I16db15da236970660b817d6c4493005365a7a1af Reviewed-by: Lars Knoll --- src/qml/compiler/qqmlirbuilder.cpp | 45 +++++++++++++ src/qml/compiler/qqmlirbuilder_p.h | 4 +- src/qml/jsruntime/qv4include.cpp | 4 +- src/qml/qml/qml.pri | 2 - src/qml/qml/qqmlcompiler_p.h | 1 - src/qml/qml/qqmlcomponent.cpp | 1 - src/qml/qml/qqmlcontext_p.h | 1 - src/qml/qml/qqmlcustomparser.cpp | 2 - src/qml/qml/qqmlcustomparser_p.h | 1 - src/qml/qml/qqmlengine_p.h | 1 + src/qml/qml/qqmlimport_p.h | 1 - src/qml/qml/qqmlscript.cpp | 123 ----------------------------------- src/qml/qml/qqmlscript_p.h | 103 ----------------------------- src/qml/qml/qqmltypeloader_p.h | 1 - src/qml/types/qqmllistmodel.cpp | 1 - src/qml/types/qquickworkerscript.cpp | 2 +- 16 files changed, 52 insertions(+), 241 deletions(-) delete mode 100644 src/qml/qml/qqmlscript.cpp delete mode 100644 src/qml/qml/qqmlscript_p.h (limited to 'src/qml') diff --git a/src/qml/compiler/qqmlirbuilder.cpp b/src/qml/compiler/qqmlirbuilder.cpp index 9c32b9aed1..bd0aedf089 100644 --- a/src/qml/compiler/qqmlirbuilder.cpp +++ b/src/qml/compiler/qqmlirbuilder.cpp @@ -459,6 +459,51 @@ void Document::extractScriptMetaData(QString &script, QQmlError *error) return; } +void Document::removeScriptPragmas(QString &script) +{ + const QString pragma(QLatin1String("pragma")); + const QString library(QLatin1String("library")); + + QQmlJS::Lexer l(0); + l.setCode(script, 0); + + int token = l.lex(); + + while (true) { + if (token != QQmlJSGrammar::T_DOT) + return; + + int startOffset = l.tokenOffset(); + int startLine = l.tokenStartLine(); + + token = l.lex(); + + if (token != QQmlJSGrammar::T_PRAGMA || + l.tokenStartLine() != startLine || + script.mid(l.tokenOffset(), l.tokenLength()) != pragma) + return; + + token = l.lex(); + + if (token != QQmlJSGrammar::T_IDENTIFIER || + l.tokenStartLine() != startLine) + return; + + QString pragmaValue = script.mid(l.tokenOffset(), l.tokenLength()); + int endOffset = l.tokenLength() + l.tokenOffset(); + + token = l.lex(); + if (l.tokenStartLine() == startLine) + return; + + if (pragmaValue == library) { + replaceWithSpace(script, startOffset, endOffset - startOffset); + } else { + return; + } + } +} + IRBuilder::IRBuilder(const QSet &illegalNames) : illegalNames(illegalNames) , _object(0) diff --git a/src/qml/compiler/qqmlirbuilder_p.h b/src/qml/compiler/qqmlirbuilder_p.h index c2e1ee496e..a345290672 100644 --- a/src/qml/compiler/qqmlirbuilder_p.h +++ b/src/qml/compiler/qqmlirbuilder_p.h @@ -43,18 +43,19 @@ #include #include -#include #include #include #include #include #include #include +#include #include #include QT_BEGIN_NAMESPACE +class QQmlContextData; class QQmlTypeNameCache; namespace QmlIR { @@ -324,6 +325,7 @@ struct Q_QML_EXPORT Document QString stringAt(int index) const { return jsGenerator.strings.value(index); } void extractScriptMetaData(QString &script, QQmlError *error); + static void removeScriptPragmas(QString &script); }; struct Q_QML_EXPORT IRBuilder : public QQmlJS::AST::Visitor diff --git a/src/qml/jsruntime/qv4include.cpp b/src/qml/jsruntime/qv4include.cpp index 7642db1e9b..d5bae0e35e 100644 --- a/src/qml/jsruntime/qv4include.cpp +++ b/src/qml/jsruntime/qv4include.cpp @@ -148,7 +148,7 @@ void QV4Include::finished() QByteArray data = m_reply->readAll(); QString code = QString::fromUtf8(data); - QQmlScript::Parser::extractPragmas(code); + QmlIR::Document::removeScriptPragmas(code); QV4::ScopedObject qmlglobal(scope, m_qmlglobal.value()); QV4::Script script(v4, qmlglobal, code, m_url.toString()); @@ -216,7 +216,7 @@ QV4::ReturnedValue QV4Include::method_include(QV4::CallContext *ctx) if (f.open(QIODevice::ReadOnly)) { QByteArray data = f.readAll(); QString code = QString::fromUtf8(data); - QQmlScript::Parser::extractPragmas(code); + QmlIR::Document::removeScriptPragmas(code); QV4::Script script(v4, qmlcontextobject, code, url.toString()); diff --git a/src/qml/qml/qml.pri b/src/qml/qml/qml.pri index 33d8be37d1..b6250ee35d 100644 --- a/src/qml/qml/qml.pri +++ b/src/qml/qml/qml.pri @@ -20,7 +20,6 @@ SOURCES += \ $$PWD/qqmltypeloader.cpp \ $$PWD/qqmlinfo.cpp \ $$PWD/qqmlerror.cpp \ - $$PWD/qqmlscript.cpp \ $$PWD/qqmlvaluetype.cpp \ $$PWD/qqmlaccessors.cpp \ $$PWD/qqmlxmlhttprequest.cpp \ @@ -91,7 +90,6 @@ HEADERS += \ $$PWD/qqmllist_p.h \ $$PWD/qqmldata_p.h \ $$PWD/qqmlerror.h \ - $$PWD/qqmlscript_p.h \ $$PWD/qqmlvaluetype_p.h \ $$PWD/qqmlaccessors_p.h \ $$PWD/qqmlxmlhttprequest_p.h \ diff --git a/src/qml/qml/qqmlcompiler_p.h b/src/qml/qml/qqmlcompiler_p.h index e30fa389f6..a56af15b5a 100644 --- a/src/qml/qml/qqmlcompiler_p.h +++ b/src/qml/qml/qqmlcompiler_p.h @@ -55,7 +55,6 @@ #include "qqml.h" #include "qqmlerror.h" -#include "qqmlscript_p.h" #include "qqmlengine_p.h" #include #include "qqmlpropertycache_p.h" diff --git a/src/qml/qml/qqmlcomponent.cpp b/src/qml/qml/qqmlcomponent.cpp index 77d02e071f..f0e737516b 100644 --- a/src/qml/qml/qqmlcomponent.cpp +++ b/src/qml/qml/qqmlcomponent.cpp @@ -51,7 +51,6 @@ #include "qqmlengine.h" #include "qqmlbinding_p.h" #include "qqmlglobal_p.h" -#include "qqmlscript_p.h" #include #include "qqmlincubator.h" #include "qqmlincubator_p.h" diff --git a/src/qml/qml/qqmlcontext_p.h b/src/qml/qml/qqmlcontext_p.h index 464bee82c0..d3af3a2afa 100644 --- a/src/qml/qml/qqmlcontext_p.h +++ b/src/qml/qml/qqmlcontext_p.h @@ -59,7 +59,6 @@ #include "qqmltypenamecache_p.h" #include "qqmlnotifier_p.h" #include "qqmllist.h" -#include "qqmlscript_p.h" #include #include diff --git a/src/qml/qml/qqmlcustomparser.cpp b/src/qml/qml/qqmlcustomparser.cpp index 037b07dbb3..fc08f33141 100644 --- a/src/qml/qml/qqmlcustomparser.cpp +++ b/src/qml/qml/qqmlcustomparser.cpp @@ -47,8 +47,6 @@ QT_BEGIN_NAMESPACE -using namespace QQmlScript; - /*! \class QQmlCustomParser \brief The QQmlCustomParser class allows you to add new arbitrary types to QML. diff --git a/src/qml/qml/qqmlcustomparser_p.h b/src/qml/qml/qqmlcustomparser_p.h index 8d98cf6423..fb9c405b59 100644 --- a/src/qml/qml/qqmlcustomparser_p.h +++ b/src/qml/qml/qqmlcustomparser_p.h @@ -55,7 +55,6 @@ #include "qqmlmetatype_p.h" #include "qqmlerror.h" -#include "qqmlscript_p.h" #include "qqmlbinding_p.h" #include diff --git a/src/qml/qml/qqmlengine_p.h b/src/qml/qml/qqmlengine_p.h index 56c80dc2cd..5767ca90f0 100644 --- a/src/qml/qml/qqmlengine_p.h +++ b/src/qml/qml/qqmlengine_p.h @@ -69,6 +69,7 @@ #include "qqmldirparser_p.h" #include #include +#include #include #include diff --git a/src/qml/qml/qqmlimport_p.h b/src/qml/qml/qqmlimport_p.h index 7894037cdc..e0c630e9d3 100644 --- a/src/qml/qml/qqmlimport_p.h +++ b/src/qml/qml/qqmlimport_p.h @@ -47,7 +47,6 @@ #include #include #include -#include #include // diff --git a/src/qml/qml/qqmlscript.cpp b/src/qml/qml/qqmlscript.cpp deleted file mode 100644 index 90d19f2035..0000000000 --- a/src/qml/qml/qqmlscript.cpp +++ /dev/null @@ -1,123 +0,0 @@ -/**************************************************************************** -** -** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). -** Contact: http://www.qt-project.org/legal -** -** This file is part of the QtQml module of the Qt Toolkit. -** -** $QT_BEGIN_LICENSE:LGPL$ -** Commercial License Usage -** Licensees holding valid commercial Qt licenses may use this file in -** accordance with the commercial license agreement provided with the -** Software or, alternatively, in accordance with the terms contained in -** a written agreement between you and Digia. For licensing terms and -** conditions see http://qt.digia.com/licensing. For further information -** use the contact form at http://qt.digia.com/contact-us. -** -** GNU Lesser General Public License Usage -** Alternatively, this file may be used under the terms of the GNU Lesser -** General Public License version 2.1 as published by the Free Software -** Foundation and appearing in the file LICENSE.LGPL included in the -** packaging of this file. Please review the following information to -** ensure the GNU Lesser General Public License version 2.1 requirements -** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. -** -** In addition, as a special exception, Digia gives you certain additional -** rights. These rights are described in the Digia Qt LGPL Exception -** version 1.1, included in the file LGPL_EXCEPTION.txt in this package. -** -** GNU General Public License Usage -** Alternatively, this file may be used under the terms of the GNU -** General Public License version 3.0 as published by the Free Software -** Foundation and appearing in the file LICENSE.GPL included in the -** packaging of this file. Please review the following information to -** ensure the GNU General Public License version 3.0 requirements will be -** met: http://www.gnu.org/copyleft/gpl.html. -** -** -** $QT_END_LICENSE$ -** -****************************************************************************/ - -#include "qqmlscript_p.h" - -#include -#include -#include -#include -#include -#include - -#include -#include -#include -#include - -QT_BEGIN_NAMESPACE - -using namespace QQmlJS; -using namespace QQmlScript; - -static void replaceWithSpace(QString &str, int idx, int n) -{ - QChar *data = str.data() + idx; - const QChar space(QLatin1Char(' ')); - for (int ii = 0; ii < n; ++ii) - *data++ = space; -} - -/* -Searches for ".pragma " declarations within \a script. Currently supported pragmas -are: - library -*/ -QQmlScript::Object::ScriptBlock::Pragmas QQmlScript::Parser::extractPragmas(QString &script) -{ - QQmlScript::Object::ScriptBlock::Pragmas rv = QQmlScript::Object::ScriptBlock::None; - - const QString pragma(QLatin1String("pragma")); - const QString library(QLatin1String("library")); - - QQmlJS::Lexer l(0); - l.setCode(script, 0); - - int token = l.lex(); - - while (true) { - if (token != QQmlJSGrammar::T_DOT) - return rv; - - int startOffset = l.tokenOffset(); - int startLine = l.tokenStartLine(); - - token = l.lex(); - - if (token != QQmlJSGrammar::T_PRAGMA || - l.tokenStartLine() != startLine || - script.mid(l.tokenOffset(), l.tokenLength()) != pragma) - return rv; - - token = l.lex(); - - if (token != QQmlJSGrammar::T_IDENTIFIER || - l.tokenStartLine() != startLine) - return rv; - - QString pragmaValue = script.mid(l.tokenOffset(), l.tokenLength()); - int endOffset = l.tokenLength() + l.tokenOffset(); - - token = l.lex(); - if (l.tokenStartLine() == startLine) - return rv; - - if (pragmaValue == library) { - rv |= QQmlScript::Object::ScriptBlock::Shared; - replaceWithSpace(script, startOffset, endOffset - startOffset); - } else { - return rv; - } - } - return rv; -} - -QT_END_NAMESPACE diff --git a/src/qml/qml/qqmlscript_p.h b/src/qml/qml/qqmlscript_p.h deleted file mode 100644 index a79244f2ea..0000000000 --- a/src/qml/qml/qqmlscript_p.h +++ /dev/null @@ -1,103 +0,0 @@ -/**************************************************************************** -** -** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). -** Contact: http://www.qt-project.org/legal -** -** This file is part of the QtQml module of the Qt Toolkit. -** -** $QT_BEGIN_LICENSE:LGPL$ -** Commercial License Usage -** Licensees holding valid commercial Qt licenses may use this file in -** accordance with the commercial license agreement provided with the -** Software or, alternatively, in accordance with the terms contained in -** a written agreement between you and Digia. For licensing terms and -** conditions see http://qt.digia.com/licensing. For further information -** use the contact form at http://qt.digia.com/contact-us. -** -** GNU Lesser General Public License Usage -** Alternatively, this file may be used under the terms of the GNU Lesser -** General Public License version 2.1 as published by the Free Software -** Foundation and appearing in the file LICENSE.LGPL included in the -** packaging of this file. Please review the following information to -** ensure the GNU Lesser General Public License version 2.1 requirements -** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. -** -** In addition, as a special exception, Digia gives you certain additional -** rights. These rights are described in the Digia Qt LGPL Exception -** version 1.1, included in the file LGPL_EXCEPTION.txt in this package. -** -** GNU General Public License Usage -** Alternatively, this file may be used under the terms of the GNU -** General Public License version 3.0 as published by the Free Software -** Foundation and appearing in the file LICENSE.GPL included in the -** packaging of this file. Please review the following information to -** ensure the GNU General Public License version 3.0 requirements will be -** met: http://www.gnu.org/copyleft/gpl.html. -** -** -** $QT_END_LICENSE$ -** -****************************************************************************/ -#ifndef QQMLSCRIPT_P_H -#define QQMLSCRIPT_P_H - -// -// W A R N I N G -// ------------- -// -// This file is not part of the Qt API. It exists purely as an -// implementation detail. This header file may change from version to -// version without notice, or even be removed. -// -// We mean it. -// - -#include - -#include -#include -#include -#include - -#include -#include - -QT_BEGIN_NAMESPACE - - -class QByteArray; -class QQmlPropertyCache; -namespace QQmlJS { class Engine; namespace AST { class Node; class StringLiteral; class UiProgram; class FunctionDeclaration; } } - -namespace QQmlScript { - -class Object : public QQmlPool::Class -{ -public: - // Script blocks that were nested under this object - struct ScriptBlock { - enum Pragma { - None = 0x00000000, - Shared = 0x00000001 - }; - Q_DECLARE_FLAGS(Pragmas, Pragma) - - QString code; - QString file; - Pragmas pragmas; - }; -}; - -class Q_QML_PRIVATE_EXPORT Parser -{ -public: - static QQmlScript::Object::ScriptBlock::Pragmas extractPragmas(QString &); -}; - -} - -Q_DECLARE_OPERATORS_FOR_FLAGS(QQmlScript::Object::ScriptBlock::Pragmas) - -QT_END_NAMESPACE - -#endif // QQMLSCRIPT_P_H diff --git a/src/qml/qml/qqmltypeloader_p.h b/src/qml/qml/qqmltypeloader_p.h index 7fe805782d..1328ebc37c 100644 --- a/src/qml/qml/qqmltypeloader_p.h +++ b/src/qml/qml/qqmltypeloader_p.h @@ -62,7 +62,6 @@ #include #include -#include #include #include #include diff --git a/src/qml/types/qqmllistmodel.cpp b/src/qml/types/qqmllistmodel.cpp index 82517bd3f4..f9badcd381 100644 --- a/src/qml/types/qqmllistmodel.cpp +++ b/src/qml/types/qqmllistmodel.cpp @@ -47,7 +47,6 @@ #include -#include #include #include diff --git a/src/qml/types/qquickworkerscript.cpp b/src/qml/types/qquickworkerscript.cpp index 111ef68a98..507e94fb7e 100644 --- a/src/qml/types/qquickworkerscript.cpp +++ b/src/qml/types/qquickworkerscript.cpp @@ -386,7 +386,7 @@ void QQuickWorkerScriptEnginePrivate::processLoad(int id, const QUrl &url) if (f.open(QIODevice::ReadOnly)) { QByteArray data = f.readAll(); QString sourceCode = QString::fromUtf8(data); - QQmlScript::Parser::extractPragmas(sourceCode); + QmlIR::Document::removeScriptPragmas(sourceCode); WorkerScript *script = workers.value(id); if (!script) -- cgit v1.2.3