Move flag_resett class to the top to enable use in other methods

No changes in behaviour, just code motion. Upcoming commits will use
this class in `check_rec`.

Author: tautschnig

src/analyses/goto_check_c.cpp

@@ -340,6 +340,82 @@ class goto_check_ct
   named_check_statust match_named_check(const irep_idt &named_check) const;
 };
 
+/// Allows to:
+/// - override a Boolean flag with a new value via `set_flag`
+/// - set a Boolean flag to false via `disable_flag`, such that
+///   previous `set_flag` are overridden and future `set_flag` are ignored.
+///
+/// A flag's initial value (before any `set_flag` or `disable_flag`) is restored
+/// when the entire object goes out of scope.
+class flag_resett
+{
+public:
+  explicit flag_resett(const goto_programt::instructiont &_instruction)
+    : instruction(_instruction)
+  {
+  }
+
+  /// \brief Store the current value of \p flag and
+  /// then set its value to \p new_value.
+  ///
+  /// - calling `set_flag` after `disable_flag` is a no-op
+  /// - calling `set_flag` twice triggers an INVARIANT
+  void set_flag(bool &flag, bool new_value, const irep_idt &flag_name)
+  {
+    // make this a no-op if the flag is disabled
+    if(disabled_flags.find(&flag) != disabled_flags.end())
+      return;
+
+    // detect double sets
+    INVARIANT(
+      flags_to_reset.find(&flag) == flags_to_reset.end(),
+      "Flag " + id2string(flag_name) + " set twice at \n" +
+        instruction.source_location().pretty());
+    if(flag != new_value)
+    {
+      flags_to_reset[&flag] = flag;
+      flag = new_value;
+    }
+  }
+
+  /// Sets the given flag to false, overriding any previous value.
+  ///
+  /// - calling `disable_flag` after `set_flag` overrides the set value
+  /// - calling `disable_flag` twice triggers an INVARIANT
+  void disable_flag(bool &flag, const irep_idt &flag_name)
+  {
+    INVARIANT(
+      disabled_flags.find(&flag) == disabled_flags.end(),
+      "Flag " + id2string(flag_name) + " disabled twice at \n" +
+        instruction.source_location().pretty());
+
+    disabled_flags.insert(&flag);
+
+    // If the flag has not already been set,
+    // we store its current value in the reset map.
+    // Otherwise, the reset map already holds
+    // the initial value we want to reset it to, keep it as is.
+    if(flags_to_reset.find(&flag) == flags_to_reset.end())
+      flags_to_reset[&flag] = flag;
+
+    // set the flag to false in all cases.
+    flag = false;
+  }
+
+  /// \brief Restore the values of all flags that have been
+  /// modified via `set_flag`.
+  ~flag_resett()
+  {
+    for(const auto &flag_pair : flags_to_reset)
+      *flag_pair.first = flag_pair.second;
+  }
+
+private:
+  const goto_programt::instructiont &instruction;
+  std::map<bool *, bool> flags_to_reset;
+  std::set<bool *> disabled_flags;
+};
+
 static exprt implication(exprt lhs, exprt rhs)
 {
   // rewrite a => (b => c) to (a && b) => c
@@ -1930,82 +2006,6 @@ optionalt<exprt> goto_check_ct::rw_ok_check(exprt expr)
     return {};
 }
 
-/// Allows to:
-/// - override a Boolean flag with a new value via `set_flag`
-/// - set a Boolean flag to false via `disable_flag`, such that
-///   previous `set_flag` are overridden and future `set_flag` are ignored.
-///
-/// A flag's initial value (before any `set_flag` or `disable_flag`) is restored
-/// when the entire object goes out of scope.
-class flag_resett
-{
-public:
-  explicit flag_resett(const goto_programt::instructiont &_instruction)
-    : instruction(_instruction)
-  {
-  }
-
-  /// \brief Store the current value of \p flag and
-  /// then set its value to \p new_value.
-  ///
-  /// - calling `set_flag` after `disable_flag` is a no-op
-  /// - calling `set_flag` twice triggers an INVARIANT
-  void set_flag(bool &flag, bool new_value, const irep_idt &flag_name)
-  {
-    // make this a no-op if the flag is disabled
-    if(disabled_flags.find(&flag) != disabled_flags.end())
-      return;
-
-    // detect double sets
-    INVARIANT(
-      flags_to_reset.find(&flag) == flags_to_reset.end(),
-      "Flag " + id2string(flag_name) + " set twice at \n" +
-        instruction.source_location().pretty());
-    if(flag != new_value)
-    {
-      flags_to_reset[&flag] = flag;
-      flag = new_value;
-    }
-  }
-
-  /// Sets the given flag to false, overriding any previous value.
-  ///
-  /// - calling `disable_flag` after `set_flag` overrides the set value
-  /// - calling `disable_flag` twice triggers an INVARIANT
-  void disable_flag(bool &flag, const irep_idt &flag_name)
-  {
-    INVARIANT(
-      disabled_flags.find(&flag) == disabled_flags.end(),
-      "Flag " + id2string(flag_name) + " disabled twice at \n" +
-        instruction.source_location().pretty());
-
-    disabled_flags.insert(&flag);
-
-    // If the flag has not already been set,
-    // we store its current value in the reset map.
-    // Otherwise, the reset map already holds
-    // the initial value we want to reset it to, keep it as is.
-    if(flags_to_reset.find(&flag) == flags_to_reset.end())
-      flags_to_reset[&flag] = flag;
-
-    // set the flag to false in all cases.
-    flag = false;
-  }
-
-  /// \brief Restore the values of all flags that have been
-  /// modified via `set_flag`.
-  ~flag_resett()
-  {
-    for(const auto &flag_pair : flags_to_reset)
-      *flag_pair.first = flag_pair.second;
-  }
-
-private:
-  const goto_programt::instructiont &instruction;
-  std::map<bool *, bool> flags_to_reset;
-  std::set<bool *> disabled_flags;
-};
-
 void goto_check_ct::goto_check(
   const irep_idt &function_identifier,
   goto_functiont &goto_function)