Merge pull request #1359 from tautschnig/duplicate-warning

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

Author: kroening

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
       }