Merge pull request #1359 from tautschnig/duplicate-warning

Avoid duplicate "warning:" or "error:" output

regression/ansi-c/linking_conflicts1/test.desc

@@ -3,7 +3,7 @@ main.c
 other.c
 ^EXIT=(64|1)$
 ^SIGNAL=0$
-error: conflicting function declarations 'bar'
-error: conflicting function declarations 'bar2'
+^\S+\.c(:\d+:\d+|\(\d+\)): error: conflicting function declarations 'bar'$
+^\S+\.c(:\d+:\d+|\(\d+\)): error: conflicting function declarations 'bar2'$
 --
 ^warning: ignoring

regression/ansi-c/linking_conflicts2/test.desc

@@ -3,6 +3,6 @@ main.c
 other.c
 ^EXIT=(64|1)$
 ^SIGNAL=0$
-error: conflicting function declarations 'foo'
+^\S+\.c(:\d+:\d+|\(\d+\)): error: conflicting function declarations 'foo'$
 --
 ^warning: ignoring

regression/cbmc/incomplete-structs/test.desc

@@ -1,8 +1,8 @@
 CORE
 typesmain.c
 types1.c types2.c types3.c
-warning: pointer parameter types differ between declaration and definition "bar"
-warning: pointer parameter types differ between declaration and definition "foo"
+^file \S+\.c line \d+: pointer parameter types differ between declaration and definition 'bar'$
+^file \S+\.c line \d+: pointer parameter types differ between declaration and definition 'foo'$
 ^VERIFICATION SUCCESSFUL$
 ^EXIT=0$
 ^SIGNAL=0$

src/ansi-c/c_typecheck_base.cpp

