X-Git-Url: http://nsz.repo.hu/git/?a=blobdiff_plain;f=walk_statements.c;h=4e1d511818ddd6962518560dc36ca6340e372d41;hb=1f415533c733c29d10f379642f8caa2ab995fcc3;hp=385b93ccc290512d8d8a19ef115755ecee18a2f6;hpb=60ba4805ef040a25b218303eec6b666253ecad0b;p=cparser

diff --git a/walk_statements.c b/walk_statements.c
index 385b93c..4e1d511 100644
--- a/walk_statements.c
+++ b/walk_statements.c
@@ -1,108 +1,140 @@
+#include <config.h>
+
 #include "adt/error.h"
 #include "ast_t.h"
+#include "entity_t.h"
 #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;
-
-		EXPR_BINARY_CASES
-			walk_expression(expr->binary.left,  callback, env);
-			walk_expression(expr->binary.right, callback, env);
-			return;
-
-		EXPR_UNARY_CASES
-			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_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_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_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;
-
-		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_CONSTANT_P:
-			walk_expression(expr->builtin_constant.value, 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_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;
+		walk_expression(expr->conditional.false_expression, 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_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_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_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_VA_START:
+		walk_expression(expr->va_starte.ap, callback, env);
+		return;
+
+	case EXPR_VA_ARG:
+		walk_expression(expr->va_arge.ap, callback, env);
+		return;
+
+	case EXPR_VA_COPY:
+		walk_expression(expr->va_copye.src, callback, env);
+		walk_expression(expr->va_copye.dst, callback, env);
+		return;
+
+	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_LABEL_ADDRESS:
+	case EXPR_BUILTIN_TYPES_COMPATIBLE_P:
+		break;
 	}
 
 	/* TODO FIXME: implement all the missing expressions here */
 }
 
+static void walk_initializer(const initializer_t  *initializer,
+                             statement_callback    callback,
+							 void                 *env)
+{
+	switch(initializer->kind) {
+	case INITIALIZER_VALUE:
+		walk_expression(initializer->value.value, callback, env);
+		return;
+	default:
+		/* FIXME: should walk initializer hierarchies... */
+		break;
+	}
+}
 
-static void walk_declarations(const declaration_t *      decl,
-                              const declaration_t *const end,
+static void walk_declarations(const entity_t*            entity,
+                              const entity_t*      const last,
                               statement_callback   const callback,
                               void                *const env)
 {
-	for (; decl != end; decl = decl->next) {
-		if (decl->namespc != NAMESPACE_NORMAL)
+	entity_t const *const end = last != NULL ? last->base.next : NULL;
+	for (; entity != end; entity = entity->base.next) {
+		/* we only look at variables */
+		if (entity->kind != ENTITY_VARIABLE)
 			continue;
 
-		const initializer_t *initializer = decl->init.initializer;
-		/* FIXME: should walk initializer hierarchies... */
-		if (initializer != NULL && initializer->kind == INITIALIZER_VALUE) {
-			walk_expression(initializer->value.value, callback, env);
+		const variable_t    *variable    = &entity->variable;
+		const initializer_t *initializer = variable->initializer;
+		if (initializer != NULL) {
+			walk_initializer(initializer, callback, env);
 		}
 	}
 }
@@ -120,7 +152,7 @@ void walk_statements(statement_t *const stmt, statement_callback const callback,
 			return;
 
 		case STATEMENT_FOR:
-			walk_declarations(stmt->fors.scope.declarations, NULL, callback, env);
+			walk_declarations(stmt->fors.scope.entities, NULL, callback, env);
 			if (stmt->fors.initialisation != NULL)
 				walk_expression(stmt->fors.initialisation, callback, env);
 			if (stmt->fors.condition != NULL)
@@ -171,8 +203,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->next,
-			                  callback, env);
+					stmt->declaration.declarations_end, callback, env);
 			return;
 
 		case STATEMENT_MS_TRY: