From ebc3a168d8977e9613c5abac4d0798aaddae2086 Mon Sep 17 00:00:00 2001 From: Dan Carpenter Date: Tue, 7 Apr 2009 22:45:44 +0300 Subject: [PATCH] rename known_condition_true() to implied_condition_true() Signed-off-by: Dan Carpenter --- smatch.h | 4 ++-- smatch_conditions.c | 4 ++-- smatch_extra.c | 10 +++++----- smatch_flow.c | 6 +++--- 4 files changed, 12 insertions(+), 12 deletions(-) diff --git a/smatch.h b/smatch.h index 03abf173..73d878c4 100644 --- a/smatch.h +++ b/smatch.h @@ -177,8 +177,8 @@ void get_implications(char *name, struct symbol *sym, int comparison, int num, #define SMATCH_EXTRA 1 /* this is my_id from smatch extra set in smatch.c */ int expr_to_val(struct expression *expr); int true_comparison(int left, int comparison, int right); -int known_condition_true(struct expression *expr); -int known_condition_false(struct expression *expr); +int implied_condition_true(struct expression *expr); +int implied_condition_false(struct expression *expr); /* smatch_states.c */ extern int debug_states; diff --git a/smatch_conditions.c b/smatch_conditions.c index f8d9be12..ade9bc81 100644 --- a/smatch_conditions.c +++ b/smatch_conditions.c @@ -205,7 +205,7 @@ static void handle_select(struct expression *expr) __save_false_states_for_later(); - if (known_condition_true(expr->cond_true)) { + if (implied_condition_true(expr->cond_true)) { __split_expr(expr->cond_true); } else { __push_cond_stacks(); @@ -213,7 +213,7 @@ static void handle_select(struct expression *expr) __and_cond_states(); } - if (known_condition_false(expr->cond_false)) { + if (implied_condition_false(expr->cond_false)) { __split_expr(expr->cond_false); __pop_pre_cond_states(); return; diff --git a/smatch_extra.c b/smatch_extra.c index 4471d21d..57a64fa5 100644 --- a/smatch_extra.c +++ b/smatch_extra.c @@ -389,7 +389,7 @@ exit: return ret; } -int known_condition_true(struct expression *expr) +int implied_condition_true(struct expression *expr) { struct statement *stmt; int tmp; @@ -409,7 +409,7 @@ int known_condition_true(struct expression *expr) break; case EXPR_PREOP: if (expr->op == '!') { - if (known_condition_false(expr->unop)) + if (implied_condition_false(expr->unop)) return 1; break; } @@ -425,7 +425,7 @@ int known_condition_true(struct expression *expr) return 0; } -int known_condition_false(struct expression *expr) +int implied_condition_false(struct expression *expr) { struct statement *stmt; struct expression *tmp; @@ -442,7 +442,7 @@ int known_condition_false(struct expression *expr) return 1; case EXPR_PREOP: if (expr->op == '!') { - if (known_condition_true(expr->unop)) + if (implied_condition_true(expr->unop)) return 1; break; } @@ -451,7 +451,7 @@ int known_condition_false(struct expression *expr) return 1; tmp = strip_expr(expr); if (tmp != expr) - return known_condition_false(tmp); + return implied_condition_false(tmp); break; default: if (variable_non_zero(expr) == 0) diff --git a/smatch_flow.c b/smatch_flow.c index 85b460da..cc971de5 100644 --- a/smatch_flow.c +++ b/smatch_flow.c @@ -153,7 +153,7 @@ static void handle_pre_loop(struct statement *stmt) __split_statements(stmt->iterator_pre_statement); - once_through = known_condition_true(stmt->iterator_pre_condition); + once_through = implied_condition_true(stmt->iterator_pre_condition); if (option_assume_loops) once_through = 1; @@ -278,13 +278,13 @@ void __split_statements(struct statement *stmt) return; } if (option_known_conditions && - known_condition_true(stmt->if_conditional)) { + implied_condition_true(stmt->if_conditional)) { smatch_msg("info: this condition is true."); __split_statements(stmt->if_true); return; } if (option_known_conditions && - known_condition_false(stmt->if_conditional)) { + implied_condition_false(stmt->if_conditional)) { smatch_msg("info: this condition is false."); __split_statements(stmt->if_false); return; -- 2.11.4.GIT