Skip to content

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

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Dec 18, 2018
Merged

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

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion jbmc/regression/jbmc/simplify-classid-of-interface/test_no_simplify_vccs.desc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 \}\)\.@java.lang.Object\.@class_identifier
"java::Impl1" = cast\(\{ \{ "java::Impl1" \}, 0 \}, struct \{ struct \{ string @class_identifier \} @java.lang.Object \}\)\.@java.lang.Object\.@class_identifier
--
^warning: ignoring
--
Expand Down
2 changes: 1 addition & 1 deletion src/util/format_expr.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)
{
Expand Down
2 changes: 1 addition & 1 deletion src/util/format_type.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand Down