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

Revert "qmljs/parser: update to latest qt5 parser"

Browse Source 
error 'QmlJS::Engine' does not have any field named 'directives to be fixed

This reverts commit 7d76f9040a933981ed44b2b4f0a6edcff034be6a

Change-Id: I24dbe6829ed3920af0f53f2ec31eba82ebdf749f
Reviewed-by: Erik Verbruggen <erik.verbruggen@digia.com>
This commit is contained in:
Fawzi Mohamed
2013-01-23 15:06:08 +01:00
committed by Erik Verbruggen
parent 77c606917b
commit 7b166ccc09
14 changed files with 1017 additions and 1142 deletions
Download Patch File Download Diff File Expand all files Collapse all files

116
src/libs/qmljs/parser/qmljsparser.cpp
View File

@@ -27,7 +27,7 @@
**
****************************************************************************/
#include <QtCore/QtDebug>
#include <QtCore/QDebug>
#include <QtCore/QCoreApplication>
#include <string.h>
@@ -42,16 +42,9 @@
#include "qmljsparser_p.h"
#include <QVarLengthArray>
//
// W A R N I N G
// -------------
//
// This file is automatically generated from qmljs.g.
// Changes should be made to that file, not here. Any change to this file will
// be lost!
//
// To regenerate this file, run:
// qlalr --no-debug --no-lines --qt qmljs.g
// Changes will be lost.
//
using namespace QmlJS;
@@ -1391,7 +1384,7 @@ case 289: {
sym(1).Node = node;
} break;
case 292: {
case 291: {
AST::DoWhileStatement *node = new (pool) AST::DoWhileStatement(sym(2).Statement, sym(5).Expression);
node->doToken = loc(1);
node->whileToken = loc(3);
@@ -1401,7 +1394,7 @@ case 292: {
sym(1).Node = node;
} break;
case 293: {
case 292: {
AST::WhileStatement *node = new (pool) AST::WhileStatement(sym(3).Expression, sym(5).Statement);
node->whileToken = loc(1);
node->lparenToken = loc(2);
@@ -1409,7 +1402,7 @@ case 293: {
sym(1).Node = node;
} break;
case 294: {
case 293: {
AST::ForStatement *node = new (pool) AST::ForStatement(sym(3).Expression,
sym(5).Expression, sym(7).Expression, sym(9).Statement);
node->forToken = loc(1);
@@ -1420,7 +1413,7 @@ case 294: {
sym(1).Node = node;
} break;
case 295: {
case 294: {
AST::LocalForStatement *node = new (pool) AST::LocalForStatement(
sym(4).VariableDeclarationList->finish (/*readOnly=*/false), sym(6).Expression,
sym(8).Expression, sym(10).Statement);
@@ -1433,7 +1426,7 @@ case 295: {
sym(1).Node = node;
} break;
case 296: {
case 295: {
AST:: ForEachStatement *node = new (pool) AST::ForEachStatement(sym(3).Expression,
sym(5).Expression, sym(7).Statement);
node->forToken = loc(1);
@@ -1443,7 +1436,7 @@ case 296: {
sym(1).Node = node;
} break;
case 297: {
case 296: {
AST::LocalForEachStatement *node = new (pool) AST::LocalForEachStatement(
sym(4).VariableDeclaration, sym(6).Expression, sym(8).Statement);
node->forToken = loc(1);
@@ -1454,14 +1447,14 @@ case 297: {
sym(1).Node = node;
} break;
case 299: {
case 298: {
AST::ContinueStatement *node = new (pool) AST::ContinueStatement();
node->continueToken = loc(1);
node->semicolonToken = loc(2);
sym(1).Node = node;
} break;
case 301: {
case 300: {
AST::ContinueStatement *node = new (pool) AST::ContinueStatement(stringRef(2));
node->continueToken = loc(1);
node->identifierToken = loc(2);
@@ -1469,14 +1462,14 @@ case 301: {
sym(1).Node = node;
} break;
case 303: {
case 302: {
AST::BreakStatement *node = new (pool) AST::BreakStatement(QStringRef());
node->breakToken = loc(1);
node->semicolonToken = loc(2);
sym(1).Node = node;
} break;
case 305: {
case 304: {
AST::BreakStatement *node = new (pool) AST::BreakStatement(stringRef(2));
node->breakToken = loc(1);
node->identifierToken = loc(2);
@@ -1484,14 +1477,14 @@ case 305: {
sym(1).Node = node;
} break;
case 307: {
case 306: {
AST::ReturnStatement *node = new (pool) AST::ReturnStatement(sym(2).Expression);
node->returnToken = loc(1);
node->semicolonToken = loc(3);
sym(1).Node = node;
} break;
case 308: {
case 307: {
AST::WithStatement *node = new (pool) AST::WithStatement(sym(3).Expression, sym(5).Statement);
node->withToken = loc(1);
node->lparenToken = loc(2);
@@ -1499,7 +1492,7 @@ case 308: {
sym(1).Node = node;
} break;
case 309: {
case 308: {
AST::SwitchStatement *node = new (pool) AST::SwitchStatement(sym(3).Expression, sym(5).CaseBlock);
node->switchToken = loc(1);
node->lparenToken = loc(2);
@@ -1507,50 +1500,57 @@ case 309: {
sym(1).Node = node;
} break;
case 310: {
case 309: {
AST::CaseBlock *node = new (pool) AST::CaseBlock(sym(2).CaseClauses);
node->lbraceToken = loc(1);
node->rbraceToken = loc(3);
sym(1).Node = node;
} break;
case 311: {
case 310: {
AST::CaseBlock *node = new (pool) AST::CaseBlock(sym(2).CaseClauses, sym(3).DefaultClause, sym(4).CaseClauses);
node->lbraceToken = loc(1);
node->rbraceToken = loc(5);
sym(1).Node = node;
} break;
case 312: {
case 311: {
sym(1).Node = new (pool) AST::CaseClauses(sym(1).CaseClause);
} break;
case 313: {
case 312: {
sym(1).Node = new (pool) AST::CaseClauses(sym(1).CaseClauses, sym(2).CaseClause);
} break;
case 314: {
case 313: {
sym(1).Node = 0;
} break;
case 315: {
case 314: {
sym(1).Node = sym(1).CaseClauses->finish ();
} break;
case 316: {
case 315: {
AST::CaseClause *node = new (pool) AST::CaseClause(sym(2).Expression, sym(4).StatementList);
node->caseToken = loc(1);
node->colonToken = loc(3);
sym(1).Node = node;
} break;
case 317: {
case 316: {
AST::DefaultClause *node = new (pool) AST::DefaultClause(sym(3).StatementList);
node->defaultToken = loc(1);
node->colonToken = loc(2);
sym(1).Node = node;
} break;
case 318:
case 317:
case 318: {
AST::LabelledStatement *node = new (pool) AST::LabelledStatement(stringRef(1), sym(3).Statement);
node->identifierToken = loc(1);
node->colonToken = loc(2);
sym(1).Node = node;
} break;
case 319: {
AST::LabelledStatement *node = new (pool) AST::LabelledStatement(stringRef(1), sym(3).Statement);
node->identifierToken = loc(1);
@@ -1558,39 +1558,32 @@ case 319: {
sym(1).Node = node;
} break;
case 320: {
AST::LabelledStatement *node = new (pool) AST::LabelledStatement(stringRef(1), sym(3).Statement);
node->identifierToken = loc(1);
node->colonToken = loc(2);
sym(1).Node = node;
} break;
case 322: {
case 321: {
AST::ThrowStatement *node = new (pool) AST::ThrowStatement(sym(2).Expression);
node->throwToken = loc(1);
node->semicolonToken = loc(3);
sym(1).Node = node;
} break;
case 323: {
case 322: {
AST::TryStatement *node = new (pool) AST::TryStatement(sym(2).Statement, sym(3).Catch);
node->tryToken = loc(1);
sym(1).Node = node;
} break;
case 324: {
case 323: {
AST::TryStatement *node = new (pool) AST::TryStatement(sym(2).Statement, sym(3).Finally);
node->tryToken = loc(1);
sym(1).Node = node;
} break;
case 325: {
case 324: {
AST::TryStatement *node = new (pool) AST::TryStatement(sym(2).Statement, sym(3).Catch, sym(4).Finally);
node->tryToken = loc(1);
sym(1).Node = node;
} break;
case 326: {
case 325: {
AST::Catch *node = new (pool) AST::Catch(stringRef(3), sym(5).Block);
node->catchToken = loc(1);
node->lparenToken = loc(2);
@@ -1599,20 +1592,20 @@ case 326: {
sym(1).Node = node;
} break;
case 327: {
case 326: {
AST::Finally *node = new (pool) AST::Finally(sym(2).Block);
node->finallyToken = loc(1);
sym(1).Node = node;
} break;
case 329: {
case 328: {
AST::DebuggerStatement *node = new (pool) AST::DebuggerStatement();
node->debuggerToken = loc(1);
node->semicolonToken = loc(2);
sym(1).Node = node;
} break;
case 330: {
case 329: {
AST::FunctionDeclaration *node = new (pool) AST::FunctionDeclaration(stringRef(2), sym(4).FormalParameterList, sym(7).FunctionBody);
node->functionToken = loc(1);
node->identifierToken = loc(2);
@@ -1623,7 +1616,7 @@ case 330: {
sym(1).Node = node;
} break;
case 331: {
case 330: {
AST::FunctionExpression *node = new (pool) AST::FunctionExpression(stringRef(2), sym(4).FormalParameterList, sym(7).FunctionBody);
node->functionToken = loc(1);
if (! stringRef(2).isNull())
@@ -1635,60 +1628,60 @@ case 331: {
sym(1).Node = node;
} break;
case 332: {
case 331: {
AST::FormalParameterList *node = new (pool) AST::FormalParameterList(stringRef(1));
node->identifierToken = loc(1);
sym(1).Node = node;
} break;
case 333: {
case 332: {
AST::FormalParameterList *node = new (pool) AST::FormalParameterList(sym(1).FormalParameterList, stringRef(3));
node->commaToken = loc(2);
node->identifierToken = loc(3);
sym(1).Node = node;
} break;
case 334: {
case 333: {
sym(1).Node = 0;
} break;
case 335: {
case 334: {
sym(1).Node = sym(1).FormalParameterList->finish ();
} break;
case 336: {
case 335: {
sym(1).Node = 0;
} break;
case 338: {
case 337: {
sym(1).Node = new (pool) AST::FunctionBody(sym(1).SourceElements->finish ());
} break;
case 340: {
case 339: {
sym(1).Node = new (pool) AST::Program(sym(1).SourceElements->finish ());
} break;
case 341: {
case 340: {
sym(1).Node = new (pool) AST::SourceElements(sym(1).SourceElement);
} break;
case 342: {
case 341: {
sym(1).Node = new (pool) AST::SourceElements(sym(1).SourceElements, sym(2).SourceElement);
} break;
case 343: {
case 342: {
sym(1).Node = new (pool) AST::StatementSourceElement(sym(1).Statement);
} break;
case 344: {
case 343: {
sym(1).Node = new (pool) AST::FunctionSourceElement(sym(1).FunctionDeclaration);
} break;
case 345: {
case 344: {
stringRef(1) = QStringRef();
} break;
case 347: {
case 346: {
sym(1).Node = 0;
} break;
@@ -1701,8 +1694,7 @@ case 347: {
const int errorState = state_stack[tos];
// automatic insertion of `;'
if (yytoken != -1 && ((t_action(errorState, T_AUTOMATIC_SEMICOLON) && lexer->canInsertAutomaticSemicolon(yytoken))
|| t_action(errorState, T_COMPATIBILITY_SEMICOLON))) {
if (yytoken != -1 && t_action(errorState, T_AUTOMATIC_SEMICOLON) && lexer->canInsertAutomaticSemicolon(yytoken)) {
SavedToken &tk = token_buffer[0];
tk.token = yytoken;
tk.dval = yylval;