X-Git-Url: http://nsz.repo.hu/git/?a=blobdiff_plain;f=walk_statements.c;h=ef3c549755bbb8a67466817dd1c64dd21d8cf773;hb=8c0dc48b954ccceae0ce547f325d98ce453a5ecf;hp=242b6f3b34934edc43048d9c391b8f8be9596ae2;hpb=e97bf80ad2ba7f01d4a2b51d243d6273ae2d65a1;p=cparser

diff --git a/walk_statements.c b/walk_statements.c
index 242b6f3..ef3c549 100644
--- a/walk_statements.c
+++ b/walk_statements.c
@@ -6,92 +6,101 @@
 #include "walk_statements.h"
 
 
-static void walk_expression(expression_t const *const expr, statement_callback const callback, void *const env)
+static void walk_expression(expression_t const *const expr,
+                            statement_callback const callback, void *const env)
 {
 	switch (expr->base.kind) {
-		case EXPR_STATEMENT:
-			walk_statements(expr->statement.statement, callback, env);
-			return;
+	case EXPR_STATEMENT:
+		walk_statements(expr->statement.statement, callback, env);
+		return;
 
-		EXPR_BINARY_CASES
-			walk_expression(expr->binary.left,  callback, env);
-			walk_expression(expr->binary.right, callback, env);
-			return;
+	EXPR_BINARY_CASES
+		walk_expression(expr->binary.left,  callback, env);
+		walk_expression(expr->binary.right, callback, env);
+		return;
 
-		EXPR_UNARY_CASES_OPTIONAL
-			if (expr->unary.value == NULL)
-				return;
-			/* FALLTHROUGH */
-		EXPR_UNARY_CASES_MANDATORY
-			walk_expression(expr->unary.value, callback, env);
+	EXPR_UNARY_CASES_OPTIONAL
+		if (expr->unary.value == NULL)
 			return;
+		/* FALLTHROUGH */
+	EXPR_UNARY_CASES_MANDATORY
+		walk_expression(expr->unary.value, callback, env);
+		return;
 
-		case EXPR_CALL:
-			for (call_argument_t *arg = expr->call.arguments; arg != NULL; arg = arg->next) {
-				walk_expression(arg->expression, callback, env);
-			}
-			return;
+	case EXPR_CALL:
+		for (call_argument_t *arg = expr->call.arguments; arg != NULL;
+		     arg = arg->next) {
+			walk_expression(arg->expression, callback, env);
+		}
+		return;
 
-		case EXPR_UNKNOWN:
-		case EXPR_INVALID:
-			panic("unexpected expr kind");
+	case EXPR_UNKNOWN:
+		panic("unexpected expr kind");
 
-		case EXPR_COMPOUND_LITERAL:
-			/* TODO... */
-			break;
+	case EXPR_COMPOUND_LITERAL:
+		/* TODO... */
+		break;
 
-		case EXPR_CONDITIONAL:
-			walk_expression(expr->conditional.condition,        callback, env);
+	case EXPR_CONDITIONAL:
+		walk_expression(expr->conditional.condition,        callback, env);
+		/* may be NULL because of gnu extension */
+		if (expr->conditional.true_expression != NULL)
 			walk_expression(expr->conditional.true_expression,  callback, env);
-			walk_expression(expr->conditional.false_expression, callback, env);
-			return;
+		walk_expression(expr->conditional.false_expression, callback, env);
+		return;
 
-		case EXPR_BUILTIN_PREFETCH:
-			walk_expression(expr->builtin_prefetch.adr,      callback, env);
-			walk_expression(expr->builtin_prefetch.rw,       callback, env);
-			walk_expression(expr->builtin_prefetch.locality, callback, env);
-			return;
+	case EXPR_BUILTIN_PREFETCH: {
+		builtin_prefetch_expression_t const *const pf = &expr->builtin_prefetch;
+		walk_expression(pf->adr, callback, env);
+		if (pf->rw != NULL) {
+			walk_expression(pf->rw, callback, env);
+			if (pf->locality != NULL)
+				walk_expression(pf->locality, callback, env);
+		}
+		return;
+	}
 
-		case EXPR_BUILTIN_CONSTANT_P:
-			walk_expression(expr->builtin_constant.value, callback, env);
-			return;
+	case EXPR_BUILTIN_CONSTANT_P:
+		walk_expression(expr->builtin_constant.value, callback, env);
+		return;
 
-		case EXPR_SELECT:
-			walk_expression(expr->select.compound, callback, env);
-			return;
+	case EXPR_SELECT:
+		walk_expression(expr->select.compound, callback, env);
+		return;
 
-		case EXPR_ARRAY_ACCESS:
-			walk_expression(expr->array_access.array_ref, callback, env);
-			walk_expression(expr->array_access.index,     callback, env);
-			return;
+	case EXPR_ARRAY_ACCESS:
+		walk_expression(expr->array_access.array_ref, callback, env);
+		walk_expression(expr->array_access.index,     callback, env);
+		return;
 
-		case EXPR_CLASSIFY_TYPE:
-			walk_expression(expr->classify_type.type_expression, callback, env);
-			return;
+	case EXPR_CLASSIFY_TYPE:
+		walk_expression(expr->classify_type.type_expression, callback, env);
+		return;
 
-		case EXPR_SIZEOF:
-		case EXPR_ALIGNOF: {
-			expression_t *tp_expression = expr->typeprop.tp_expression;
-			if (tp_expression != NULL) {
-				walk_expression(tp_expression, callback, env);
-			}
-			return;
+	case EXPR_SIZEOF:
+	case EXPR_ALIGNOF: {
+		expression_t *tp_expression = expr->typeprop.tp_expression;
+		if (tp_expression != NULL) {
+			walk_expression(tp_expression, callback, env);
 		}
+		return;
+	}
 
-		case EXPR_OFFSETOF:
-		case EXPR_REFERENCE:
-		case EXPR_REFERENCE_ENUM_VALUE:
-		case EXPR_CONST:
-		case EXPR_CHARACTER_CONSTANT:
-		case EXPR_WIDE_CHARACTER_CONSTANT:
-		case EXPR_STRING_LITERAL:
-		case EXPR_WIDE_STRING_LITERAL:
-		case EXPR_FUNCNAME:
-		case EXPR_BUILTIN_SYMBOL:
-		case EXPR_VA_START:
-		case EXPR_VA_ARG:
-		case EXPR_LABEL_ADDRESS:
-			break;
+	case EXPR_INVALID:
+	case EXPR_OFFSETOF:
+	case EXPR_REFERENCE:
+	case EXPR_REFERENCE_ENUM_VALUE:
+	case EXPR_CONST:
+	case EXPR_CHARACTER_CONSTANT:
+	case EXPR_WIDE_CHARACTER_CONSTANT:
+	case EXPR_STRING_LITERAL:
+	case EXPR_WIDE_STRING_LITERAL:
+	case EXPR_FUNCNAME:
+	case EXPR_BUILTIN_SYMBOL:
+	case EXPR_VA_START:
+	case EXPR_VA_ARG:
+	case EXPR_LABEL_ADDRESS:
+		break;
 	}
 
 	/* TODO FIXME: implement all the missing expressions here */
@@ -112,11 +121,11 @@ static void walk_initializer(const initializer_t  *initializer,
 }
 
 static void walk_declarations(const entity_t*            entity,
-                              const entity_t*      const end,
+                              const entity_t*      const last,
                               statement_callback   const callback,
                               void                *const env)
 {
-	for (; entity != end; entity = entity->base.next) {
+	for (; entity != NULL; entity = entity->base.next) {
 		/* we only look at variables */
 		if (entity->kind != ENTITY_VARIABLE)
 			continue;
@@ -126,6 +135,9 @@ static void walk_declarations(const entity_t*            entity,
 		if (initializer != NULL) {
 			walk_initializer(initializer, callback, env);
 		}
+
+		if (entity == last)
+			break;
 	}
 }
 
@@ -193,8 +205,7 @@ void walk_statements(statement_t *const stmt, statement_callback const callback,
 
 		case STATEMENT_DECLARATION:
 			walk_declarations(stmt->declaration.declarations_begin,
-			                  stmt->declaration.declarations_end->base.next,
-			                  callback, env);
+					stmt->declaration.declarations_end, callback, env);
 			return;
 
 		case STATEMENT_MS_TRY:
@@ -202,7 +213,6 @@ void walk_statements(statement_t *const stmt, statement_callback const callback,
 			walk_statements(stmt->ms_try.final_statement, callback, env);
 			return;
 
-		case STATEMENT_LOCAL_LABEL:
 		case STATEMENT_INVALID:
 		case STATEMENT_EMPTY:
 		case STATEMENT_CONTINUE: