Skip to content

format(type) additions #2998

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 2 commits into from
Sep 21, 2018
Merged

format(type) additions #2998

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
a23f455
format(type) now prints unions and struct/union/c_enum tags
Sep 19, 2018
e2d9556
format(type) now pretty-prints signedbv, unsignedbv, floatbv, c_bool
Sep 19, 2018
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
36 changes: 36 additions & 0 deletions src/util/format_type.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,26 @@ static std::ostream &format_rec(std::ostream &os, const struct_typet &src)
return os << " }";
}

/// format a \ref union_typet
static std::ostream &format_rec(std::ostream &os, const union_typet &src)
{
os << "union"
<< " {";
bool first = true;

for(const auto &c : src.components())
{
if(first)
first = false;
else
os << ',';

os << ' ' << format(c.type()) << ' ' << c.get_name();
}

return os << " }";
}

// The below generates a string in a generic syntax
// that is inspired by C/C++/Java, and is meant for debugging
// purposes.
Expand All @@ -51,8 +71,24 @@ std::ostream &format_rec(std::ostream &os, const typet &type)
}
else if(id == ID_struct)
return format_rec(os, to_struct_type(type));
else if(id == ID_union)
return format_rec(os, to_union_type(type));
else if(id == ID_union_tag)
return os << "union " << to_union_tag_type(type).get_identifier();
else if(id == ID_struct_tag)
return os << "struct " << to_struct_tag_type(type).get_identifier();
else if(id == ID_c_enum_tag)
return os << "c_enum " << to_c_enum_tag_type(type).get_identifier();
else if(id == ID_symbol_type)
return os << "symbol_type " << to_symbol_type(type).get_identifier();
else if(id == ID_signedbv)
return os << "signedbv[" << to_signedbv_type(type).get_width() << ']';
else if(id == ID_unsignedbv)
return os << "unsignedbv[" << to_unsignedbv_type(type).get_width() << ']';
else if(id == ID_floatbv)
return os << "floatbv[" << to_floatbv_type(type).get_width() << ']';
else if(id == ID_c_bool)
return os << "c_bool[" << to_c_bool_type(type).get_width() << ']';
else
return os << id;
}