Linter and clang-format ignores, and whitespace cleanup

tautschnig · tautschnig · commit 836af2c3f77d · 2018-10-15T09:14:13.000Z
diff --git a/jbmc/unit/java_bytecode/java_object_factory/gen_nondet_string_init.cpp b/jbmc/unit/java_bytecode/java_object_factory/gen_nondet_string_init.cpp
@@ -77,7 +77,9 @@ SCENARIO(
               std::regex_replace(line, spaces, " "), numbers, ""));
         }
 
-        const std::vector<std::string> reference_code = { // NOLINT
+        // clang-format off
+        // NOLINTNEXTLINE
+        const std::vector<std::string> reference_code = {
           "int tmp_object_factory;",
           "tmp_object_factory = NONDET(int);",
           CPROVER_PREFIX "assume(tmp_object_factory >= 0);",
@@ -98,6 +100,7 @@ SCENARIO(
             "=\"java::java.lang.String\" },"
             " .length=tmp_object_factory, "
             ".data=*string_data_pointer };"};
+        // clang-format on
 
         for(std::size_t i = 0;
             i < code_string.size() && i < reference_code.size();
diff --git a/src/ansi-c/ansi_c_internal_additions.cpp b/src/ansi-c/ansi_c_internal_additions.cpp
@@ -122,6 +122,7 @@ static std::string architecture_string(T value, const char *s)
 
 void ansi_c_internal_additions(std::string &code)
 {
+  // clang-format off
   // do the built-in types and variables
   code+=
     "# 1 \"<built-in-additions>\"\n"
@@ -179,6 +180,7 @@ void ansi_c_internal_additions(std::string &code)
     // by the entry-point construction.
     "void " INITIALIZE_FUNCTION "(void);\n"
     "\n";
+  // clang-format on
 
   // GCC junk stuff, also for CLANG and ARM
   if(
diff --git a/unit/path_strategies.cpp b/unit/path_strategies.cpp
@@ -164,17 +164,20 @@ SCENARIO("path strategies")
       opts.set_option("unwind", 2U);
     };
 
+    // clang-format off
     c =
-      "/*  1 */   int main()                       \n"
-      "/*  2 */   {                                \n"
-      "/*  3 */     int x;                         \n"
-      "/*  4 */     " CPROVER_PREFIX "assume(x == 1);\n"
-      "/*  5 */                                    \n"
-      "/*  6 */     while(x)                       \n"
-      "/*  7 */       --x;                         \n"
-      "/*  8 */                                    \n"
-      "/*  9 */     assert(x);                     \n"
-      "/* 10 */   }                                \n";
+      "/*  1 */   int main()                          \n"
+      "/*  2 */   {                                   \n"
+      "/*  3 */     int x;                            \n"
+      "/*  4 */     " CPROVER_PREFIX
+      "assume(x == 1); \n"
+      "/*  5 */                                       \n"
+      "/*  6 */     while(x)                          \n"
+      "/*  7 */       --x;                            \n"
+      "/*  8 */                                       \n"
+      "/*  9 */     assert(x);                        \n"
+      "/* 10 */   }                                   \n";
+    // clang-format on
 
     check_with_strategy(
       "lifo",
