diff options
| author | John Hodge <tpg@mutabah.net> | 2015-03-21 14:21:00 +0800 |
|---|---|---|
| committer | John Hodge <tpg@mutabah.net> | 2015-03-21 14:21:00 +0800 |
| commit | 6411b7c7d220ae9af5e54d0fdae66e4e44faf01f (patch) | |
| tree | 8fd92fd6424f179036e2e710745fe74d1dbe83a6 /src/types.cpp | |
| parent | df6c0cf38a0b6f5f7aee8486ea45f7e7cffa6b57 (diff) | |
| download | mrust-6411b7c7d220ae9af5e54d0fdae66e4e44faf01f.tar.gz | |
Fix minor lexing and dump issues
Diffstat (limited to 'src/types.cpp')
| -rw-r--r-- | src/types.cpp | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/src/types.cpp b/src/types.cpp index b1f4735e..abf6b2da 100644 --- a/src/types.cpp +++ b/src/types.cpp @@ -393,7 +393,10 @@ bool TypeRef::operator==(const TypeRef& x) const os << "*" << (tr.m_is_inner_mutable ? "mut" : "const") << " " << tr.m_inner_types[0]; break; case TypeRef::ARRAY: - os << "[" << tr.m_inner_types[0] << "; " << tr.m_size_expr << "]"; + os << "[" << tr.m_inner_types[0]; + if( tr.m_size_expr.get() ) + os << "; " << *tr.m_size_expr; + os << "]"; break; case TypeRef::GENERIC: os << "/* arg */ " << tr.m_path[0].name(); @@ -499,6 +502,9 @@ SERIALISE_TYPE(TypeRef::, "TypeRef", { void PrettyPrintType::print(::std::ostream& os) const { + #if 1 + os << m_type; + #else switch(m_type.m_class) { case TypeRef::ANY: @@ -546,7 +552,7 @@ void PrettyPrintType::print(::std::ostream& os) const os << "<" << m_type.m_inner_types[0].print_pretty() << " as " << m_type.m_inner_types[1].print_pretty() << ">::" << m_type.m_path[0].name(); break; } - + #endif } ::std::ostream& operator<<(::std::ostream& os, const PrettyPrintType& v) |