From d866848ab8743c4d80b572e665f60b0a1e652545 Mon Sep 17 00:00:00 2001
From: Erik Verbruggen <erik.verbruggen@nokia.com>
Date: Mon, 21 Feb 2011 12:46:02 +0100
Subject: [PATCH] Re-imported and re-generated the QML parser from Qt.

---
 src/libs/qmljs/parser/qmljs.g           |  2 +-
 src/libs/qmljs/parser/qmljsengine_p.cpp |  4 ++--
 src/libs/qmljs/parser/qmljsengine_p.h   |  6 +++---
 src/libs/qmljs/parser/qmljslexer.cpp    |  2 +-
 src/libs/qmljs/parser/qmljsparser.cpp   | 12 +++++++-----
 src/libs/qmljs/parser/qmljsparser_p.h   |  2 +-
 6 files changed, 15 insertions(+), 13 deletions(-)

diff --git a/src/libs/qmljs/parser/qmljs.g b/src/libs/qmljs/parser/qmljs.g
index 89fabc36ac6..af1c046a90f 100644
--- a/src/libs/qmljs/parser/qmljs.g
+++ b/src/libs/qmljs/parser/qmljs.g
@@ -367,7 +367,7 @@ protected:
     QList<DiagnosticMessage> diagnostic_messages;
 };
 
-} // namespace QmlJS
+} // end of namespace QmlJS
 
 
 :/
diff --git a/src/libs/qmljs/parser/qmljsengine_p.cpp b/src/libs/qmljs/parser/qmljsengine_p.cpp
index 9f26bb32c9e..5c633145e91 100644
--- a/src/libs/qmljs/parser/qmljsengine_p.cpp
+++ b/src/libs/qmljs/parser/qmljsengine_p.cpp
@@ -45,7 +45,7 @@
 #include "qmljsnodepool_p.h"
 
 #include <qnumeric.h>
-#include <QtCore/QHash>
+#include <QHash>
 
 QT_QML_BEGIN_NAMESPACE
 
@@ -207,6 +207,6 @@ void Engine::setNodePool(NodePool *nodePool)
 
 
 
-} // namespace QmlJS
+} // end of namespace QmlJS
 
 QT_QML_END_NAMESPACE
diff --git a/src/libs/qmljs/parser/qmljsengine_p.h b/src/libs/qmljs/parser/qmljsengine_p.h
index d7a9ae262ce..f0251e12f57 100644
--- a/src/libs/qmljs/parser/qmljsengine_p.h
+++ b/src/libs/qmljs/parser/qmljsengine_p.h
@@ -86,7 +86,7 @@ public:
 
 uint qHash(const QmlJS::NameId &id);
 
-} // namespace QmlJS
+} // end of namespace QmlJS
 
 #if defined(Q_CC_MSVC) && _MSC_VER <= 1300
 //this ensures that code outside QmlJS can use the hash function
@@ -115,7 +115,7 @@ public:
     static QString flagsToString(int flags);
 };
 
-} // namespace Ecma
+} // end of namespace Ecma
 
 class QML_PARSER_EXPORT DiagnosticMessage
 {
@@ -166,7 +166,7 @@ public:
     void setNodePool(NodePool *nodePool);
 };
 
-} // namespace QmlJS
+} // end of namespace QmlJS
 
 QT_QML_END_NAMESPACE
 
diff --git a/src/libs/qmljs/parser/qmljslexer.cpp b/src/libs/qmljs/parser/qmljslexer.cpp
index 3eadc7386e7..f86ee19c30e 100644
--- a/src/libs/qmljs/parser/qmljslexer.cpp
+++ b/src/libs/qmljs/parser/qmljslexer.cpp
@@ -619,7 +619,7 @@ int Lexer::lex()
                 } else {
                     setDone(Bad);
                     err = IllegalEscapeSequence;
-                    errmsg = QCoreApplication::translate("QmlParser", "Illegal escape squence");
+                    errmsg = QCoreApplication::translate("QmlParser", "Illegal escape sequence");
                 }
             } else if (current == 'x')
                 state = InHexEscape;
diff --git a/src/libs/qmljs/parser/qmljsparser.cpp b/src/libs/qmljs/parser/qmljsparser.cpp
index d93d921248e..403c50fc5ca 100644
--- a/src/libs/qmljs/parser/qmljsparser.cpp
+++ b/src/libs/qmljs/parser/qmljsparser.cpp
@@ -39,18 +39,20 @@
 **
 ****************************************************************************/
 
-#include "qmljsparser_p.h"
+#include <QtCore/QtDebug>
+#include <QtGui/QApplication>
+
+#include <string.h>
 
 #include "qmljsengine_p.h"
 #include "qmljslexer_p.h"
 #include "qmljsast_p.h"
 #include "qmljsnodepool_p.h"
 
-#include <QtCore/QtDebug>
-#include <QtCore/QVarLengthArray>
-#include <QtGui/QApplication>
 
-#include <string.h>
+
+#include "qmljsparser_p.h"
+#include <QVarLengthArray>
 
 //
 // This file is automatically generated from qmljs.g.
diff --git a/src/libs/qmljs/parser/qmljsparser_p.h b/src/libs/qmljs/parser/qmljsparser_p.h
index cf75e05dbcd..bd9db581e9e 100644
--- a/src/libs/qmljs/parser/qmljsparser_p.h
+++ b/src/libs/qmljs/parser/qmljsparser_p.h
@@ -231,7 +231,7 @@ protected:
     QList<DiagnosticMessage> diagnostic_messages;
 };
 
-} // namespace QmlJS
+} // end of namespace QmlJS