action: rename 'node' members to 'treenode'

[model-checker.git] / model.cc

diff --git a/model.cc b/model.cc
index 643ad954adcfbeb1bf831aa18fcbe30bec442c99..53411c64199529dcea4e463d1bb058f2ea6898ab 100644 (file)
--- a/model.cc
+++ b/model.cc
@@ -41,15 +41,15 @@ void free_action_list(action_list_t *list)
 ModelChecker::ModelChecker()
 {
        /* First thread created will have id INITIAL_THREAD_ID */
-       this->next_thread_id = INITIAL_THREAD_ID;
+       next_thread_id = INITIAL_THREAD_ID;
        used_sequence_numbers = 0;
        /* Initialize default scheduler */
-       this->scheduler = new Scheduler();
+       scheduler = new Scheduler();
 
        num_executions = 0;
-       this->current_action = NULL;
-       this->exploring = NULL;
-       this->nextThread = THREAD_ID_T_NONE;
+       current_action = NULL;
+       exploring = NULL;
+       nextThread = THREAD_ID_T_NONE;
 
        rootNode = new TreeNode();
        currentNode = rootNode;
@@ -65,7 +65,7 @@ ModelChecker::~ModelChecker()
 
        free_action_list(action_trace);
 
-       delete this->scheduler;
+       delete scheduler;
        delete rootNode;
 }
 
@@ -121,7 +121,7 @@ thread_id_t ModelChecker::get_next_replay_thread()
        next = exploring->get_state();
 
        if (next == exploring->get_diverge()) {
-               TreeNode *node = next->get_node();
+               TreeNode *node = next->get_treenode();
 
                /* Reached divergence point; discard our current 'exploring' */
                DEBUG("*** Discard 'Backtrack' object ***\n");
@@ -203,7 +203,7 @@ void ModelChecker::set_backtracking(ModelAction *act)
        if (prev == NULL)
                return;
 
-       node = prev->get_node();
+       node = prev->get_treenode();
 
        while (t && !node->is_enabled(t))
                t = t->get_parent();