From: Brian Norris <banorris@uci.edu>
Date: Mon, 14 May 2012 19:38:30 +0000 (-0700)
Subject: model: rename check_current_action() local variables
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=a660db92e26c99c47bc5c3518cd301b0e729a92d;p=cdsspec-compiler.git

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".
---

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)