@@ -375,7 +375,7 @@ void c_typecheck_baset::typecheck_redefinition_non_type(
     if(final_old.id()!=ID_code)
     {
       error().source_location=new_symbol.location;
-      error() << "error: function symbol '" << new_symbol.display_name()
+      error() << "function symbol '" << new_symbol.display_name()
               << "' redefined with a different type:\n"
               << "Original: " << to_string(old_symbol.type) << "\n"
               << "     New: " << to_string(new_symbol.type) << eom;
@@ -679,9 +679,8 @@ void c_typecheck_baset::apply_asm_label(
       if(asm_label_map[orig_name]!=asm_label)
       {
         error().source_location=symbol.location;
-        error() << "error: replacing asm renaming "
-                << asm_label_map[orig_name] << " by "
-                << asm_label << eom;
+        error() << "replacing asm renaming " << asm_label_map[orig_name]
+                << " by " << asm_label << eom;
         throw 0;
       }
     }

src/ansi-c/c_typecheck_code.cpp

@@ -629,14 +629,6 @@ void c_typecheck_baset::typecheck_ifthenelse(code_ifthenelset &code)
 
   typecheck_expr(cond);
 
-  #if 0
-  if(cond.id()==ID_sideeffect &&
-     cond.get(ID_statement)==ID_assign)
-  {
-    warning("warning: assignment in if condition");
-  }
-  #endif
-
   implicit_typecast_bool(cond);
 
   if(code.then_case().get_statement() == ID_decl_block)

src/ansi-c/c_typecheck_expr.cpp

@@ -1883,7 +1883,7 @@ void c_typecheck_baset::typecheck_expr_side_effect(side_effect_exprt &expr)
     if(type0.get_bool(ID_C_constant))
     {
       error().source_location = op0.source_location();
-      error() << "error: '" << to_string(op0) << "' is constant" << eom;
+      error() << "'" << to_string(op0) << "' is constant" << eom;
       throw 0;
     }
 

src/ansi-c/c_typecheck_typecast.cpp

@@ -34,7 +34,7 @@ void c_typecheck_baset::implicit_typecast(
   for(const auto &tc_warning : c_typecast.warnings)
   {
     warning().source_location=expr.find_source_location();
-    warning() << "warning: conversion from '" << to_string(src_type) << "' to '"
+    warning() << "conversion from '" << to_string(src_type) << "' to '"
               << to_string(dest_type) << "': " << tc_warning << eom;
   }
 }

src/cpp/cpp_declarator_converter.cpp

@@ -176,8 +176,7 @@ symbolt &cpp_declarator_convertert::convert(
       if(symbol_expr.id() != ID_type)
       {
         cpp_typecheck.error().source_location=name.source_location();
-        cpp_typecheck.error() << "error: expected type"
-                              << messaget::eom;
+        cpp_typecheck.error() << "expected type" << messaget::eom;
         throw 0;
       }
 

src/cpp/cpp_typecheck_bases.cpp

@@ -132,7 +132,7 @@ void cpp_typecheckt::add_base_components(
   if(bases.find(from_name)!=bases.end())
   {
     error().source_location=to.source_location();
-    error() << "error: non-virtual base class " << from_name
+    error() << "non-virtual base class " << from_name
             << " inherited multiple times" << eom;
     throw 0;
   }

src/cpp/cpp_typecheck_code.cpp

@@ -278,10 +278,10 @@ void cpp_typecheckt::typecheck_member_initializer(codet &code)
       if(access == ID_private || access == ID_noaccess)
       {
         #if 0
-        error().source_location=code.source_location());
-        str << "error: constructor of '"
-            << to_string(symbol_expr)
-            << "' is not accessible";
+        error().source_location=code.find_source_location();
+        error() << "constructor of '"
+                << to_string(symbol_expr)
+                << "' is not accessible" << eom;
         throw 0;
         #endif
       }

src/cpp/cpp_typecheck_compound_type.cpp

@@ -211,8 +211,7 @@ void cpp_typecheckt::typecheck_compound_type(
       else
       {
         error().source_location=type.source_location();
-        error() << "error: compound tag '" << base_name
-                << "' declared previously\n"
+        error() << "compound tag '" << base_name << "' declared previously\n"
                 << "location of previous definition: " << symbol.location
                 << eom;
         throw 0;
@@ -1522,9 +1521,8 @@ bool cpp_typecheckt::get_component(
         else
         {
           error().source_location=source_location;
-          error() << "error: member '" << component_name
-                  << "' is not accessible (" << component.get(ID_access) << ")"
-                  << eom;
+          error() << "member '" << component_name << "' is not accessible ("
+                  << component.get(ID_access) << ")" << eom;
           throw 0;
         }
       }
@@ -1566,8 +1564,8 @@ bool cpp_typecheckt::get_component(
           if(check_component_access(component, final_type))
           {
             error().source_location=source_location;
-            error() << "error: member '" << component_name
-                    << "' is not accessible" << eom;
+            error() << "member '" << component_name << "' is not accessible"
+                    << eom;
             throw 0;
           }
 

src/cpp/cpp_typecheck_enum_type.cpp

@@ -133,8 +133,7 @@ void cpp_typecheckt::typecheck_enum_type(typet &type)
     if(has_body)
     {
       error().source_location=type.source_location();
-      error() << "error: enum symbol '" << base_name
-              << "' declared previously\n"
+      error() << "enum symbol '" << base_name << "' declared previously\n"
               << "location of previous definition: " << symbol.location << eom;
       throw 0;
     }

src/cpp/cpp_typecheck_expr.cpp

@@ -145,7 +145,7 @@ void cpp_typecheckt::typecheck_expr_trinary(if_exprt &expr)
       if(!standard_conversion_lvalue_to_rvalue(e1, expr.op1()))
       {
         error().source_location=e1.find_source_location();
-        error() << "error: lvalue to rvalue conversion" << eom;
+        error() << "lvalue to rvalue conversion" << eom;
         throw 0;
       }
     }
@@ -156,7 +156,7 @@ void cpp_typecheckt::typecheck_expr_trinary(if_exprt &expr)
       if(!standard_conversion_array_to_pointer(e1, expr.op1()))
       {
         error().source_location=e1.find_source_location();
-        error() << "error: array to pointer conversion" << eom;
+        error() << "array to pointer conversion" << eom;
         throw 0;
       }
     }
@@ -167,7 +167,7 @@ void cpp_typecheckt::typecheck_expr_trinary(if_exprt &expr)
       if(!standard_conversion_function_to_pointer(e1, expr.op1()))
       {
         error().source_location=e1.find_source_location();
-        error() << "error: function to pointer conversion" << eom;
+        error() << "function to pointer conversion" << eom;
         throw 0;
       }
     }
@@ -178,7 +178,7 @@ void cpp_typecheckt::typecheck_expr_trinary(if_exprt &expr)
       if(!standard_conversion_lvalue_to_rvalue(e2, expr.op2()))
       {
         error().source_location=e2.find_source_location();
-        error() << "error: lvalue to rvalue conversion" << eom;
+        error() << "lvalue to rvalue conversion" << eom;
         throw 0;
       }
     }
@@ -189,7 +189,7 @@ void cpp_typecheckt::typecheck_expr_trinary(if_exprt &expr)
       if(!standard_conversion_array_to_pointer(e2, expr.op2()))
       {
         error().source_location=e2.find_source_location();
-        error() << "error: array to pointer conversion" << eom;
+        error() << "array to pointer conversion" << eom;
         throw 0;
       }
     }
@@ -200,7 +200,7 @@ void cpp_typecheckt::typecheck_expr_trinary(if_exprt &expr)
       if(!standard_conversion_function_to_pointer(e2, expr.op2()))
       {
         error().source_location=expr.find_source_location();
-        error() << "error: function to pointer conversion" << eom;
+        error() << "function to pointer conversion" << eom;
         throw 0;
       }
     }
