Print token string into the syntax error message.

Bison calls yyerror("syntax error") when it cannot match any grammar rule. We used to append current token string to the error message, which got broken in r2202. This patch restores the original behavior. BUG=442 R=kbr@chromium.org Review URL: https://codereview.appspot.com/12876043

Print token string into the syntax error message.
0b67bfbf · Alok Priyadarshi · Jamie Madill · 8156b6be · 0b67bfbf · 0b67bfbf
Commit 0b67bfbf authored Sep 23, 2013 by Alok Priyadarshi Committed by Jamie Madill Sep 24, 2013
Showing with 12 additions and 12 deletions

glslang.l src/compiler/glslang.l +5 -0

glslang.y src/compiler/glslang.y +1 -6

glslang_lex.cpp src/compiler/glslang_lex.cpp +5 -0

glslang_tab.cpp src/compiler/glslang_tab.cpp +1 -6

No files found.
--- a/src/compiler/glslang.l
+++ b/src/compiler/glslang.l
@@ -487,6 +487,11 @@ int floatsuffix_check(TParseContext* context)
    return(FLOATCONSTANT);
 }

+void yyerror(YYLTYPE* lloc, TParseContext* context, const char* reason) {
+    context->error(*lloc, reason, yyget_text(context->scanner));
+    context->recover();
+}
+
 int glslang_initialize(TParseContext* context) {
    yyscan_t scanner = NULL;
    if (yylex_init_extra(context, &scanner))

--- a/src/compiler/glslang.y
+++ b/src/compiler/glslang.y
@@ -86,7 +86,7 @@ WHICH GENERATES THE GLSL ES PARSER (glslang_tab.cpp AND glslang_tab.h).
 }

 %{
-extern int yylex(YYSTYPE* yylval_param, YYLTYPE* yylloc, void* yyscanner);
+extern int yylex(YYSTYPE* yylval, YYLTYPE* yylloc, void* yyscanner);
 extern void yyerror(YYLTYPE* yylloc, TParseContext* context, const char* reason);

 #define YYLLOC_DEFAULT(Current, Rhs, N)                      \
@@ -1922,11 +1922,6 @@ function_definition

 %%

-void yyerror(YYLTYPE* yylloc, TParseContext* context, const char* reason) {
-    context->error(*yylloc, reason, "");
-    context->recover();
-}
-
 int glslang_parse(TParseContext* context) {
    return yyparse(context);
 }
--- a/src/compiler/glslang_lex.cpp
+++ b/src/compiler/glslang_lex.cpp
@@ -3289,6 +3289,11 @@ int floatsuffix_check(TParseContext* context)
    return(FLOATCONSTANT);
 }

+void yyerror(YYLTYPE* lloc, TParseContext* context, const char* reason) {
+    context->error(*lloc, reason, yyget_text(context->scanner));
+    context->recover();
+}
+
 int glslang_initialize(TParseContext* context) {
    yyscan_t scanner = NULL;
    if (yylex_init_extra(context,&scanner))

--- a/src/compiler/glslang_tab.cpp
+++ b/src/compiler/glslang_tab.cpp
@@ -342,7 +342,7 @@ int yyparse ();
 /* Copy the second part of user declarations.  */


-extern int yylex(YYSTYPE* yylval_param, YYLTYPE* yylloc, void* yyscanner);
+extern int yylex(YYSTYPE* yylval, YYLTYPE* yylloc, void* yyscanner);
 extern void yyerror(YYLTYPE* yylloc, TParseContext* context, const char* reason);

 #define YYLLOC_DEFAULT(Current, Rhs, N)                      \
@@ -5234,11 +5234,6 @@ yyreturn:



-void yyerror(YYLTYPE* yylloc, TParseContext* context, const char* reason) {
-    context->error(*yylloc, reason, "");
-    context->recover();
-}
-
 int glslang_parse(TParseContext* context) {
    return yyparse(context);
 }