Merge pull request #3594 from tautschnig/format-beautify

format_{expr,type}: Beautify array and pointer output

Author: tautschnig

jbmc/regression/jbmc/simplify-classid-of-interface/test_no_simplify_vccs.desc

@@ -3,7 +3,7 @@ Test.class
 --function Test.main --no-simplify --unwind 10 --show-vcc
 ^EXIT=0$
 ^SIGNAL=0$
-"java::Impl1" = cast\(\{ \{ "java::Impl1"\}, 0\}, struct \{ struct \{ string @class_identifier \} @java.lang.Object \}\)\[email protected]\.@class_identifier
+"java::Impl1" = cast\(\{ \{ "java::Impl1" \}, 0 \}, struct \{ struct \{ string @class_identifier \} @java.lang.Object \}\)\[email protected]\.@class_identifier
 --
 ^warning: ignoring
 --

src/util/format_expr.cpp

@@ -294,7 +294,7 @@ std::ostream &format_rec(std::ostream &os, const exprt &expr)
       os << format(op);
     }
 
-    return os << '}';
+    return os << " }";
   }
   else if(id == ID_if)
   {

src/util/format_type.cpp

@@ -60,7 +60,7 @@ std::ostream &format_rec(std::ostream &os, const typet &type)
   const auto &id = type.id();
 
   if(id == ID_pointer)
-    return os << '*' << format(to_pointer_type(type).subtype());
+    return os << format(to_pointer_type(type).subtype()) << '*';
   else if(id == ID_array)
   {
     const auto &t = to_array_type(type);