commit 42602293ebf3d4458df32366237b7f610e41683f
author David Tolnay <dtolnay@gmail.com> Sat Oct 01 22:25:45 2016 -0700
committer David Tolnay <dtolnay@gmail.com> Sat Oct 01 23:36:58 2016 -0700
tree befeba6f500f6d1e4673a4c8aa3b6e6e76378262
parent b4ad3b5c722598436004d6c6f82df3d17d77cee6

Function parsing

src/expr.rs

diff --git a/src/expr.rs b/src/expr.rs
index 1824922..c3c90ea 100644
--- a/src/expr.rs
+++ b/src/expr.rs
@@ -624,16 +624,22 @@
          ))
     ));
 
-    named!(expr_block -> Expr, map!(block, |b| Expr::Block(Box::new(b))));
-
-    named!(block -> Block, do_parse!(
+    named!(expr_block -> Expr, do_parse!(
         rules: block_check_mode >>
+        b: block >>
+        (Expr::Block(Box::new(Block {
+            stmts: b.stmts,
+            rules: rules,
+        })))
+    ));
+
+    named!(pub block -> Block, do_parse!(
         punct!("{") >>
         stmts: within_block >>
         punct!("}") >>
         (Block {
             stmts: stmts,
-            rules: rules,
+            rules: BlockCheckMode::Default,
         })
     ));
 
@@ -669,7 +675,7 @@
         (Stmt::Semi(Box::new(e)))
     ));
 
-    named!(pat -> Pat, alt!(
+    named!(pub pat -> Pat, alt!(
         pat_wild
         |
         pat_ident
@@ -757,7 +763,10 @@
                 Expr::AddrOf(_mutability, ref _expr) => unimplemented!(),
                 Expr::Break(ref _label) => unimplemented!(),
                 Expr::Continue(ref _label) => unimplemented!(),
-                Expr::Ret(ref _expr) => unimplemented!(),
+                Expr::Ret(ref opt_expr) => {
+                    tokens.append("return");
+                    opt_expr.to_tokens(tokens);
+                }
                 Expr::Mac(ref _mac) => unimplemented!(),
                 Expr::Struct(ref _path, ref _fields, ref _base) => unimplemented!(),
                 Expr::Repeat(ref _expr, ref _times) => unimplemented!(),
@@ -829,4 +838,39 @@
             }
         }
     }
+
+    impl ToTokens for Block {
+        fn to_tokens(&self, tokens: &mut Tokens) {
+            self.rules.to_tokens(tokens);
+            tokens.append("{");
+            for stmt in &self.stmts {
+                stmt.to_tokens(tokens);
+            }
+            tokens.append("}");
+        }
+    }
+
+    impl ToTokens for BlockCheckMode {
+        fn to_tokens(&self, tokens: &mut Tokens) {
+            match *self {
+                BlockCheckMode::Default => { /* nothing */ },
+                BlockCheckMode::Unsafe => tokens.append("unsafe"),
+            }
+        }
+    }
+
+    impl ToTokens for Stmt {
+        fn to_tokens(&self, tokens: &mut Tokens) {
+            match *self {
+                Stmt::Local(ref _local) => unimplemented!(),
+                Stmt::Item(ref item) => item.to_tokens(tokens),
+                Stmt::Expr(ref expr) => expr.to_tokens(tokens),
+                Stmt::Semi(ref expr) => {
+                    expr.to_tokens(tokens);
+                    tokens.append(";");
+                }
+                Stmt::Mac(ref _mac) => unimplemented!(),
+            }
+        }
+    }
 }