X-Git-Url: http://nsz.repo.hu/git/?a=blobdiff_plain;ds=sidebyside;f=parser.c;h=dcd6cdc2c7f7b98da799a1ca3c997988bfa1534d;hb=d2c97d08e22cfca07b4ac98ae8d4a9c5cb3b9261;hp=3937d620264fc70e89943579e5216f380311356b;hpb=5b4524819e61d8997f161e59cddc867264066e8d;p=cparser

diff --git a/parser.c b/parser.c
index 3937d62..dcd6cdc 100644
--- a/parser.c
+++ b/parser.c
@@ -100,34 +100,34 @@ typedef struct parse_initializer_env_t {
 typedef entity_t* (*parsed_declaration_func) (entity_t *declaration, bool is_definition);
 
 /** The current token. */
-static token_t             token;
+static token_t              token;
 /** The lookahead ring-buffer. */
-static token_t             lookahead_buffer[MAX_LOOKAHEAD];
+static token_t              lookahead_buffer[MAX_LOOKAHEAD];
 /** Position of the next token in the lookahead buffer. */
-static int                 lookahead_bufpos;
-static stack_entry_t      *environment_stack = NULL;
-static stack_entry_t      *label_stack       = NULL;
-static scope_t            *file_scope        = NULL;
-static scope_t            *current_scope     = NULL;
+static int                  lookahead_bufpos;
+static stack_entry_t       *environment_stack = NULL;
+static stack_entry_t       *label_stack       = NULL;
+static scope_t             *file_scope        = NULL;
+static scope_t             *current_scope     = NULL;
 /** Point to the current function declaration if inside a function. */
-static function_t         *current_function  = NULL;
-static entity_t           *current_init_decl = NULL;
-static switch_statement_t *current_switch    = NULL;
-static statement_t        *current_loop      = NULL;
-static statement_t        *current_parent    = NULL;
-static ms_try_statement_t *current_try       = NULL;
-static linkage_kind_t      current_linkage   = LINKAGE_INVALID;
-static goto_statement_t   *goto_first        = NULL;
-static goto_statement_t   *goto_last         = NULL;
-static label_statement_t  *label_first       = NULL;
-static label_statement_t  *label_last        = NULL;
+static function_t          *current_function  = NULL;
+static entity_t            *current_init_decl = NULL;
+static switch_statement_t  *current_switch    = NULL;
+static statement_t         *current_loop      = NULL;
+static statement_t         *current_parent    = NULL;
+static ms_try_statement_t  *current_try       = NULL;
+static linkage_kind_t       current_linkage   = LINKAGE_INVALID;
+static goto_statement_t    *goto_first        = NULL;
+static goto_statement_t   **goto_anchor       = NULL;
+static label_statement_t   *label_first       = NULL;
+static label_statement_t  **label_anchor      = NULL;
 /** current translation unit. */
-static translation_unit_t *unit              = NULL;
+static translation_unit_t  *unit              = NULL;
 /** true if we are in a type property context (evaluation only for type. */
-static bool                in_type_prop      = false;
+static bool                 in_type_prop      = false;
 /** true in we are in a __extension__ context. */
-static bool                in_gcc_extension  = false;
-static struct obstack      temp_obst;
+static bool                 in_gcc_extension  = false;
+static struct obstack       temp_obst;
 
 
 #define PUSH_PARENT(stmt)                          \
@@ -5272,8 +5272,6 @@ static void check_labels(void)
 			       "label '%Y' used but not defined", label->base.symbol);
 		 }
 	}
-	goto_first = NULL;
-	goto_last  = NULL;
 
 	if (warning.unused_label) {
 		for (const label_statement_t *label_statement = label_first;
@@ -5288,7 +5286,6 @@ static void check_labels(void)
 			}
 		}
 	}
-	label_first = label_last = NULL;
 }
 
 static void warn_unused_decl(entity_t *entity, entity_t *end,
@@ -5969,7 +5966,12 @@ static void parse_external_declaration(void)
 		current_function                 = function;
 		current_parent                   = NULL;
 
-		statement_t *const body     = parse_compound_statement(false);
+		goto_first   = NULL;
+		goto_anchor  = &goto_first;
+		label_first  = NULL;
+		label_anchor = &label_first;
+
+		statement_t *const body = parse_compound_statement(false);
 		function->statement = body;
 		first_err = true;
 		check_labels();
@@ -6312,10 +6314,10 @@ static expression_t *parse_character_constant(void)
 	cnst->conste.v.character = token.v.string;
 
 	if (cnst->conste.v.character.size != 1) {
-		if (warning.multichar && GNU_MODE) {
+		if (!GNU_MODE) {
+			errorf(HERE, "more than 1 character in character constant");
+		} else if (warning.multichar) {
 			warningf(HERE, "multi-character character constant");
-		} else {
-			errorf(HERE, "more than 1 characters in character constant");
 		}
 	}
 	next_token();
@@ -6333,10 +6335,10 @@ static expression_t *parse_wide_character_constant(void)
 	cnst->conste.v.wide_character = token.v.wide_string;
 
 	if (cnst->conste.v.wide_character.size != 1) {
-		if (warning.multichar && GNU_MODE) {
+		if (!GNU_MODE) {
+			errorf(HERE, "more than 1 character in character constant");
+		} else if (warning.multichar) {
 			warningf(HERE, "multi-character character constant");
-		} else {
-			errorf(HERE, "more than 1 characters in character constant");
 		}
 	}
 	next_token();
@@ -9131,8 +9133,8 @@ static void init_expression_parsers(void)
  */
 static asm_argument_t *parse_asm_arguments(bool is_out)
 {
-	asm_argument_t *result = NULL;
-	asm_argument_t *last   = NULL;
+	asm_argument_t  *result = NULL;
+	asm_argument_t **anchor = &result;
 
 	while (token.type == T_STRING_LITERAL || token.type == '[') {
 		asm_argument_t *argument = allocate_ast_zero(sizeof(argument[0]));
@@ -9215,12 +9217,8 @@ static asm_argument_t *parse_asm_arguments(bool is_out)
 
 		set_address_taken(expression, true);
 
-		if (last != NULL) {
-			last->next = argument;
-		} else {
-			result = argument;
-		}
-		last = argument;
+		*anchor = argument;
+		anchor  = &argument->next;
 
 		if (token.type != ',')
 			break;
@@ -9512,12 +9510,8 @@ static statement_t *parse_label_statement(void)
 	}
 
 	/* remember the labels in a list for later checking */
-	if (label_last == NULL) {
-		label_first = &statement->label;
-	} else {
-		label_last->next = &statement->label;
-	}
-	label_last = &statement->label;
+	*label_anchor = &statement->label;
+	label_anchor  = &statement->label.next;
 
 	POP_PARENT;
 	return statement;
@@ -9816,8 +9810,8 @@ static statement_t *parse_goto(void)
 		expression_t *expression = parse_expression();
 		mark_vars_read(expression, NULL);
 
-		/* Argh: although documentation say the expression must be of type void *,
-		 * gcc excepts anything that can be casted into void * without error */
+		/* Argh: although documentation says the expression must be of type void*,
+		 * gcc accepts anything that can be casted into void* without error */
 		type_t *type = expression->base.type;
 
 		if (type != type_error_type) {
@@ -9848,12 +9842,8 @@ static statement_t *parse_goto(void)
 	}
 
 	/* remember the goto's in a list for later checking */
-	if (goto_last == NULL) {
-		goto_first = &statement->gotos;
-	} else {
-		goto_last->next = &statement->gotos;
-	}
-	goto_last = &statement->gotos;
+	*goto_anchor = &statement->gotos;
+	goto_anchor  = &statement->gotos.next;
 
 	expect(';');