glsl: Update lexers in glsl and glcpp to hande end position of token.

Reviewed-by: Carl Worth <cworth@cworth.org>

diff --git a/src/glsl/glcpp/glcpp-lex.l b/src/glsl/glcpp/glcpp-lex.l
index ea3b862e41ead387f305f6aae754523a69f4aa4e..6bf7950412f7ddf7a85f1aa106c4b6eed46ffe9d 100644 (file)
--- a/src/glsl/glcpp/glcpp-lex.l
+++ b/src/glsl/glcpp/glcpp-lex.l
@@ -47,8 +47,9 @@ void glcpp_set_column (int  column_no , yyscan_t yyscanner);
                if (parser->has_new_source_number)                      \
                        yylloc->source = parser->new_source_number;     \
                yylloc->first_column = yycolumn + 1;                    \
-               yylloc->first_line = yylineno;                          \
+               yylloc->first_line = yylloc->last_line = yylineno;      \
                yycolumn += yyleng;                                     \
+               yylloc->last_column = yycolumn + 1;                     \
                parser->has_new_line_number = 0;                        \
                parser->has_new_source_number = 0;                      \
  } while(0);

diff --git a/src/glsl/glsl_lexer.ll b/src/glsl/glsl_lexer.ll
index 9fd9b80d3e86da0804865075833e2442c354326e..760235127b89c77bc2158e4d0577adcd0d687e55 100644 (file)
--- a/src/glsl/glsl_lexer.ll
+++ b/src/glsl/glsl_lexer.ll
@@ -38,8 +38,9 @@ static int classify_identifier(struct _mesa_glsl_parse_state *, const char *);
    do {                                                                \
       yylloc->source = 0;                                      \
       yylloc->first_column = yycolumn + 1;                     \
-      yylloc->first_line = yylineno + 1;                       \
+      yylloc->first_line = yylloc->last_line = yylineno + 1;   \
       yycolumn += yyleng;                                      \
+      yylloc->last_column = yycolumn + 1;                      \
    } while(0);
 
 #define YY_USER_INIT yylineno = 0; yycolumn = 0;