From 368123ed15555886729567e502705e73e88d757c Mon Sep 17 00:00:00 2001
From: Christoph Mallon <christoph.mallon@gmx.de>
Date: Thu, 1 Jan 2009 20:09:45 +0000
Subject: [PATCH] Move (void) parameter detection into a separate function,
 simplify daisy chaining parameters.

[r25028]
---
 parser.c | 96 ++++++++++++++++++++++++++++++--------------------------
 1 file changed, 52 insertions(+), 44 deletions(-)

diff --git a/parser.c b/parser.c
index 08dceb8..b5a0136 100644
--- a/parser.c
+++ b/parser.c
@@ -4164,6 +4164,24 @@ static void semantic_parameter_incomplete(const entity_t *entity)
 	}
 }
 
+static bool has_parameters(void)
+{
+	/* func(void) is not a parameter */
+	if (token.type == T_IDENTIFIER) {
+		entity_t const *const entity = get_entity(token.v.symbol, NAMESPACE_NORMAL);
+		if (entity->kind != ENTITY_TYPEDEF)
+			return true;
+		if (skip_typeref(entity->typedefe.type) != type_void)
+			return true;
+	} else if (token.type != T_void) {
+		return true;
+	}
+	if (look_ahead(1)->type != ')')
+		return true;
+	next_token();
+	return false;
+}
+
 /**
  * Parses function type parameters (and optionally creates variable_t entities
  * for them in a scope)
@@ -4192,59 +4210,49 @@ static void parse_parameters(function_type_t *type, scope_t *scope)
 		goto parameters_finished;
 	}
 
-	function_parameter_t *last_parameter = NULL;
+	if (has_parameters()) {
+		function_parameter_t **anchor = &type->parameters;
+		for (;;) {
+			switch (token.type) {
+			case T_DOTDOTDOT:
+				next_token();
+				type->variadic = true;
+				goto parameters_finished;
 
-	while (true) {
-		switch (token.type) {
-		case T_DOTDOTDOT:
-			next_token();
-			type->variadic = true;
-			goto parameters_finished;
+			case T_IDENTIFIER:
+			case T___extension__:
+			DECLARATION_START
+			{
+				entity_t *entity = parse_parameter();
+				if (entity->kind == ENTITY_TYPEDEF) {
+					errorf(&entity->base.source_position,
+							"typedef not allowed as function parameter");
+					break;
+				}
+				assert(is_declaration(entity));
 
-		case T_IDENTIFIER:
-		case T___extension__:
-		DECLARATION_START
-		{
-			entity_t *entity = parse_parameter();
-			if (entity->kind == ENTITY_TYPEDEF) {
-				errorf(&entity->base.source_position,
-				       "typedef not allowed as function parameter");
-				break;
-			}
-			assert(is_declaration(entity));
+				semantic_parameter_incomplete(entity);
 
-			/* func(void) is not a parameter */
-			if (last_parameter == NULL
-					&& token.type == ')'
-					&& entity->base.symbol == NULL
-					&& skip_typeref(entity->declaration.type) == type_void) {
-				goto parameters_finished;
-			}
-			semantic_parameter_incomplete(entity);
+				function_parameter_t *const parameter =
+					allocate_parameter(entity->declaration.type);
 
-			function_parameter_t *const parameter =
-				allocate_parameter(entity->declaration.type);
+				if (scope != NULL) {
+					append_entity(scope, entity);
+				}
 
-			if (scope != NULL) {
-				append_entity(scope, entity);
+				*anchor = parameter;
+				anchor  = &parameter->next;
+				break;
 			}
 
-			if (last_parameter != NULL) {
-				last_parameter->next = parameter;
-			} else {
-				type->parameters = parameter;
+			default:
+				goto parameters_finished;
 			}
-			last_parameter   = parameter;
-			break;
-		}
-
-		default:
-			goto parameters_finished;
-		}
-		if (token.type != ',') {
-			goto parameters_finished;
+			if (token.type != ',') {
+				goto parameters_finished;
+			}
+			next_token();
 		}
-		next_token();
 	}
 
 
-- 
2.20.1