X-Git-Url: http://nsz.repo.hu/git/?a=blobdiff_plain;f=walk_statements.c;h=883a889eb9e7456ddd2f6ddb18b0df4342295db3;hb=e8b6008fb191413535961886b0ea73413d0f24d6;hp=ef3c549755bbb8a67466817dd1c64dd21d8cf773;hpb=ed1ed2b5fb813fd8de24b2eaa6fffce033246a8c;p=cparser

diff --git a/walk_statements.c b/walk_statements.c
index ef3c549..883a889 100644
--- a/walk_statements.c
+++ b/walk_statements.c
@@ -1,3 +1,22 @@
+/*
+ * This file is part of cparser.
+ * Copyright (C) 2007-2009 Matthias Braun <matze@braunis.de>
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+ * 02111-1307, USA.
+ */
 #include <config.h>
 
 #include "adt/error.h"
@@ -49,17 +68,6 @@ static void walk_expression(expression_t const *const expr,
 		walk_expression(expr->conditional.false_expression, 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;
@@ -86,20 +94,29 @@ static void walk_expression(expression_t const *const expr,
 		return;
 	}
 
+	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;
+
+	EXPR_LITERAL_CASES
 	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:
+	case EXPR_BUILTIN_TYPES_COMPATIBLE_P:
 		break;
 	}
 
@@ -125,7 +142,8 @@ static void walk_declarations(const entity_t*            entity,
                               statement_callback   const callback,
                               void                *const env)
 {
-	for (; entity != NULL; entity = entity->base.next) {
+	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;
@@ -135,9 +153,6 @@ static void walk_declarations(const entity_t*            entity,
 		if (initializer != NULL) {
 			walk_initializer(initializer, callback, env);
 		}
-
-		if (entity == last)
-			break;
 	}
 }