format(expr): fix missing space in struct/array literals

kroening · kroening · commit e0b3abdf92ae · 2018-11-08T13:12:39.000Z
diff --git a/src/util/format_expr.cpp b/src/util/format_expr.cpp
@@ -280,7 +280,7 @@ std::ostream &format_rec(std::ostream &os, const exprt &expr)
               << format(to_let_expr(expr).where());
   else if(id == ID_array || id == ID_struct)
   {
-    os << "{ ";
+    os << '{';
 
     bool first = true;
 
@@ -289,12 +289,12 @@ std::ostream &format_rec(std::ostream &os, const exprt &expr)
       if(first)
         first = false;
       else
-        os << ", ";
+        os << ',';
 
-      os << format(op);
+      os << ' ' << format(op);
     }
 
-    return os << '}';
+    return os << " }";
   }
   else if(id == ID_if)
   {

Original file line number	Diff line number	Diff line change
`@@ -280,7 +280,7 @@ std::ostream &format_rec(std::ostream &os, const exprt &expr)`
`280`	`280`	`<< format(to_let_expr(expr).where());`
`281`	`281`	`else if(id == ID_array \|\| id == ID_struct)`
`282`	`282`	`{`
`283`		`- os << "{ ";`
	`283`	`+ os << '{';`
`284`	`284`
`285`	`285`	`bool first = true;`
`286`	`286`
`@@ -289,12 +289,12 @@ std::ostream &format_rec(std::ostream &os, const exprt &expr)`
`289`	`289`	`if(first)`
`290`	`290`	`first = false;`
`291`	`291`	`else`
`292`		`- os << ", ";`
	`292`	`+ os << ',';`
`293`	`293`
`294`		`- os << format(op);`
	`294`	`+ os << ' ' << format(op);`
`295`	`295`	`}`
`296`	`296`
`297`		`- return os << '}';`
	`297`	`+ return os << " }";`
`298`	`298`	`}`
`299`	`299`	`else if(id == ID_if)`
`300`	`300`	`{`