gccrs: dump: Dump macro rules definition

gcc/rust/ChangeLog:

	* ast/rust-ast-dump.cc (Dump::visit): Add missing visitors for macro definition dumping.
	(get_delimiters): New function.
	* ast/rust-ast-dump.h: Declare `get_delimiters` and add documentation.
	* ast/rust-macro.h: Add `get_token_tree` method.
This commit is contained in:
Arthur Cohen
2022-09-27 16:24:59 +02:00
parent e535b7b3e3
commit ec28fdb6aa
3 changed files with 133 additions and 14 deletions

View File

@@ -175,11 +175,27 @@ Dump::format_struct_field (StructField &field)
void
Dump::visit (Token &tok)
{}
{
stream << tok.as_string ();
}
void
Dump::visit (DelimTokenTree &delim_tok_tree)
{}
{
auto tokens = delim_tok_tree.to_token_stream ();
indentation.increment ();
stream << '\n' << indentation;
for (const auto &tok : tokens)
{
stream << ' ';
tok->accept_vis (*this);
}
indentation.decrement ();
stream << '\n' << indentation;
}
void
Dump::visit (AttrInputMetaItemContainer &input)
@@ -1308,22 +1324,116 @@ Dump::visit (ExternBlock &block)
stream << "\n" << indentation << "}\n";
}
// rust-macro.h
void
Dump::visit (MacroMatchFragment &match)
{}
static std::pair<char, char>
get_delimiters (DelimType delim)
{
auto start_delim = '\0';
auto end_delim = '\0';
switch (delim)
{
case PARENS:
start_delim = '(';
end_delim = ')';
break;
case SQUARE:
start_delim = '[';
end_delim = ']';
break;
case CURLY:
start_delim = '{';
end_delim = '}';
break;
}
return {start_delim, end_delim};
}
void
Dump::visit (MacroMatchRepetition &match)
{}
Dump::visit (MacroMatchFragment &match)
{
stream << '$' << match.get_ident () << ':'
<< match.get_frag_spec ().as_string ();
}
void
Dump::visit (MacroMatchRepetition &repetition)
{
stream << "$(";
for (auto &match : repetition.get_matches ())
{
match->accept_vis (*this);
stream << ' ';
}
auto op_char = '\0';
switch (repetition.get_op ())
{
case MacroMatchRepetition::ANY:
op_char = '*';
break;
case MacroMatchRepetition::ONE_OR_MORE:
op_char = '+';
break;
case MacroMatchRepetition::ZERO_OR_ONE:
op_char = '?';
break;
case MacroMatchRepetition::NONE:
break;
}
stream << ')';
if (repetition.has_sep ())
stream << repetition.get_sep ()->as_string ();
stream << op_char;
}
void
Dump::visit (MacroMatcher &matcher)
{}
{
auto delimiters = get_delimiters (matcher.get_delim_type ());
stream << delimiters.first;
for (auto &match : matcher.get_matches ())
{
match->accept_vis (*this);
stream << ' ';
}
stream << delimiters.second;
}
void
Dump::visit (MacroRulesDefinition &rules_def)
{}
{
for (auto &outer_attr : rules_def.get_outer_attrs ())
emit_attrib (outer_attr);
stream << "macro_rules! " << rules_def.get_rule_name () << " {\n";
indentation.increment ();
for (auto &rule : rules_def.get_rules ())
{
stream << indentation;
rule.get_matcher ().accept_vis (*this);
stream << " => ";
rule.get_transcriber ().get_token_tree ().accept_vis (*this);
stream << ";\n";
}
indentation.decrement ();
stream << "}\n";
}
void
Dump::visit (MacroInvocation &macro_invoc)

View File

@@ -72,7 +72,9 @@ private:
std::ostream &stream;
Indent indentation;
// Format together common items of functions: Parameters, return type, block
/**
* Format together common items of functions: Parameters, return type, block
*/
void format_function_common (std::unique_ptr<Type> &return_type,
std::unique_ptr<BlockExpr> &block);
@@ -97,13 +99,19 @@ private:
std::ostream &emit_indented_string (const std::string &value,
const std::string &comment = "");
// Emit formatted string for generic parameters.
/**
* Emit formatted string for generic parameters
*/
void emit_generic_params (std::vector<std::unique_ptr<GenericParam>> &params);
// Format a single field of a tuple.
/**
* Format a single field of a tuple
*/
void format_tuple_field (TupleField &field);
// Format a single field of a struct.
/**
* Format a single field of a struct
*/
void format_struct_field (StructField &field);
// rust-ast.h

View File

@@ -407,6 +407,7 @@ public:
Location get_locus () const { return locus; }
DelimTokenTree &get_token_tree () { return token_tree; }
const DelimTokenTree &get_token_tree () const { return token_tree; }
};
// A macro rule? Matcher and transcriber pair?