diff --git a/ast-generator/src/build_fn/node_production_build_fn.rs b/ast-generator/src/build_fn/node_production_build_fn.rs index 85b027f..c315674 100644 --- a/ast-generator/src/build_fn/node_production_build_fn.rs +++ b/ast-generator/src/build_fn/node_production_build_fn.rs @@ -1,10 +1,10 @@ -use crate::deserialize::util::make_build_pair; +use crate::deserialize::util::{make_build_fn_name, make_build_pair}; use crate::spec::node_production_spec::NodeProductionBuildSpec; use proc_macro2::TokenStream; use quote::{format_ident, quote}; pub fn make_node_production_build_fn(spec: &NodeProductionBuildSpec) -> TokenStream { - let build_fn_ident = format_ident!("{}", spec.with()); + let build_fn_ident = format_ident!("{}", make_build_fn_name(spec.name())); let pair_ident = format_ident!("{}", make_build_pair(spec.name())); let return_type_ident = format_ident!("{}", spec.kind()); let inner_build_fn_ident = format_ident!("{}", spec.with()); diff --git a/src/parser/ast.yaml b/src/parser/ast.yaml index db62005..80d03a0 100644 --- a/src/parser/ast.yaml +++ b/src/parser/ast.yaml @@ -1041,7 +1041,7 @@ PrimaryExpression: - Closure: inner: kind: Closure - - ListExpression: + - List: inner: kind: ListExpression - ParenthesizedExpression: @@ -1052,9 +1052,9 @@ ListExpression: children: - expression_list ParenthesizedExpression: - struct: - children: - - expression + node_production: + kind: Expression + with: Expression # Calls Call: