diff options
author | Simon Hausmann <simon.hausmann@digia.com> | 2013-07-01 08:48:41 +0200 |
---|---|---|
committer | The Qt Project <gerrit-noreply@qt-project.org> | 2013-07-03 13:22:25 +0200 |
commit | 06eaeb0ac8d861cf3e60b11a8fbbabdeef1d6759 (patch) | |
tree | 825fb27485c376d0b83e8dfbcd20c852f2dd525c /src/qml/qml/qqmlrewrite_p.h | |
parent | b30657647a7f816a2945302b3569b882d7ac6b72 (diff) |
Get rid of the signal expression rewriter
This replaces the entire rewriter with more or less:
expressionToEval = "(function(<named params here>) { " + expr + " } )"
This also fixes crashes at run-time when the signal rewriter was
executed from the loader thread and tried to use a v4 identifier
hash with the same engine that's also in the main thread.
Change-Id: Ib1e4927d330706a593411fbff64ed3da1e23d0e0
Reviewed-by: Lars Knoll <lars.knoll@digia.com>
Diffstat (limited to 'src/qml/qml/qqmlrewrite_p.h')
-rw-r--r-- | src/qml/qml/qqmlrewrite_p.h | 142 |
1 files changed, 0 insertions, 142 deletions
diff --git a/src/qml/qml/qqmlrewrite_p.h b/src/qml/qml/qqmlrewrite_p.h deleted file mode 100644 index 7cd283f1d9..0000000000 --- a/src/qml/qml/qqmlrewrite_p.h +++ /dev/null @@ -1,142 +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 QQMLREWRITE_P_H -#define QQMLREWRITE_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 <private/textwriter_p.h> -#include <private/qqmljslexer_p.h> -#include <private/qqmljsparser_p.h> -#include <private/qqmljsmemorypool_p.h> -#include <private/qv4identifier_p.h> - -QT_BEGIN_NAMESPACE - -namespace QQmlRewrite { -using namespace QQmlJS; - -class SharedBindingTester : protected AST::Visitor -{ - bool _sharable; - bool _safe; -public: - SharedBindingTester(); - - bool isSharable() const { return _sharable; } - bool isSafe() const { return isSharable() && _safe; } - - void parse(const QString &code); - void parse(AST::Node *Node); - - virtual bool visit(AST::FunctionDeclaration *); - virtual bool visit(AST::FunctionExpression *); - virtual bool visit(AST::IdentifierExpression *); - virtual bool visit(AST::CallExpression *); - virtual bool visit(AST::PostDecrementExpression *); - virtual bool visit(AST::PostIncrementExpression *); - virtual bool visit(AST::PreDecrementExpression *); - virtual bool visit(AST::PreIncrementExpression *); - virtual bool visit(AST::BinaryExpression *); -}; - -class RewriteSignalHandler: protected AST::Visitor -{ -public: - RewriteSignalHandler(QV4::ExecutionEngine *engine); - QString operator()(QQmlJS::AST::Node *node, const QString &code, const QString &name, - const QString ¶meterString = QString(), - const QList<QByteArray> ¶meterNameList = QList<QByteArray>(), - const QV4::IdentifierHash<bool> &illegalNames = QV4::IdentifierHash<bool>()); - QString operator()(const QString &code, const QString &name, bool *ok = 0, - const QList<QByteArray> ¶meterNameList = QList<QByteArray>(), - const QV4::IdentifierHash<bool> &illegalNames = QV4::IdentifierHash<bool>()); - - enum ParameterAccess { - ParametersAccessed, - ParametersUnaccessed, - UnknownAccess - }; - - //returns the first n signal parameters that are used in the expression - int parameterCountForJS() const { return _parameterCountForJS; } - ParameterAccess parameterAccess() const { return _parameterAccess; } - QString createParameterString(const QList<QByteArray> ¶meterNameList, - const QV4::IdentifierHash<bool> &illegalNames); - - bool hasParameterError() { return !_error.isEmpty(); } - QString parameterError() const { return _error; } - -protected: - void rewriteMultilineStrings(QString &code); - - using AST::Visitor::visit; - void accept(AST::Node *node); - virtual bool visit(AST::StringLiteral *ast); - virtual bool visit(AST::IdentifierExpression *); - -private: - TextWriter *_writer; - const QString *_code; - int _position; - QV4::IdentifierHash<int> _parameterNames; - QList<QByteArray> _parameterNameList; - ParameterAccess _parameterAccess; - int _parameterCountForJS; - QString _error; -}; - -} // namespace QQmlRewrite - -QT_END_NAMESPACE - -#endif // QQMLREWRITE_P_H - |