Remove trailing newlines from interpreter messages

Author: smowton

src/goto-programs/interpreter.cpp

@@ -1174,7 +1174,7 @@ void interpretert::list_non_bodied() {
     }
   }
 
-  message->result() << "non bodied varibles " << funcs << messaget::endl << messaget::eom;
+  message->result() << "non bodied varibles " << funcs << messaget::eom;
   std::map<const irep_idt,const irep_idt>::const_iterator it;
 /*for(it=function_input_vars.begin(); it!=function_input_vars.end(); it++)
   {
@@ -1366,7 +1366,7 @@ void interpretert::print_inputs() {
   for(input_varst::iterator it=input_vars.begin();it!=input_vars.end();
       it++) {
     message->result() << it->first << "=" << from_expr(ns, it->first, it->second)
-             << "[" << it->second.type().id() << "]" << messaget::endl << messaget::eom;
+             << "[" << it->second.type().id() << "]" << messaget::eom;
   }
   message->result() << messaget::eom;
 }
@@ -1388,7 +1388,7 @@ void interpretert::print_memory(bool input_flags) {
     message->debug() << cell.identifier << "[" << cell.offset << "]"
             << "=" << cell.value << messaget::eom;
     if(input_flags) message->debug() << "(" << (int)cell.initialised << ")" << messaget::eom;
-    message->debug() << messaget::endl << messaget::eom;
+    message->debug() << messaget::eom;
   }
 }
 
@@ -1467,7 +1467,7 @@ void interpretert::prune_inputs(input_varst &inputs,list_input_varst& function_i
     }
     catch (const char *e)
     {
-      message->error() << e << messaget::endl << messaget::eom;
+      message->error() << e << messaget::eom;
     }
     list_inputs();
     list_inputs(inputs);

src/goto-programs/interpreter_evaluate.cpp

@@ -269,7 +269,7 @@ void interpretert::evaluate(
       irep_idt value=to_constant_expr(expr).get_value();
       const char *str=value.c_str();
       unsigned length=strlen(str)+1;
-      if (show) message->warning() << "string decoding not fully implemented " << length << messaget::endl << messaget::eom;
+      if (show) message->warning() << "string decoding not fully implemented " << length << messaget::eom;
       mp_integer tmp=value.get_no();
       dest.push_back(tmp);
       return;
@@ -318,12 +318,12 @@ void interpretert::evaluate(
     side_effect_exprt side_effect=to_side_effect_expr(expr);
     if(side_effect.get_statement()==ID_nondet)
     {
-      if (show) message->error() << "nondet not implemented" << messaget::endl << messaget::eom;
+      if (show) message->error() << "nondet not implemented" << messaget::eom;
       return;
     }
     else if(side_effect.get_statement()==ID_malloc)
     {
-      if (show) message->error() << "malloc not fully implemented " << expr.type().subtype().pretty() << messaget::endl << messaget::eom;
+      if (show) message->error() << "malloc not fully implemented " << expr.type().subtype().pretty() << messaget::eom;
       std::stringstream buffer;
       num_dynamic_objects++;
       buffer <<"interpreter::malloc_object" << num_dynamic_objects;
@@ -332,7 +332,7 @@ void interpretert::evaluate(
       dest.push_back(address);
       return;
     }
-    if (show) message->error() << "side effect not implemented " << side_effect.get_statement() << messaget::endl << messaget::eom;
+    if (show) message->error() << "side effect not implemented " << side_effect.get_statement() << messaget::eom;
   }
   else if(expr.id()==ID_bitor)
   {
@@ -852,8 +852,8 @@ void interpretert::evaluate(
 //  if (!show) return;
   message->error() << "!! failed to evaluate expression: "
             << from_expr(ns, function->first, expr)
-          << messaget::endl << messaget::eom;
-  message->error() << expr.id() << "[" << expr.type().id() << "]" << messaget::endl << messaget::eom;
+            << messaget::eom;
+  message->error() << expr.id() << "[" << expr.type().id() << "]" << messaget::eom;
 }
 
 /*******************************************************************\