model: rename check_current_action() local variables
authorBrian Norris <banorris@uci.edu>
Mon, 14 May 2012 19:38:30 +0000 (12:38 -0700)
committerBrian Norris <banorris@uci.edu>
Mon, 14 May 2012 19:40:33 +0000 (12:40 -0700)
This function needs some major rewriting when transitioning from our Tree to a
"Stack". Start by properly naming "next" as "curr".

model.cc

index 142e862c0cbfd898a01d638eb9b4dbec9976bc68..a32fbe61b3bc54405f3ee9f10881520b98e8be7f 100644 (file)
--- 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)