@@ -217,7 +217,7 @@ void cpp_typecheckt::typecheck_expr_trinary(if_exprt &expr)
     else
     {
       error().source_location=expr.find_source_location();
-      error() << "error: bad types for operands" << eom;
+      error() << "bad types for operands" << eom;
       throw 0;
     }
     return;
@@ -272,7 +272,7 @@ void cpp_typecheckt::typecheck_expr_trinary(if_exprt &expr)
     else
     {
       error().source_location=expr.find_source_location();
-      error() << "error: types are incompatible.\n"
+      error() << "types are incompatible.\n"
               << "I got '" << type2cpp(expr.op1().type(), *this) << "' and '"
               << type2cpp(expr.op2().type(), *this) << "'." << eom;
       throw 0;
@@ -706,7 +706,7 @@ void cpp_typecheckt::typecheck_expr_address_of(exprt &expr)
       if(code_type.get_bool(ID_C_is_virtual))
       {
         error().source_location=expr.source_location();
-        error() << "error: pointers to virtual methods"
+        error() << "pointers to virtual methods"
                 << " are currently not implemented" << eom;
         throw 0;
       }
@@ -1068,7 +1068,7 @@ void cpp_typecheckt::typecheck_expr_member(
   if(expr.operands().size()!=1)
   {
     error().source_location=expr.find_source_location();
-    error() << "error: member operator expects one operand" << eom;
+    error() << "member operator expects one operand" << eom;
     throw 0;
   }
 
@@ -1097,7 +1097,7 @@ void cpp_typecheckt::typecheck_expr_member(
   if(op0.type().id() != ID_struct_tag && op0.type().id() != ID_union_tag)
   {
     error().source_location=expr.find_source_location();
-    error() << "error: member operator requires struct/union type "
+    error() << "member operator requires struct/union type "
             << "on left hand side but got '" << to_string(op0.type()) << "'"
             << eom;
     throw 0;
@@ -1113,7 +1113,7 @@ void cpp_typecheckt::typecheck_expr_member(
   if(type.is_incomplete())
   {
     error().source_location = expr.find_source_location();
-    error() << "error: member operator got incomplete type "
+    error() << "member operator got incomplete type "
             << "on left hand side" << eom;
     throw 0;
   }
@@ -1161,7 +1161,7 @@ void cpp_typecheckt::typecheck_expr_member(
         to_code_type(symbol_expr.type()).return_type().id() == ID_constructor)
       {
         error().source_location=expr.find_source_location();
-        error() << "error: member '"
+        error() << "member '"
                 << lookup(symbol_expr.get(ID_identifier)).base_name
                 << "' is a constructor" << eom;
         throw 0;
@@ -1175,7 +1175,7 @@ void cpp_typecheckt::typecheck_expr_member(
         if(pcomp.is_nil())
         {
           error().source_location=expr.find_source_location();
-          error() << "error: '" << symbol_expr.get(ID_identifier)
+          error() << "'" << symbol_expr.get(ID_identifier)
                   << "' is not static member "
                   << "of class '" << to_string(op0.type()) << "'" << eom;
           throw 0;
@@ -1217,8 +1217,8 @@ void cpp_typecheckt::typecheck_expr_member(
   else
   {
     error().source_location=expr.find_source_location();
-    error() << "error: member '" << component_name << "' of '"
-            << to_string(type) << "' not found" << eom;
+    error() << "member '" << component_name << "' of '" << to_string(type)
+            << "' not found" << eom;
     throw 0;
   }
 
@@ -1243,7 +1243,7 @@ void cpp_typecheckt::typecheck_expr_ptrmember(
   if(expr.operands().size()!=1)
   {
     error().source_location=expr.find_source_location();
-    error() << "error: ptrmember operator expects one operand" << eom;
+    error() << "ptrmember operator expects one operand" << eom;
     throw 0;
   }
 
@@ -1254,7 +1254,7 @@ void cpp_typecheckt::typecheck_expr_ptrmember(
   if(op.type().id() != ID_pointer)
   {
     error().source_location=expr.find_source_location();
-    error() << "error: ptrmember operator requires pointer type "
+    error() << "ptrmember operator requires pointer type "
             << "on left hand side, but got '" << to_string(op.type()) << "'"
             << eom;
     throw 0;

src/cpp/cpp_typecheck_resolve.cpp

@@ -1675,9 +1675,8 @@ exprt cpp_typecheck_resolvet::resolve(
       return nil_exprt();
 
     cpp_typecheck.error().source_location=result.source_location());
-    cpp_typecheck.str
-      << "error: member '" << result.get(ID_component_name)
-      << "' is not accessible";
+    cpp_typecheck.error() << "member '" << result.get(ID_component_name)
+                          << "' is not accessible" << messaget::eom;
     throw 0;
     #endif
   }
@@ -1693,7 +1692,7 @@ exprt cpp_typecheck_resolvet::resolve(
       cpp_typecheck.error().source_location=source_location;
 
       cpp_typecheck.error()
-        << "error: expected expression, but got type '"
+        << "expected expression, but got type '"
         << cpp_typecheck.to_string(result.type()) << "'" << messaget::eom;
 
       throw 0;
@@ -1709,7 +1708,7 @@ exprt cpp_typecheck_resolvet::resolve(
       cpp_typecheck.error().source_location=source_location;
 
       cpp_typecheck.error()
-        << "error: expected type, but got expression '"
+        << "expected type, but got expression '"
         << cpp_typecheck.to_string(result) << "'" << messaget::eom;
 
       throw 0;

src/cpp/cpp_typecheck_type.cpp

@@ -61,7 +61,7 @@ void cpp_typecheckt::typecheck_type(typet &type)
     if(symbol_expr.id()!=ID_type)
     {
       error().source_location=type.source_location();
-      error() << "error: expected type" << eom;
+      error() << "expected type" << eom;
       throw 0;
     }
 

src/goto-cc/armcc_mode.cpp

@@ -45,8 +45,11 @@ int armcc_modet::doit()
     has_prefix(base_name, "goto-link");
   #endif
 
+  const auto default_verbosity =
+    cmdline.isset("diag_warning=") ? messaget::M_WARNING : messaget::M_ERROR;
   const auto verbosity = messaget::eval_verbosity(
-    cmdline.get_value("verbosity"), messaget::M_ERROR, message_handler);
+    cmdline.get_value("verbosity"), default_verbosity, message_handler);
+  message_handler.print_warnings_as_errors(cmdline.isset("diag_error="));
 
   messaget log{message_handler};
   log.debug() << "ARM mode" << messaget::eom;

src/goto-cc/as_mode.cpp

@@ -110,6 +110,7 @@ int as_modet::doit()
     messaget::M_WARNING : messaget::M_ERROR;
   messaget::eval_verbosity(
     cmdline.get_value("verbosity"), default_verbosity, message_handler);
+  message_handler.print_warnings_as_errors(cmdline.isset("fatal-warnings"));
 
   if(act_as_as86)
   {

src/goto-cc/cl_message_handler.cpp

@@ -25,6 +25,9 @@ void cl_message_handlert::print(
 
   std::ostringstream formatted_message;
 
+  if(level == messaget::M_WARNING && warnings_are_errors)
+    formatted_message << "error: warning treated as error\n";
+
   const irep_idt file = location.get_file();
   const std::string &line = id2string(location.get_line());
   formatted_message << file << '(' << line << "): ";