nordic-dev.net/rust
nordic-dev.net/rust
2
0
Fork 0
mirror of https://github.com/rust-lang/rust.git synced 2024-12-03 20:23:59 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge #5598

Browse Source 
5598: Simplify codegen r=matklad a=matklad



bors r+
🤖

Co-authored-by: Aleksey Kladov <aleksey.kladov@gmail.com>
This commit is contained in:
bors[bot] 2020-07-30 15:11:20 +00:00 committed by GitHub
commit 61d9d6caf8
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 25 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
xtask/src/ast_src.rs
View File

@ -242,14 +242,13 @@ pub(crate) struct AstNodeSrc {
#[derive(Debug, Eq, PartialEq)] #[derive(Debug, Eq, PartialEq)]
pub(crate) enum Field { pub(crate) enum Field {
Token(String), Token(String),
Node { name: String, src: FieldSrc }, Node { name: String, ty: String, valence: Valence },
} }
#[derive(Debug, Eq, PartialEq)] #[derive(Debug, Eq, PartialEq)]
pub(crate) enum FieldSrc { pub(crate) enum Valence {
Shorthand, Optional,
Optional(String), Many,
Many(String),
} }
#[derive(Debug)] #[derive(Debug)]

42
xtask/src/codegen/gen_syntax.rs
View File

@ -13,7 +13,7 @@ use quote::{format_ident, quote};
use ungrammar::{Grammar, Rule}; use ungrammar::{Grammar, Rule};
use crate::{ use crate::{
ast_src::{AstEnumSrc, AstNodeSrc, AstSrc, Field, FieldSrc, KindsSrc, KINDS_SRC}, ast_src::{AstEnumSrc, AstNodeSrc, AstSrc, Field, KindsSrc, Valence, KINDS_SRC},
codegen::{self, update, Mode}, codegen::{self, update, Mode},
project_root, Result, project_root, Result,
}; };
@ -431,7 +431,7 @@ fn pluralize(s: &str) -> String {
impl Field { impl Field {
fn is_many(&self) -> bool { fn is_many(&self) -> bool {
matches!(self, Field::Node { src: FieldSrc::Many(_), .. }) matches!(self, Field::Node { valence: Valence::Many, .. })
} }
fn token_kind(&self) -> Option<proc_macro2::TokenStream> { fn token_kind(&self) -> Option<proc_macro2::TokenStream> {
match self { match self {
@ -476,19 +476,13 @@ impl Field {
}; };
format_ident!("{}_token", name) format_ident!("{}_token", name)
} }
Field::Node { name, src } => match src { Field::Node { name, .. } => format_ident!("{}", name),
FieldSrc::Shorthand => format_ident!("{}", to_lower_snake_case(name)),
_ => format_ident!("{}", name),
},
} }
} }
fn ty(&self) -> proc_macro2::Ident { fn ty(&self) -> proc_macro2::Ident {
match self { match self {
Field::Token(_) => format_ident!("SyntaxToken"), Field::Token(_) => format_ident!("SyntaxToken"),
Field::Node { name, src } => match src { Field::Node { ty, .. } => format_ident!("{}", ty),
FieldSrc::Optional(ty) | FieldSrc::Many(ty) => format_ident!("{}", ty),
FieldSrc::Shorthand => format_ident!("{}", name),
},
} }
} }
} }
@ -550,7 +544,9 @@ fn lower_rule(acc: &mut Vec<Field>, grammar: &Grammar, rule: &Rule) {
match rule { match rule {
Rule::Node(node) => { Rule::Node(node) => {
let field = Field::Node { name: grammar[*node].name.clone(), src: FieldSrc::Shorthand }; let ty = grammar[*node].name.clone();
let name = to_lower_snake_case(&ty);
let field = Field::Node { name, ty, valence: Valence::Optional };
acc.push(field); acc.push(field);
} }
Rule::Token(token) => { Rule::Token(token) => {
@ -565,9 +561,9 @@ fn lower_rule(acc: &mut Vec<Field>, grammar: &Grammar, rule: &Rule) {
} }
Rule::Rep(inner) => { Rule::Rep(inner) => {
if let Rule::Node(node) = &**inner { if let Rule::Node(node) = &**inner {
let name = grammar[*node].name.clone(); let ty = grammar[*node].name.clone();
let label = pluralize(&to_lower_snake_case(&name)); let name = pluralize(&to_lower_snake_case(&ty));
let field = Field::Node { name: label.clone(), src: FieldSrc::Many(name) }; let field = Field::Node { name, ty, valence: Valence::Many };
acc.push(field); acc.push(field);
return; return;
} }
@ -582,11 +578,13 @@ fn lower_rule(acc: &mut Vec<Field>, grammar: &Grammar, rule: &Rule) {
Rule::Node(node) => node, Rule::Node(node) => node,
_ => todo!("{:?}", rule), _ => todo!("{:?}", rule),
}; };
let ty = grammar[*node].name.clone();
let field = Field::Node { let field = Field::Node {
name: label.clone(), name: label.clone(),
src: match &**rule { ty,
Rule::Rep(_) => FieldSrc::Many(grammar[*node].name.clone()), valence: match &**rule {
_ => FieldSrc::Optional(grammar[*node].name.clone()), Rule::Rep(_) => Valence::Many,
_ => Valence::Optional,
}, },
}; };
acc.push(field); acc.push(field);
@ -620,9 +618,9 @@ fn lower_comma_list(acc: &mut Vec<Field>, grammar: &Grammar, rule: &Rule) -> boo
[comma, Rule::Node(n)] if comma == &**trailing_comma && n == node => (), [comma, Rule::Node(n)] if comma == &**trailing_comma && n == node => (),
_ => return false, _ => return false,
} }
let name = grammar[*node].name.clone(); let ty = grammar[*node].name.clone();
let label = pluralize(&to_lower_snake_case(&name)); let name = pluralize(&to_lower_snake_case(&ty));
let field = Field::Node { name: label.clone(), src: FieldSrc::Many(name) }; let field = Field::Node { name, ty, valence: Valence::Many };
acc.push(field); acc.push(field);
true true
} }
@ -656,7 +654,9 @@ fn extract_enums(ast: &mut AstSrc) {
} }
if to_remove.len() == enm.variants.len() { if to_remove.len() == enm.variants.len() {
node.remove_field(to_remove); node.remove_field(to_remove);
node.fields.push(Field::Node { name: enm.name.clone(), src: FieldSrc::Shorthand }); let ty = enm.name.clone();
let name = to_lower_snake_case(&ty);
node.fields.push(Field::Node { name, ty, valence: Valence::Optional });
} }
} }
} }