Commit d866848a authored by Erik Verbruggen's avatar Erik Verbruggen

Re-imported and re-generated the QML parser from Qt.

parent d6217a07
......@@ -367,7 +367,7 @@ protected:
QList<DiagnosticMessage> diagnostic_messages;
};
} // namespace QmlJS
} // end of namespace QmlJS
:/
......
......@@ -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
......@@ -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
......
......@@ -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;
......
......@@ -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.
......
......@@ -231,7 +231,7 @@ protected:
QList<DiagnosticMessage> diagnostic_messages;
};
} // namespace QmlJS
} // end of namespace QmlJS
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment