fixup whitespace

[c11tester.git] / nodestack.cc

diff --git a/nodestack.cc b/nodestack.cc
index 4a6a26d5e2e7078ee74ab0636f7353d86f29f4e0..bdccf3817a06615cc1d67216e8d0ed9480d4160e 100644 (file)
--- a/nodestack.cc
+++ b/nodestack.cc
@@ -57,17 +57,34 @@ void Node::print_may_read_from()
                (*it)->print();
 }
 
+/** This method sets a promise to explore meeting with the given
+ *  node.
+ *  @param i is the promise index.
+ */
+
 void Node::set_promise(uint32_t i) {
        if (i>=promises.size())
                promises.resize(i+1,0);
        promises[i]=1;
 }
 
+/** This method looks up whether a given promise should be satisfied
+ *  by this node.
+ *
+ * @param i is the promise index.
+ * @return true if the promise should be satisfied by the given model action.
+ */
+
 bool Node::get_promise(uint32_t i) {
-       return (promises[i]==2);
+       return (i<promises.size())&&(promises[i]==2);
 }
 
-bool Node::increment_promises() {
+/** This method increments to the next combination of promises.
+ *
+ * @return true if we have a valid combination.
+ */
+
+bool Node::increment_promise() {
        for (unsigned int i=0;i<promises.size();i++) {
                if (promises[i]==1) {
                        promises[i]=2;
@@ -82,7 +99,12 @@ bool Node::increment_promises() {
        return false;
 }
 
-bool Node::promises_empty() {
+/** This method returns whether the promise set is empty.
+ *
+ *  @return true if we have explored all promise combinations.
+ */
+
+bool Node::promise_empty() {
        for (unsigned int i=0;i<promises.size();i++)
                if (promises[i]==1)
                        return false;
@@ -103,12 +125,12 @@ bool Node::add_future_value(uint64_t value) {
        return true;
 }
 
-/** 
+/**
  * Checks whether the future_values set for this node is empty.
  * @return true if the future_values set is empty.
  */
 
-bool Node::futurevalues_empty() {
+bool Node::future_value_empty() {
        return ((future_index+1)>=future_values.size());
 }
 
@@ -140,7 +162,7 @@ bool Node::backtrack_empty()
  * Checks whether the readsfrom set for this node is empty.
  * @return true if the readsfrom set is empty.
  */
-bool Node::readsfrom_empty() {
+bool Node::read_from_empty() {
        return ((read_from_index+1)>=may_read_from.size());
 }
 
@@ -240,7 +262,7 @@ bool Node::increment_read_from() {
  * @return Returns false if we have explored all values.
  */
 
-bool Node::increment_future_values() {
+bool Node::increment_future_value() {
        future_index++;
        return (future_index<future_values.size());
 }