From a660db92e26c99c47bc5c3518cd301b0e729a92d Mon Sep 17 00:00:00 2001 From: Brian Norris Date: Mon, 14 May 2012 12:38:30 -0700 Subject: [PATCH] model: rename check_current_action() local variables This function needs some major rewriting when transitioning from our Tree to a "Stack". Start by properly naming "next" as "curr". --- model.cc | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/model.cc b/model.cc index 142e862..a32fbe6 100644 --- a/model.cc +++ b/model.cc @@ -238,18 +238,18 @@ Backtrack * ModelChecker::get_next_backtrack() void ModelChecker::check_current_action(void) { - ModelAction *next = this->current_action; - - if (!next) { + ModelAction *curr = this->current_action; + current_action = NULL; + if (!curr) { DEBUG("trying to push NULL action...\n"); return; } - current_action = NULL; + nextThread = advance_backtracking_state(); - next->set_node(currentNode); - set_backtracking(next); - currentNode = currentNode->explore_child(next); - this->action_trace->push_back(next); + curr->set_node(currentNode); + set_backtracking(curr); + currentNode = currentNode->explore_child(curr); + this->action_trace->push_back(curr); } void ModelChecker::print_summary(void) -- 2.34.1