action: refactor, move VALUE_TRY{SUCCESS,FAILED} out of header

[model-checker.git] / action.cc

diff --git a/action.cc b/action.cc
index 34bc09f0be567c3ff4b30e084e52d911b12fd8cc..08cacd89227f880c1bb391a83f799283c5de4e03 100644 (file)
--- a/action.cc
+++ b/action.cc
@@ -11,6 +11,12 @@
 
 #define ACTION_INITIAL_CLOCK 0
 
+/** A special value to represent a successful trylock */
+#define VALUE_TRYSUCCESS 1
+
+/** A special value to represent a failed trylock */
+#define VALUE_TRYFAILED 0
+
 /**
  * @brief Construct a new ModelAction
  *
@@ -380,11 +386,9 @@ void ModelAction::create_cv(const ModelAction *parent)
                cv = new ClockVector(NULL, this);
 }
 
-void ModelAction::set_try_lock(bool obtainedlock) {
-       if (obtainedlock)
-               value = VALUE_TRYSUCCESS;
-       else
-               value = VALUE_TRYFAILED;
+void ModelAction::set_try_lock(bool obtainedlock)
+{
+       value = obtainedlock ? VALUE_TRYSUCCESS : VALUE_TRYFAILED;
 }
 
 /**
@@ -608,7 +612,7 @@ void ModelAction::print() const
                        if (idx >= 0)
                                model_print("  Rf: P%-2d", idx);
                        else
-                               model_print("  RF: P? ");
+                               model_print("  Rf: P? ");
                } else
                        model_print("  Rf: ?  ");
        }