OpenHarmony/third_party_mesa3d
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

glcpp: Add line locations to "Unterminated #if" error message.

Browse Source
This commit is contained in:
Kenneth Graunke
2010-06-17 12:41:46 -07:00
parent 8a132aa08b
commit 0774523d18
2 changed files with 10 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
glcpp/glcpp-parse.y
View File

@@ -123,7 +123,8 @@ _glcpp_parser_print_expanded_token_list (glcpp_parser_t *parser,
token_list_t *list); token_list_t *list);
static void static void
_glcpp_parser_skip_stack_push_if (glcpp_parser_t *parser, int condition); _glcpp_parser_skip_stack_push_if (glcpp_parser_t *parser, YYLTYPE *loc,
int condition);
static void static void
_glcpp_parser_skip_stack_change_if (glcpp_parser_t *parser, YYLTYPE *loc, _glcpp_parser_skip_stack_change_if (glcpp_parser_t *parser, YYLTYPE *loc,
@@ -190,7 +191,7 @@ line:
expanded_line: expanded_line:
IF_EXPANDED expression NEWLINE { IF_EXPANDED expression NEWLINE {
_glcpp_parser_skip_stack_push_if (parser, $2); _glcpp_parser_skip_stack_push_if (parser, & @1, $2);
} }
| ELIF_EXPANDED expression NEWLINE { | ELIF_EXPANDED expression NEWLINE {
_glcpp_parser_skip_stack_change_if (parser, & @1, "elif", $2); _glcpp_parser_skip_stack_change_if (parser, & @1, "elif", $2);
@@ -234,12 +235,12 @@ control_line:
| HASH_IFDEF IDENTIFIER NEWLINE { | HASH_IFDEF IDENTIFIER NEWLINE {
macro_t *macro = hash_table_find (parser->defines, $2); macro_t *macro = hash_table_find (parser->defines, $2);
talloc_free ($2); talloc_free ($2);
_glcpp_parser_skip_stack_push_if (parser, macro != NULL); _glcpp_parser_skip_stack_push_if (parser, & @1, macro != NULL);
} }
| HASH_IFNDEF IDENTIFIER NEWLINE { | HASH_IFNDEF IDENTIFIER NEWLINE {
macro_t *macro = hash_table_find (parser->defines, $2); macro_t *macro = hash_table_find (parser->defines, $2);
talloc_free ($2); talloc_free ($2);
_glcpp_parser_skip_stack_push_if (parser, macro == NULL); _glcpp_parser_skip_stack_push_if (parser, & @1, macro == NULL);
} }
| HASH_ELIF pp_tokens NEWLINE { | HASH_ELIF pp_tokens NEWLINE {
token_list_t *expanded; token_list_t *expanded;
@@ -923,7 +924,7 @@ void
glcpp_parser_destroy (glcpp_parser_t *parser) glcpp_parser_destroy (glcpp_parser_t *parser)
{ {
if (parser->skip_stack) if (parser->skip_stack)
glcpp_print (parser->errors, "Error: Unterminated #if\n"); glcpp_error (&parser->skip_stack->loc, parser, "Unterminated #if\n");
glcpp_lex_destroy (parser->scanner); glcpp_lex_destroy (parser->scanner);
hash_table_dtor (parser->defines); hash_table_dtor (parser->defines);
talloc_free (parser); talloc_free (parser);
@@ -1579,7 +1580,8 @@ glcpp_parser_lex_from (glcpp_parser_t *parser, token_list_t *list)
} }
static void static void
_glcpp_parser_skip_stack_push_if (glcpp_parser_t *parser, int condition) _glcpp_parser_skip_stack_push_if (glcpp_parser_t *parser, YYLTYPE *loc,
int condition)
{ {
skip_type_t current = SKIP_NO_SKIP; skip_type_t current = SKIP_NO_SKIP;
skip_node_t *node; skip_node_t *node;
@@ -1588,6 +1590,7 @@ _glcpp_parser_skip_stack_push_if (glcpp_parser_t *parser, int condition)
current = parser->skip_stack->type; current = parser->skip_stack->type;
node = xtalloc (parser, skip_node_t); node = xtalloc (parser, skip_node_t);
node->loc = *loc;
if (current == SKIP_NO_SKIP) { if (current == SKIP_NO_SKIP) {
if (condition) if (condition)

1
glcpp/glcpp.h
View File

@@ -131,6 +131,7 @@ typedef enum skip_type {
typedef struct skip_node { typedef struct skip_node {
skip_type_t type; skip_type_t type;
YYLTYPE loc; /* location of the initial #if/#elif/... */
struct skip_node *next; struct skip_node *next;
} skip_node_t; } skip_node_t;