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

Updated the QML/JS front-end.

Browse Source
This commit is contained in:
Roberto Raggi
2010-03-03 11:38:33 +01:00
parent 08b9323f0c
commit 26e4672bc6
18 changed files with 1187 additions and 1099 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/libs/qmljs/parser/qmljslexer.cpp
View File

@@ -1,6 +1,6 @@
/****************************************************************************
**
** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
** All rights reserved.
** Contact: Nokia Corporation (qt-info@nokia.com)
**
@@ -56,12 +56,10 @@
#include <stdio.h>
#include <string.h>
QT_BEGIN_NAMESPACE
extern double qstrtod(const char *s00, char const **se, bool *ok);
QT_END_NAMESPACE
QT_QML_BEGIN_NAMESPACE
extern double qstrtod(const char *s00, char const **se, bool *ok);
#define shiftWindowsLineBreak() \
do { \
if (((current == '\r') && (next1 == '\n')) \
@@ -168,6 +166,8 @@ int Lexer::findReservedWord(const QChar *c, int size) const
return QmlJSGrammar::T_IN;
else if (c[0] == QLatin1Char('a') && c[1] == QLatin1Char('s'))
return QmlJSGrammar::T_AS;
else if (c[0] == QLatin1Char('o') && c[1] == QLatin1Char('n'))
return QmlJSGrammar::T_ON;
} break;
case 3: {