diff options
| author | Sir Anthony <[email protected]> | 2014-02-05 21:18:08 +0600 |
|---|---|---|
| committer | Kenneth Graunke <[email protected]> | 2014-03-08 01:29:00 -0800 |
| commit | 6984aa43504bd9b68692872cd711af3931607576 (patch) | |
| tree | 0d0ff056019093f199a2284cdd3dc638184a74a0 | |
| parent | 98fb8c95c0bf73597c7a97be5b992fa96b945c1c (diff) | |
glsl: Update lexers in glsl and glcpp to hande end position of token.
Reviewed-by: Carl Worth <[email protected]>
| -rw-r--r-- | src/glsl/glcpp/glcpp-lex.l | 3 | ||||
| -rw-r--r-- | src/glsl/glsl_lexer.ll | 3 |
2 files changed, 4 insertions, 2 deletions
diff --git a/src/glsl/glcpp/glcpp-lex.l b/src/glsl/glcpp/glcpp-lex.l index ea3b862e41e..6bf7950412f 100644 --- 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 9fd9b80d3e8..760235127b8 100644 --- 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; |