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

GLSL: Fix recovery token order to avoid infinite loop.

Browse Source 
The case 'a = b ? ;' recovered with T_NUMBER, T_COMMA, T_NUMBER, ...

Task-number: QTCREATORBUG-7517
Change-Id: I3546266b21d11ce08e4af1331be94a78d3b24c19
Reviewed-by: Roberto Raggi <roberto.raggi@nokia.com>
This commit is contained in:
Christian Kamm
2012-08-06 11:29:55 +02:00
parent f6fe3c76bf
commit e91045469d
3 changed files with 322 additions and 322 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/libs/glsl/glsl.g
View File

@@ -456,7 +456,7 @@ private:
#include <iostream> #include <iostream>
#include <cstdio> #include <cstdio>
#include <cassert> #include <cassert>
#include <QtCore/QDebug> #include <QDebug>
using namespace GLSL; using namespace GLSL;
@@ -591,7 +591,7 @@ AST *Parser::parse(int startToken)
static int tks[] = { static int tks[] = {
T_RIGHT_BRACE, T_RIGHT_PAREN, T_RIGHT_BRACKET, T_RIGHT_BRACE, T_RIGHT_PAREN, T_RIGHT_BRACKET,
T_SEMICOLON, T_COMMA, T_COLON, T_SEMICOLON, T_COLON, T_COMMA,
T_NUMBER, T_TYPE_NAME, T_IDENTIFIER, T_NUMBER, T_TYPE_NAME, T_IDENTIFIER,
T_LEFT_BRACE, T_LEFT_PAREN, T_LEFT_BRACKET, T_LEFT_BRACE, T_LEFT_PAREN, T_LEFT_BRACKET,
T_WHILE, T_WHILE,

638
src/libs/glsl/glslparser.cpp
View File

File diff suppressed because it is too large Load Diff

2
src/libs/glsl/glslparser.h
View File

@@ -1,5 +1,5 @@
#line 217 "./glsl.g" #line 215 "./glsl.g"
/************************************************************************** /**************************************************************************
** **