scopes

5 files changed, 44 insertions, 5 deletions

diff --git a/crates/libsyntax2/src/algo/mod.rs b/crates/libsyntax2/src/algo/mod.rs
index 2640d60ea..7287f5bb2 100644
--- a/crates/libsyntax2/src/algo/mod.rs
+++ b/crates/libsyntax2/src/algo/mod.rs
@@ -119,7 +119,7 @@ fn common_ancestor<'a>(n1: SyntaxNodeRef<'a>, n2: SyntaxNodeRef<'a>) -> SyntaxNo
     panic!("Can't find common ancestor of {:?} and {:?}", n1, n2)
 }
 
-fn generate<T>(seed: Option<T>, step: impl Fn(&T) -> Option<T>) -> impl Iterator<Item=T> {
+pub fn generate<T>(seed: Option<T>, step: impl Fn(&T) -> Option<T>) -> impl Iterator<Item=T> {
     ::itertools::unfold(seed, move |slot| {
         slot.take().map(|curr| {
             *slot = step(&curr);
diff --git a/crates/libsyntax2/src/ast/generated.rs b/crates/libsyntax2/src/ast/generated.rs
index 6926c0535..b937fe5a2 100644
--- a/crates/libsyntax2/src/ast/generated.rs
+++ b/crates/libsyntax2/src/ast/generated.rs
@@ -383,6 +383,24 @@ impl<'a> AstNode<'a> for Expr<'a> {
 
 impl<'a> Expr<'a> {}
 
+// ExprStmt
+#[derive(Debug, Clone, Copy)]
+pub struct ExprStmt<'a> {
+    syntax: SyntaxNodeRef<'a>,
+}
+
+impl<'a> AstNode<'a> for ExprStmt<'a> {
+    fn cast(syntax: SyntaxNodeRef<'a>) -> Option<Self> {
+        match syntax.kind() {
+            EXPR_STMT => Some(ExprStmt { syntax }),
+            _ => None,
+        }
+    }
+    fn syntax(self) -> SyntaxNodeRef<'a> { self.syntax }
+}
+
+impl<'a> ExprStmt<'a> {}
+
 // FieldExpr
 #[derive(Debug, Clone, Copy)]
 pub struct FieldExpr<'a> {
@@ -442,6 +460,10 @@ impl<'a> FnDef<'a> {
     pub fn param_list(self) -> Option<ParamList<'a>> {
         super::child_opt(self)
     }
+
+    pub fn body(self) -> Option<Block<'a>> {
+        super::child_opt(self)
+    }
 }
 
 // FnPointerType
@@ -626,6 +648,10 @@ impl<'a> LetStmt<'a> {
     pub fn pat(self) -> Option<Pat<'a>> {
         super::child_opt(self)
     }
+
+    pub fn initializer(self) -> Option<Expr<'a>> {
+        super::child_opt(self)
+    }
 }
 
 // LoopExpr
diff --git a/crates/libsyntax2/src/grammar.ron b/crates/libsyntax2/src/grammar.ron
index 3a125ace6..aa2742b3e 100644
--- a/crates/libsyntax2/src/grammar.ron
+++ b/crates/libsyntax2/src/grammar.ron
@@ -248,7 +248,8 @@ Grammar(
                 "AttrsOwner",
             ],
             options: [
-                ["param_list", "ParamList"]
+                ["param_list", "ParamList"],
+                ["body", "Block"],
             ],
         ),
         "StructDef": (
@@ -431,7 +432,11 @@ Grammar(
         "TypeParamList": ( collections: [ ["type_params", "TypeParam" ] ]),
         "TypeParam": ( traits: ["NameOwner"] ),
         "WhereClause": (),
-        "LetStmt": ( options: [ ["pat", "Pat"] ]),
+        "ExprStmt": (),
+        "LetStmt": ( options: [
+            ["pat", "Pat"],
+            ["initializer", "Expr"],
+        ]),
         "Block": (
             collections: [
                 ["let_stmts", "LetStmt"],
diff --git a/crates/libsyntax2/src/yellow/mod.rs b/crates/libsyntax2/src/yellow/mod.rs
index 3c4510fe7..b94c794fe 100644
--- a/crates/libsyntax2/src/yellow/mod.rs
+++ b/crates/libsyntax2/src/yellow/mod.rs
@@ -66,7 +66,7 @@ impl SyntaxRoot {
     }
 }
 
-#[derive(Clone, Copy, PartialEq, Eq, Debug)]
+#[derive(Clone, Copy, PartialEq, Eq, Debug, Hash)]
 pub(crate) struct RedPtr(ptr::NonNull<RedNode>);
 
 unsafe impl Send for RedPtr {}
diff --git a/crates/libsyntax2/src/yellow/syntax.rs b/crates/libsyntax2/src/yellow/syntax.rs
index 0045598d4..75b6cb7dc 100644
--- a/crates/libsyntax2/src/yellow/syntax.rs
+++ b/crates/libsyntax2/src/yellow/syntax.rs
@@ -1,4 +1,7 @@
-use std::{fmt, sync::Arc};
+use std::{
+    fmt, sync::Arc,
+    hash::{Hasher, Hash},
+};
 
 use smol_str::SmolStr;
 
@@ -27,6 +30,11 @@ impl<R1: TreeRoot, R2: TreeRoot> PartialEq<SyntaxNode<R1>> for SyntaxNode<R2> {
 }
 
 impl<R: TreeRoot> Eq for SyntaxNode<R> {}
+impl<R: TreeRoot> Hash for SyntaxNode<R> {
+    fn hash<H: Hasher>(&self, state: &mut H) {
+        self.red.hash(state)
+    }
+}
 
 pub type SyntaxNodeRef<'a> = SyntaxNode<RefRoot<'a>>;