Separating space shall not be output between every tokens to make the
dump clear and easy to read.
gcc/rust/ChangeLog:
* ast/rust-ast-dump.cc (Dump::require_spacing): Add a function
to determine wether a space shall output.
* ast/rust-ast-dump.h: Add function prototype as well as
condition.
Signed-off-by: Pierre-Emmanuel Patry <pierre-emmanuel.patry@embecosm.com>
Dump::Dump (std::ostream &stream) : stream (stream), indentation (Indent ()) {}
+bool
+Dump::require_spacing (TokenPtr previous, TokenPtr current)
+{
+ switch (current->get_id ())
+ {
+ case EXCLAM:
+ case DOT_DOT:
+ case DOT_DOT_EQ:
+ case SCOPE_RESOLUTION:
+ case LEFT_PAREN:
+ case LEFT_ANGLE:
+ case LEFT_SQUARE:
+ case RIGHT_SQUARE:
+ case RIGHT_PAREN:
+ case DOLLAR_SIGN:
+ case SEMICOLON:
+ return false;
+ default:
+ break;
+ }
+
+ switch (previous->get_id ())
+ {
+ case SCOPE_RESOLUTION:
+ case LEFT_SQUARE:
+ case LEFT_PAREN:
+ return false;
+ default:
+ return true;
+ }
+}
+
void
Dump::debug (Visitable &v)
{
TokenCollector collector (container);
collector.visit (v);
- for (auto &token : collector.collect_tokens ())
+ auto tokens = collector.collect_tokens ();
+ if (!tokens.empty ())
+ stream << tokens.front ()->as_string ();
+ for (auto it = tokens.cbegin () + 1; it < tokens.cend (); it++)
{
- stream << token->as_string () << " ";
+ if (require_spacing (*(it - 1), *it))
+ stream << " ";
+ stream << (*it)->as_string ();
}
}
private:
std::ostream &stream;
Indent indentation;
+
+ static bool require_spacing (TokenPtr previous, TokenPtr current);
};
} // namespace AST