commit fb2dd4b7f4e6c879b7dc7a17f57cc8373ec373d4
author David Tolnay <dtolnay@gmail.com> Fri Aug 24 16:45:34 2018 -0400
committer David Tolnay <dtolnay@gmail.com> Fri Aug 24 18:51:50 2018 -0400
tree e3ff1dbb377ef6ce87bcc6f1c62e123c0ad9c8e0
parent d17b64fb1803f0a369acfae2ced9d6bcbb0f6744

Parse try-blocks as Expr::TryBlock

src/expr.rs

diff --git a/src/expr.rs b/src/expr.rs
index 748f4a5..2b7aebb 100644
--- a/src/expr.rs
+++ b/src/expr.rs
@@ -509,13 +509,12 @@
             pub question_token: Token![?],
         }),
 
-        /// A catch expression: `do catch { ... }`.
+        /// A try block: `try { ... }`.
         ///
         /// *This type is available if Syn is built with the `"full"` feature.*
-        pub Catch(ExprCatch #full {
+        pub TryBlock(ExprTryBlock #full {
             pub attrs: Vec<Attribute>,
-            pub do_token: Token![do],
-            pub catch_token: Token![catch],
+            pub try_token: Token![try],
             pub block: Block,
         }),
 
@@ -601,7 +600,7 @@
             | Expr::Paren(ExprParen { ref mut attrs, .. })
             | Expr::Group(ExprGroup { ref mut attrs, .. })
             | Expr::Try(ExprTry { ref mut attrs, .. })
-            | Expr::Catch(ExprCatch { ref mut attrs, .. })
+            | Expr::TryBlock(ExprTryBlock { ref mut attrs, .. })
             | Expr::Yield(ExprYield { ref mut attrs, .. }) => mem::replace(attrs, new),
             Expr::Verbatim(_) => {
                 // TODO
@@ -1009,7 +1008,7 @@
         | Expr::WhileLet(..)
         | Expr::Loop(..)
         | Expr::ForLoop(..)
-        | Expr::Catch(..) => false,
+        | Expr::TryBlock(..) => false,
         _ => true,
     }
 }
@@ -1575,7 +1574,7 @@
         call!(unstable_async_block) => { Expr::Verbatim }
         |
         // must be before ExprStruct
-        call!(unstable_try_block) => { Expr::Verbatim }
+        syn!(ExprTryBlock) => { Expr::TryBlock }
         |
         // must be before expr_path
         cond_reduce!(allow_struct, syn!(ExprStruct)) => { Expr::Struct }
@@ -1608,8 +1607,6 @@
         |
         syn!(ExprMatch) => { Expr::Match }
         |
-        syn!(ExprCatch) => { Expr::Catch }
-        |
         syn!(ExprYield) => { Expr::Yield }
         |
         syn!(ExprUnsafe) => { Expr::Unsafe }
@@ -1654,7 +1651,7 @@
             |
             syn!(ExprMatch) => { Expr::Match }
             |
-            syn!(ExprCatch) => { Expr::Catch }
+            syn!(ExprTryBlock) => { Expr::TryBlock }
             |
             syn!(ExprYield) => { Expr::Yield }
             |
@@ -2028,21 +2025,19 @@
     }
 
     #[cfg(feature = "full")]
-    impl Synom for ExprCatch {
+    impl Synom for ExprTryBlock {
         named!(parse -> Self, do_parse!(
-            do_: keyword!(do) >>
-            catch_: keyword!(catch) >>
-            catch_block: syn!(Block) >>
-            (ExprCatch {
+            try_token: keyword!(try) >>
+            block: syn!(Block) >>
+            (ExprTryBlock {
                 attrs: Vec::new(),
-                block: catch_block,
-                do_token: do_,
-                catch_token: catch_,
+                try_token: try_token,
+                block: block,
             })
         ));
 
         fn description() -> Option<&'static str> {
-            Some("`catch` expression")
+            Some("`try` block")
         }
     }
 
@@ -2152,18 +2147,6 @@
     ));
 
     #[cfg(feature = "full")]
-    named!(unstable_try_block -> ExprVerbatim, do_parse!(
-        begin: call!(verbatim::grab_cursor) >>
-        many0!(Attribute::parse_outer) >>
-        keyword!(try) >>
-        syn!(Block) >>
-        end: call!(verbatim::grab_cursor) >>
-        (ExprVerbatim {
-            tts: verbatim::token_range(begin..end),
-        })
-    ));
-
-    #[cfg(feature = "full")]
     named!(fn_arg -> FnArg, do_parse!(
         pat: syn!(Pat) >>
         ty: option!(tuple!(punct!(:), syn!(Type))) >>
@@ -3412,11 +3395,10 @@
     }
 
     #[cfg(feature = "full")]
-    impl ToTokens for ExprCatch {
+    impl ToTokens for ExprTryBlock {
         fn to_tokens(&self, tokens: &mut TokenStream) {
             outer_attrs_to_tokens(&self.attrs, tokens);
-            self.do_token.to_tokens(tokens);
-            self.catch_token.to_tokens(tokens);
+            self.try_token.to_tokens(tokens);
             self.block.to_tokens(tokens);
         }
     }