clang-format and cpplint fixes

Author: Remi Delmas

regression/cbmc/pragma_cprover_enable_disable_multiple/main.c

@@ -7,10 +7,12 @@ int main()
 
 #pragma CPROVER check push
 #pragma CPROVER check enable "pointer-overflow"
-#pragma CPROVER check enable "pointer-overflow" // should not print an error message
+// should not print an error message
+#pragma CPROVER check enable "pointer-overflow"
 #pragma CPROVER check push
 #pragma CPROVER check disable "pointer-primitive"
-#pragma CPROVER check enable "pointer-primitive" // should print an error message
+// PARSE_ERROR
+#pragma CPROVER check enable "pointer-primitive"
 #pragma CPROVER check pop
 #pragma CPROVER check pop
   return 0;

src/analyses/goto_check.cpp

@@ -25,8 +25,8 @@ Author: Daniel Kroening, [email protected]
 #include <util/ieee_float.h>
 #include <util/invariant.h>
 #include <util/make_unique.h>
-#include <util/options.h>
 #include <util/message.h>
+#include <util/options.h>
 #include <util/pointer_expr.h>
 #include <util/pointer_offset_size.h>
 #include <util/pointer_predicates.h>
@@ -1856,7 +1856,7 @@ optionalt<exprt> goto_checkt::rw_ok_check(exprt expr)
 class flag_resett
 {
 public:
-  /// \brief Store the current value of \p flag and 
+  /// \brief Store the current value of \p flag and
   /// then set its value to \p new_value.
   /// \returns true if the flag was already seen before
   bool set_flag(bool &flag, bool new_value)
@@ -1877,7 +1877,7 @@ class flag_resett
     return seen_flags.find(&flag) != seen_flags.end();
   }
 
-  /// \brief Restore the values of all flags that have been 
+  /// \brief Restore the values of all flags that have been
   /// modified via `set_flag`.
   ~flag_resett()
   {

src/ansi-c/ansi_c_parser.h

@@ -123,7 +123,9 @@ class ansi_c_parsert : public parsert
 
   void copy_item(const ansi_c_declarationt &declaration)
   {
-    assert(declaration.id() == ID_declaration);
+    INVARIANT(
+      declaration.id() == ID_declaration,
+      "Expected `ID_declaration`, got `" + declaration.id() + "`");
     parse_tree.items.push_back(declaration);
   }