{"parents":["750b1e6adb4b1525d5d77de5fa46c7a969a8a36f"],"files":[{"status":"M","path":"compiler\/forget\/crates\/estree-codegen\/src\/codegen.rs"},{"status":"M","path":"compiler\/forget\/crates\/estree\/src\/lib.rs"}],"patch":"diff --git a\/compiler\/forget\/crates\/estree-codegen\/src\/codegen.rs b\/compiler\/forget\/crates\/estree-codegen\/src\/codegen.rs\nindex f4409b7509..fdf835670e 100644\n--- a\/compiler\/forget\/crates\/estree-codegen\/src\/codegen.rs\n+++ b\/compiler\/forget\/crates\/estree-codegen\/src\/codegen.rs\n@@ -31,29 +31,18 @@ impl Grammar {\n operators,\n } = self;\n \n- let nodelike: HashSet =\n- \/\/ nodes.keys().cloned().chain(enums.keys().cloned()).collect();\n- Default::default();\n-\n let enum_names: HashSet = enums.keys().cloned().collect();\n \n let mut node_names: Vec<_> = nodes.keys().cloned().collect();\n node_names.sort();\n- let node_variants: Vec<_> = node_names\n- .iter()\n- .map(|name| {\n- let name = format_ident!(\"{}\", name);\n- quote!(#name(Box<#name>))\n- })\n- .collect();\n \n let objects: Vec<_> = objects\n .iter()\n- .map(|(name, object)| object.codegen(name, &nodelike))\n+ .map(|(name, object)| object.codegen(name))\n .collect();\n let nodes: Vec<_> = nodes\n .iter()\n- .map(|(name, node)| node.codegen(name, &nodelike))\n+ .map(|(name, node)| node.codegen(name))\n .collect();\n let enums: Vec<_> = enums\n .iter()\n@@ -76,12 +65,6 @@ impl Grammar {\n #(#enums)*\n \n #(#operators)*\n-\n- \/\/ #[derive(Serialize, Deserialize, Clone, Debug)]\n- \/\/ #[serde(tag = \"type\")]\n- \/\/ pub enum Node {\n- \/\/ #(#node_variants),*\n- \/\/ }\n }\n }\n }\n@@ -93,12 +76,12 @@ pub struct Object {\n }\n \n impl Object {\n- pub fn codegen(&self, name: &str, nodes: &HashSet) -> TokenStream {\n+ pub fn codegen(&self, name: &str) -> TokenStream {\n let name = format_ident!(\"{}\", name);\n let fields: Vec<_> = self\n .fields\n .iter()\n- .map(|(name, field)| field.codegen(name, nodes))\n+ .map(|(name, field)| field.codegen(name))\n .collect();\n \n quote! {\n@@ -117,12 +100,12 @@ pub struct Node {\n }\n \n impl Node {\n- pub fn codegen(&self, name: &str, nodes: &HashSet) -> TokenStream {\n+ pub fn codegen(&self, name: &str) -> TokenStream {\n let name = format_ident!(\"{}\", name);\n let fields: Vec<_> = self\n .fields\n .iter()\n- .map(|(name, field)| field.codegen_node(name, nodes))\n+ .map(|(name, field)| field.codegen_node(name))\n .collect();\n \n quote! {\n@@ -136,15 +119,6 @@ impl Node {\n #[serde(default)]\n pub range: Option,\n }\n-\n- \/\/ impl #name {\n- \/\/ pub fn from_node(node: Node) -> Option> {\n- \/\/ match node {\n- \/\/ Node::#name(node) => Some(node),\n- \/\/ _ => None\n- \/\/ }\n- \/\/ }\n- \/\/ }\n }\n }\n }\n@@ -174,16 +148,9 @@ pub struct Field {\n }\n \n impl Field {\n- pub fn codegen(&self, name: &str, nodes: &HashSet) -> TokenStream {\n+ pub fn codegen(&self, name: &str) -> TokenStream {\n let name = format_ident!(\"{}\", name);\n- let type_name = format_ident!(\n- \"{}\",\n- if nodes.contains(&self.type_) {\n- \"Node\"\n- } else {\n- &self.type_\n- }\n- );\n+ let type_name = format_ident!(\"{}\", &self.type_);\n let mut type_ = quote!(#type_name);\n if self.plural {\n if self.nullable_item {\n@@ -221,16 +188,9 @@ impl Field {\n field\n }\n \n- pub fn codegen_node(&self, name: &str, nodes: &HashSet) -> TokenStream {\n+ pub fn codegen_node(&self, name: &str) -> TokenStream {\n let name = format_ident!(\"{}\", name);\n- let type_name = format_ident!(\n- \"{}\",\n- if nodes.contains(&self.type_) {\n- \"Node\"\n- } else {\n- &self.type_\n- }\n- );\n+ let type_name = format_ident!(\"{}\", &self.type_);\n let mut type_ = quote!(#type_name);\n if self.plural {\n if self.nullable_item {\n@@ -265,13 +225,6 @@ impl Field {\n #field\n }\n }\n- if nodes.contains(&self.type_) {\n- let comment = format!(\" {}\", &self.type_);\n- field = quote! {\n- #[doc = #comment]\n- #field\n- }\n- }\n field\n }\n }\n@@ -300,26 +253,6 @@ impl Enum {\n })\n .collect();\n \n- let from_node_matches: Vec<_> = sorted_variants\n- .iter()\n- .map(|name| {\n- let variant = format_ident!(\"{}\", name);\n- if enums.contains(*name) {\n- quote! {\n- if let Some(node) = #variant::from_node(node) {\n- return Some(Self::#variant(node));\n- }\n- }\n- } else {\n- quote! {\n- if let Some(node) = #variant::from_node(node) {\n- return Some(Self::#variant(node));\n- }\n- }\n- }\n- })\n- .collect();\n-\n let enum_ = quote! {\n pub enum #name {\n #(#variants),*\n@@ -341,13 +274,6 @@ impl Enum {\n quote! {\n #[derive(Serialize, Deserialize, Clone, Debug)]\n #enum_\n-\n- \/\/ impl #name {\n- \/\/ pub fn from_node(node: Node) -> Option {\n- \/\/ #(#from_node_matches)*\n- \/\/ None\n- \/\/ }\n- \/\/ }\n }\n }\n }\ndiff --git a\/compiler\/forget\/crates\/estree\/src\/lib.rs b\/compiler\/forget\/crates\/estree\/src\/lib.rs\nindex 90bbf727d2..202fb72755 100644\n--- a\/compiler\/forget\/crates\/estree\/src\/lib.rs\n+++ b\/compiler\/forget\/crates\/estree\/src\/lib.rs\n@@ -18,6 +18,7 @@ mod tests {\n #[test]\n fn fixtures() {\n glob!(\"fixtures\/**.json\", |path| {\n+ println!(\"{:?}\", path);\n let input = std::fs::read_to_string(path).unwrap();\n let ast: Program = serde_json::from_str(&input).unwrap();\n let serialized = serde_json::to_string_pretty(&ast).unwrap();\n","body":"","commit":{"authorEmail":"joesavona@fb.com","authorName":"Joe Savona","authoredAt":"2023-07-08T22:59:59+09:00","revision":"3983e882b809ccf611ef1b0826a458543ff360fe","subject":"[rust] estree codegen cleanup","shortRevision":"3983e882b8"}}

dillon1000/react

Files changed