- some comments

[cparser] / walk_statements.c

diff --git a/walk_statements.c b/walk_statements.c
index ef3c549..1201dd7 100644 (file)
--- a/walk_statements.c
+++ b/walk_statements.c
@@ -49,17 +49,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;
@@ -96,10 +85,10 @@ 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;
        }
 
@@ -125,7 +114,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 +125,6 @@ static void walk_declarations(const entity_t*            entity,
                if (initializer != NULL) {
                        walk_initializer(initializer, callback, env);
                }
-
-               if (entity == last)
-                       break;
        }
 }