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

diff --git a/walk_statements.c b/walk_statements.c
index 8a4cbc1..4e1d511 100644
--- a/walk_statements.c
+++ b/walk_statements.c
@@ -49,12 +49,6 @@ static void walk_expression(expression_t const *const expr,
 		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;
@@ -81,6 +75,19 @@ 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;
+
 	case EXPR_INVALID:
 	case EXPR_OFFSETOF:
 	case EXPR_REFERENCE:
@@ -91,10 +98,8 @@ static void walk_expression(expression_t const *const expr,
 	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;
 	}
 
@@ -120,7 +125,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;
@@ -130,9 +136,6 @@ static void walk_declarations(const entity_t*            entity,
 		if (initializer != NULL) {
 			walk_initializer(initializer, callback, env);
 		}
-
-		if (entity == last)
-			break;
 	}
 }
 
@@ -208,7 +211,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: