X-Git-Url: http://nsz.repo.hu/git/?a=blobdiff_plain;ds=sidebyside;f=walk.c;h=1b887909e7d836d4c86a31e8119066557fe518da;hb=9bf914ca0a1473ee629d30d8a6a65cfbd633712b;hp=e213f2bf4b95785f54a774d0b1028d9d3bd4a9da;hpb=83388b4286651b2d54a20d1ef1ecf3af3ae6487c;p=cparser

diff --git a/walk.c b/walk.c
index e213f2b..1b88790 100644
--- a/walk.c
+++ b/walk.c
@@ -82,8 +82,6 @@ static void walk_type(type_t *const type, const walk_env_t *const env)
 	case TYPE_ENUM:
 		walk_entity((entity_t*)type->enumt.enume, env);
 		return;
-	case TYPE_INVALID:
-		break;
 	}
 	panic("invalid type found");
 }
@@ -98,16 +96,16 @@ static void walk_expression(expression_t *const expr,
 		walk_statement(expr->statement.statement, env);
 		return;
 
-	EXPR_BINARY_CASES
+	case EXPR_BINARY_CASES:
 		walk_expression(expr->binary.left, env);
 		walk_expression(expr->binary.right, env);
 		return;
 
-	EXPR_UNARY_CASES_OPTIONAL
+	case EXPR_UNARY_CASES_OPTIONAL:
 		if (expr->unary.value == NULL)
 			return;
 		/* FALLTHROUGH */
-	EXPR_UNARY_CASES_MANDATORY
+	case EXPR_UNARY_CASES_MANDATORY:
 		walk_expression(expr->unary.value, env);
 		return;
 
@@ -178,16 +176,15 @@ static void walk_expression(expression_t *const expr,
 		walk_designator(expr->offsetofe.designator, env);
 		return;
 
-	EXPR_LITERAL_CASES
+	case EXPR_LITERAL_CASES:
 	case EXPR_REFERENCE:
-	case EXPR_REFERENCE_ENUM_VALUE:
+	case EXPR_ENUM_CONSTANT:
 	case EXPR_STRING_LITERAL:
 	case EXPR_WIDE_STRING_LITERAL:
 	case EXPR_FUNCNAME:
 	case EXPR_LABEL_ADDRESS:
+	case EXPR_ERROR:
 		return;
-	case EXPR_INVALID:
-		break;
 	}
 	panic("invalid expr kind");
 }
@@ -196,7 +193,8 @@ static void walk_designator(const designator_t *designator,
                             const walk_env_t *const env)
 {
 	for ( ; designator != NULL; designator = designator->next) {
-		walk_expression(designator->array_index, env);
+		if (designator->array_index != NULL)
+			walk_expression(designator->array_index, env);
 	}
 }
 
@@ -237,7 +235,8 @@ static void walk_entity(entity_t *entity, const walk_env_t *const env)
 		return;
 	}
 	case ENTITY_ENUM_VALUE:
-		walk_expression(entity->enum_value.value, env);
+		if (entity->enum_value.value != NULL)
+			walk_expression(entity->enum_value.value, env);
 		return;
 	case ENTITY_TYPEDEF:
 		walk_type(entity->typedefe.type, env);
@@ -269,8 +268,6 @@ static void walk_entity(entity_t *entity, const walk_env_t *const env)
 	case ENTITY_LABEL:
 	case ENTITY_LOCAL_LABEL:
 		return;
-	case ENTITY_INVALID:
-		break;
 	}
 	panic("invalid entity found");
 }
@@ -330,6 +327,11 @@ static void walk_statement(statement_t *const stmt, const walk_env_t *const env)
 		return;
 
 	case STATEMENT_CASE_LABEL:
+		if (stmt->case_label.expression) {
+			walk_expression(stmt->case_label.expression, env);
+			if (stmt->case_label.end_range)
+				walk_expression(stmt->case_label.end_range, env);
+		}
 		walk_statement(stmt->case_label.statement, env);
 		return;
 
@@ -362,12 +364,16 @@ static void walk_statement(statement_t *const stmt, const walk_env_t *const env)
 		walk_statement(stmt->ms_try.final_statement, env);
 		return;
 
-	case STATEMENT_INVALID:
+	case STATEMENT_COMPUTED_GOTO:
+		walk_expression(stmt->computed_goto.expression, env);
+		return;
+
+	case STATEMENT_ERROR:
 	case STATEMENT_EMPTY:
 	case STATEMENT_CONTINUE:
 	case STATEMENT_BREAK:
-	case STATEMENT_GOTO:
 	case STATEMENT_ASM:
+	case STATEMENT_GOTO:
 	case STATEMENT_LEAVE:
 		return;
 	}