Skip to content

Commit 972a3f3

Browse files
committed
Rust: use rust types in pre/post_emit hook
1 parent 89b6527 commit 972a3f3

File tree

5 files changed

+109
-229
lines changed

5 files changed

+109
-229
lines changed

rust/ast-generator/templates/extractor.mustache

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -22,20 +22,20 @@ impl Translator<'_> {
2222
{{#enums}}
2323

2424
pub(crate) fn emit_{{snake_case_name}}(&mut self, node: &ast::{{ast_name}}) -> Option<Label<generated::{{name}}>> {
25-
pre_emit!({{name}}, self, node);
25+
pre_emit!({{ast_name}}, self, node);
2626
let label = match node {
2727
{{#variants}}
2828
ast::{{ast_name}}::{{variant_ast_name}}(inner) => self.emit_{{snake_case_name}}(inner).map(Into::into),
2929
{{/variants}}
3030
}?;
31-
post_emit!({{name}}, self, node, label);
31+
post_emit!({{ast_name}}, self, node, label);
3232
Some(label)
3333
}
3434
{{/enums}}
3535
{{#nodes}}
3636

3737
pub(crate) fn emit_{{snake_case_name}}(&mut self, node: &ast::{{ast_name}}) -> Option<Label<generated::{{name}}>> {
38-
pre_emit!({{name}}, self, node);
38+
pre_emit!({{ast_name}}, self, node);
3939
{{#has_attrs}}
4040
if self.should_be_excluded(node) { return None; }
4141
{{/has_attrs}}
@@ -65,7 +65,7 @@ impl Translator<'_> {
6565
{{/fields}}
6666
});
6767
self.emit_location(label, node);
68-
post_emit!({{name}}, self, node, label);
68+
post_emit!({{ast_name}}, self, node, label);
6969
self.emit_tokens(node, label.into(), node.syntax().children_with_tokens());
7070
Some(label)
7171
}

rust/extractor/src/translate/base.rs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ macro_rules! post_emit {
3737
(MacroCall, $self:ident, $node:ident, $label:ident) => {
3838
$self.extract_macro_call_expanded($node, $label);
3939
};
40-
(Function, $self:ident, $node:ident, $label:ident) => {
40+
(Fn, $self:ident, $node:ident, $label:ident) => {
4141
$self.emit_function_has_implementation($node, $label);
4242
$self.extract_canonical_origin($node, $label.into());
4343
};
@@ -66,13 +66,13 @@ macro_rules! post_emit {
6666
(PathExpr, $self:ident, $node:ident, $label:ident) => {
6767
$self.extract_path_canonical_destination($node, $label.into());
6868
};
69-
(StructExpr, $self:ident, $node:ident, $label:ident) => {
69+
(RecordExpr, $self:ident, $node:ident, $label:ident) => {
7070
$self.extract_path_canonical_destination($node, $label.into());
7171
};
7272
(PathPat, $self:ident, $node:ident, $label:ident) => {
7373
$self.extract_path_canonical_destination($node, $label.into());
7474
};
75-
(StructPat, $self:ident, $node:ident, $label:ident) => {
75+
(RecordPat, $self:ident, $node:ident, $label:ident) => {
7676
$self.extract_path_canonical_destination($node, $label.into());
7777
};
7878
(TupleStructPat, $self:ident, $node:ident, $label:ident) => {

0 commit comments

Comments
 (0)