From 4bc66eb9389974ca1dda2595414175e69af418bc Mon Sep 17 00:00:00 2001 From: Roberto Raggi Date: Mon, 5 Dec 2011 14:42:09 +0100 Subject: [PATCH] Adjust the source location of the last accepted token. This is necessary to get automatic semicolons inserted at the correct location. Change-Id: Ie3f806ed20704310cd6155f2dac6d0388a4a9f78 Reviewed-by: Aaron Kennedy --- src/declarative/qml/parser/qdeclarativejs.g | 2 ++ src/declarative/qml/parser/qdeclarativejsparser.cpp | 2 ++ 2 files changed, 4 insertions(+) diff --git a/src/declarative/qml/parser/qdeclarativejs.g b/src/declarative/qml/parser/qdeclarativejs.g index da8ce4c..8a8342b 100644 --- a/src/declarative/qml/parser/qdeclarativejs.g +++ b/src/declarative/qml/parser/qdeclarativejs.g @@ -1112,6 +1112,7 @@ case $rule_number: { } loc(1).length = lexer->tokenLength(); + yylloc = loc(1); // adjust the location of the current token AST::RegExpLiteral *node = new (pool) AST::RegExpLiteral( driver->newStringRef(lexer->regExpPattern()), lexer->regExpFlags()); @@ -1133,6 +1134,7 @@ case $rule_number: { } loc(1).length = lexer->tokenLength(); + yylloc = loc(1); // adjust the location of the current token AST::RegExpLiteral *node = new (pool) AST::RegExpLiteral( driver->newStringRef(lexer->regExpPattern()), lexer->regExpFlags()); diff --git a/src/declarative/qml/parser/qdeclarativejsparser.cpp b/src/declarative/qml/parser/qdeclarativejsparser.cpp index b1384d3..4db8a10 100644 --- a/src/declarative/qml/parser/qdeclarativejsparser.cpp +++ b/src/declarative/qml/parser/qdeclarativejsparser.cpp @@ -577,6 +577,7 @@ case 79: { } loc(1).length = lexer->tokenLength(); + yylloc = loc(1); // adjust the location of the current token AST::RegExpLiteral *node = new (pool) AST::RegExpLiteral( driver->newStringRef(lexer->regExpPattern()), lexer->regExpFlags()); @@ -592,6 +593,7 @@ case 80: { } loc(1).length = lexer->tokenLength(); + yylloc = loc(1); // adjust the location of the current token AST::RegExpLiteral *node = new (pool) AST::RegExpLiteral( driver->newStringRef(lexer->regExpPattern()), lexer->regExpFlags()); -- 2.7.4