Use dict for AST

3 files changed, 18 insertions, 26 deletions

diff --git a/crates/libsyntax2/src/ast/generated.rs b/crates/libsyntax2/src/ast/generated.rs
index 0767df334..12e5a1c3e 100644
--- a/crates/libsyntax2/src/ast/generated.rs
+++ b/crates/libsyntax2/src/ast/generated.rs
@@ -4,7 +4,6 @@ use {
     SyntaxKind::*,
 };
 
-
 #[derive(Debug, Clone, Copy)]
 pub struct File<R: TreeRoot = Arc<SyntaxRoot>> {
     syntax: SyntaxNode<R>,
@@ -28,7 +27,6 @@ impl<R: TreeRoot> File<R> {
     }
 }
 
-
 #[derive(Debug, Clone, Copy)]
 pub struct Function<R: TreeRoot = Arc<SyntaxRoot>> {
     syntax: SyntaxNode<R>,
@@ -53,7 +51,6 @@ impl<R: TreeRoot> Function<R> {
     }
 }
 
-
 #[derive(Debug, Clone, Copy)]
 pub struct Name<R: TreeRoot = Arc<SyntaxRoot>> {
     syntax: SyntaxNode<R>,
diff --git a/crates/libsyntax2/src/ast/generated.rs.tera b/crates/libsyntax2/src/ast/generated.rs.tera
index 86de7bce8..09630e427 100644
--- a/crates/libsyntax2/src/ast/generated.rs.tera
+++ b/crates/libsyntax2/src/ast/generated.rs.tera
@@ -3,28 +3,27 @@ use {
     SyntaxNode, SyntaxRoot, TreeRoot, AstNode,
     SyntaxKind::*,
 };
-{% for node in ast %}
-{% set Name = node.kind | camel  %}
+{% for node, methods in ast %}
 #[derive(Debug, Clone, Copy)]
-pub struct {{ Name }}<R: TreeRoot = Arc<SyntaxRoot>> {
+pub struct {{ node }}<R: TreeRoot = Arc<SyntaxRoot>> {
     syntax: SyntaxNode<R>,
 }
 
-impl<R: TreeRoot> AstNode<R> for {{ Name }}<R> {
+impl<R: TreeRoot> AstNode<R> for {{ node }}<R> {
     fn cast(syntax: SyntaxNode<R>) -> Option<Self> {
         match syntax.kind() {
-            {{ node.kind }} => Some({{ Name }} { syntax }),
+            {{ node | upper }} => Some({{ node }} { syntax }),
             _ => None,
         }
     }
     fn syntax(&self) -> &SyntaxNode<R> { &self.syntax }
 }
 
-impl<R: TreeRoot> {{ Name }}<R> {
-{%- if node.collections -%}
-{%- for m in node.collections -%}
+impl<R: TreeRoot> {{ node }}<R> {
+{%- if methods.collections -%}
+{%- for m in methods.collections -%}
 {%- set method_name = m.0 -%}
-{%- set ChildName = m.1 | camel %}
+{%- set ChildName = m.1 %}
     pub fn {{ method_name }}<'a>(&'a self) -> impl Iterator<Item = {{ ChildName }}<R>> + 'a {
         self.syntax()
             .children()
@@ -33,10 +32,10 @@ impl<R: TreeRoot> {{ Name }}<R> {
 {% endfor -%}
 {%- endif -%}
 
-{%- if node.options -%}
-{%- for m in node.options -%}
+{%- if methods.options -%}
+{%- for m in methods.options -%}
 {%- set method_name = m.0 -%}
-{%- set ChildName = m.1 | camel %}
+{%- set ChildName = m.1 %}
     pub fn {{ method_name }}(&self) -> Option<{{ ChildName }}<R>> {
         self.syntax()
             .children()
diff --git a/crates/libsyntax2/src/grammar.ron b/crates/libsyntax2/src/grammar.ron
index 06a4eb6a7..650f72212 100644
--- a/crates/libsyntax2/src/grammar.ron
+++ b/crates/libsyntax2/src/grammar.ron
@@ -213,21 +213,17 @@ Grammar(
         "SELF_PARAM",
         "ARG_LIST",
     ],
-    ast: [
-        (
-            kind: "FILE",
+    ast: {
+        "File": (
             collections: [
-                ["functions", "FUNCTION"]
+                ["functions", "Function"]
             ]
         ),
-        (
-            kind: "FUNCTION",
+        "Function": (
             options: [
-                ["name", "NAME"]
+                ["name", "Name"]
             ]
         ),
-        (
-            kind: "NAME"
-        ),
-    ]
+        "Name": (),
+    },
 )