Commit e9104546 authored by Christian Kamm's avatar Christian Kamm
Browse files

GLSL: Fix recovery token order to avoid infinite loop.



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

Task-number: QTCREATORBUG-7517
Change-Id: I3546266b21d11ce08e4af1331be94a78d3b24c19
Reviewed-by: default avatarRoberto Raggi <roberto.raggi@nokia.com>
parent f6fe3c76
......@@ -456,7 +456,7 @@ private:
#include <iostream>
#include <cstdio>
#include <cassert>
#include <QtCore/QDebug>
#include <QDebug>
using namespace GLSL;
......@@ -591,7 +591,7 @@ AST *Parser::parse(int startToken)
static int tks[] = {
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_LEFT_BRACE, T_LEFT_PAREN, T_LEFT_BRACKET,
T_WHILE,
......
This diff is collapsed.
#line 217 "./glsl.g"
#line 215 "./glsl.g"
/**************************************************************************
**
......
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