diff options
-rw-r--r-- | src/declarative/qml/qmldom.cpp | 10 | ||||
-rw-r--r-- | src/declarative/qml/qmldom.h | 2 | ||||
-rw-r--r-- | src/declarative/qml/qmlscriptparser.cpp | 11 | ||||
-rw-r--r-- | src/declarative/qml/qmlscriptparser_p.h | 4 |
4 files changed, 0 insertions, 27 deletions
diff --git a/src/declarative/qml/qmldom.cpp b/src/declarative/qml/qmldom.cpp index 9015e5c..648eb36 100644 --- a/src/declarative/qml/qmldom.cpp +++ b/src/declarative/qml/qmldom.cpp @@ -194,8 +194,6 @@ bool QmlDomDocument::load(QmlEngine *engine, const QByteArray &data, const QUrl d->imports += QUrl(td->data.imports().at(i).uri); } - d->automaticSemicolonOffsets = td->data.automaticSemicolonOffsets(); - if (td->data.tree()) { if (compilerDump()) { qWarning() << "-AST------------------------------------------------------------------------------"; @@ -253,14 +251,6 @@ QmlDomObject QmlDomDocument::rootObject() const return rv; } -QList<int> QmlDomDocument::automaticSemicolonOffsets() const -{ - if (d) - return d->automaticSemicolonOffsets; - else - return QList<int>(); -} - QmlDomPropertyPrivate::QmlDomPropertyPrivate() : property(0) { diff --git a/src/declarative/qml/qmldom.h b/src/declarative/qml/qmldom.h index 170ef56..ef9fe25 100644 --- a/src/declarative/qml/qmldom.h +++ b/src/declarative/qml/qmldom.h @@ -79,8 +79,6 @@ public: QmlDomObject rootObject() const; - QList<int> automaticSemicolonOffsets() const; - private: QSharedDataPointer<QmlDomDocumentPrivate> d; }; diff --git a/src/declarative/qml/qmlscriptparser.cpp b/src/declarative/qml/qmlscriptparser.cpp index f1f1710..b957499 100644 --- a/src/declarative/qml/qmlscriptparser.cpp +++ b/src/declarative/qml/qmlscriptparser.cpp @@ -178,8 +178,6 @@ protected: virtual bool visit(AST::UiArrayBinding *node); virtual bool visit(AST::UiSourceElement *node); - virtual bool visit(AST::ExpressionStatement *node); - void accept(AST::Node *node); QString asString(AST::UiQualifiedId *node) const; @@ -645,14 +643,6 @@ bool ProcessAST::visit(AST::UiScriptBinding *node) return true; } -bool ProcessAST::visit(AST::ExpressionStatement *node) -{ - if (!node->semicolonToken.isValid()) - _parser->addAutomaticSemicolonOffset(node->semicolonToken.offset); - - return true; -} - static QList<int> collectCommas(AST::UiArrayMemberList *members) { QList<int> commas; @@ -856,7 +846,6 @@ void QmlScriptParser::clear() _nameSpacePaths.clear(); _typeNames.clear(); _errors.clear(); - _automaticSemicolonOffsets.clear(); if (data) { delete data; diff --git a/src/declarative/qml/qmlscriptparser_p.h b/src/declarative/qml/qmlscriptparser_p.h index 15f165c..a4cbd82 100644 --- a/src/declarative/qml/qmlscriptparser_p.h +++ b/src/declarative/qml/qmlscriptparser_p.h @@ -93,9 +93,6 @@ public: QList<QmlError> errors() const; - QList<int> automaticSemicolonOffsets() const { return _automaticSemicolonOffsets; } - void addAutomaticSemicolonOffset(int offset) { _automaticSemicolonOffsets.append(offset); } - // ### private: int findOrCreateTypeId(const QString &name); void setTree(QmlParser::Object *tree); @@ -114,7 +111,6 @@ public: QStringList _typeNames; QString _scriptFile; QmlScriptParserJsASTData *data; - QList<int> _automaticSemicolonOffsets; }; QT_END_NAMESPACE |