From: Brian Norris Date: Thu, 2 Aug 2012 19:55:04 +0000 (-0700) Subject: blank lines, spacing, etc. X-Git-Url: http://plrg.eecs.uci.edu/git/?p=c11tester.git;a=commitdiff_plain;h=0174d94668ca990b0d8258b1ed5b2611874cffe9;hp=35dd2c2087e76909e28e2754ad361bec5dff8f2a blank lines, spacing, etc. --- diff --git a/model.cc b/model.cc index 4844c566..8f8bd88b 100644 --- a/model.cc +++ b/model.cc @@ -353,7 +353,8 @@ void ModelChecker::check_current_action(void) Node *currnode = curr->get_node(); Node *parnode = currnode->get_parent(); - if (!parnode->backtrack_empty()||!currnode->read_from_empty()||!currnode->future_value_empty()||!currnode->promise_empty()) + if (!parnode->backtrack_empty() || !currnode->read_from_empty() || + !currnode->future_value_empty() || !currnode->promise_empty()) if (!next_backtrack || *curr > *next_backtrack) next_backtrack = curr; diff --git a/nodestack.cc b/nodestack.cc index a88166f0..02f5a89e 100644 --- a/nodestack.cc +++ b/nodestack.cc @@ -127,7 +127,6 @@ bool Node::future_value_empty() { return ((future_index+1)>=future_values.size()); } - /** * Checks if the Thread associated with this thread ID has been explored from * this Node already. @@ -150,7 +149,6 @@ bool Node::backtrack_empty() return (numBacktracks == 0); } - /** * Checks whether the readsfrom set for this node is empty. * @return true if the readsfrom set is empty. @@ -159,8 +157,6 @@ bool Node::read_from_empty() { return ((read_from_index+1)>=may_read_from.size()); } - - /** * Mark the appropriate backtracking information for exploring a thread choice. * @param act The ModelAction to explore @@ -221,7 +217,6 @@ void Node::add_read_from(const ModelAction *act) * where this->action is a 'read'. * @return The first element in future_values */ - uint64_t Node::get_future_value() { ASSERT(future_index