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

QmlJS: Merge new parser from Qt 5.

Browse Source 
Change-Id: I986df52b7ddb31e3bae1148eda881acc1829b102
Reviewed-by: Roberto Raggi <roberto.raggi@nokia.com>
This commit is contained in:
Christian Kamm
2011-12-07 11:16:26 +01:00
parent 72c06cb6fd
commit 67dd062a31
19 changed files with 1469 additions and 1416 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -97,13 +97,18 @@ Lexer::Lexer(Engine *engine)
, _restrictedKeyword(false)
, _terminator(false)
, _followsClosingBrace(false)
, _delimited(false)
, _delimited(true)
, _qmlMode(true)
{
if (engine)
engine->setLexer(this);
}
bool Lexer::qmlMode() const
{
return _qmlMode;
}
QString Lexer::code() const
{
return _code;
@@ -147,7 +152,7 @@ void Lexer::setCode(const QString &code, int lineno, bool qmlMode)
_restrictedKeyword = false;
_terminator = false;
_followsClosingBrace = false;
_delimited = false;
_delimited = true;
}
void Lexer::scanChar()
@@ -176,6 +181,7 @@ int Lexer::lex()
switch (_tokenKind) {
case T_LBRACE:
case T_SEMICOLON:
case T_COLON:
_delimited = true;
break;