feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

qmljs/parser: update to latest qt5 parser

Browse Source 
fix error semicolon insertion of loops, strict mode
Change-Id: I311733ffb34269d1cee7e576d05af78893b2bcbb
Reviewed-by: Erik Verbruggen <erik.verbruggen@digia.com>
This commit is contained in:
Fawzi Mohamed
2013-01-22 11:15:23 +01:00
committed by Erik Verbruggen
parent 111872591e
commit f0e4df5826
14 changed files with 1141 additions and 1016 deletions
Download Patch File Download Diff File Expand all files Collapse all files

39
src/libs/qmljs/parser/qmlerror.cpp
View File

@@ -28,6 +28,7 @@
****************************************************************************/
#include "qmlerror.h"
#include "qmlglobal_p.h"
#include <QtCore/qdebug.h>
#include <QtCore/qfile.h>
@@ -69,12 +70,12 @@ public:
QUrl url;
QString description;
int line;
int column;
quint16 line;
quint16 column;
};
QmlErrorPrivate::QmlErrorPrivate()
: line(-1), column(-1)
: line(0), column(0)
{
}
@@ -114,7 +115,7 @@ QmlError &QmlError::operator=(const QmlError &other)
}
/*!
\internal
\internal
*/
QmlError::~QmlError()
{
@@ -170,7 +171,7 @@ void QmlError::setDescription(const QString &description)
*/
int QmlError::line() const
{
if (d) return d->line;
if (d) return qmlSourceCoordinate(d->line);
else return -1;
}
@@ -180,7 +181,7 @@ int QmlError::line() const
void QmlError::setLine(int line)
{
if (!d) d = new QmlErrorPrivate;
d->line = line;
d->line = qmlSourceCoordinate(line);
}
/*!
@@ -188,7 +189,7 @@ void QmlError::setLine(int line)
*/
int QmlError::column() const
{
if (d) return d->column;
if (d) return qmlSourceCoordinate(d->column);
else return -1;
}
@@ -198,7 +199,7 @@ int QmlError::column() const
void QmlError::setColumn(int column)
{
if (!d) d = new QmlErrorPrivate;
d->column = column;
d->column = qmlSourceCoordinate(column);
}
/*!
@@ -207,14 +208,20 @@ void QmlError::setColumn(int column)
QString QmlError::toString() const
{
QString rv;
if (url().isEmpty()) {
QUrl u(url());
int l(line());
if (u.isEmpty()) {
rv = QLatin1String("<Unknown File>");
} else if (line() != -1) {
rv = url().toString() + QLatin1Char(':') + QString::number(line());
if (column() != -1)
rv += QLatin1Char(':') + QString::number(column());
} else if (l != -1) {
rv = u.toString() + QLatin1Char(':') + QString::number(l);
int c(column());
if (c != -1)
rv += QLatin1Char(':') + QString::number(c);
} else {
rv = url().toString();
rv = u.toString();
}
rv += QLatin1String(": ") + description();
@@ -251,9 +258,9 @@ QDebug operator<<(QDebug debug, const QmlError &error)
const QString &line = lines.at(error.line() - 1);
debug << "\n " << qPrintable(line);
if (error.column() > 0) {
if(error.column() > 0) {
int column = qMax(0, error.column() - 1);
column = qMin(column, line.length());
column = qMin(column, line.length());
QByteArray ind;
ind.reserve(column);