syntax: Unquoting some statements requires trailing semicolons

Author: erickt

src/libsyntax/ext/quote.rs

@@ -28,8 +28,7 @@ pub mod rt {
     use ast;
     use codemap::Spanned;
     use ext::base::ExtCtxt;
-    use parse::token;
-    use parse;
+    use parse::{self, token, classify};
     use ptr::P;
     use std::rc::Rc;
 
@@ -126,7 +125,16 @@ pub mod rt {
 
     impl ToTokens for P<ast::Stmt> {
         fn to_tokens(&self, _cx: &ExtCtxt) -> Vec<TokenTree> {
-            vec![ast::TtToken(self.span, token::Interpolated(token::NtStmt(self.clone())))]
+            let mut tts = vec![
+                ast::TtToken(self.span, token::Interpolated(token::NtStmt(self.clone())))
+            ];
+
+            // Some statements require a trailing semicolon.
+            if classify::stmt_ends_with_semi(&self.node) {
+                tts.push(ast::TtToken(self.span, token::Semi));
+            }
+
+            tts
         }
     }
 

src/test/run-pass-fulldeps/quote-tokens.rs

@@ -43,6 +43,12 @@ fn syntax_extension(cx: &ExtCtxt) {
     let _n: syntax::ast::Attribute = quote_attr!(cx, #![cfg(foo, bar = "baz")]);
 
     let _o: Option<P<syntax::ast::Item>> = quote_item!(cx, fn foo<T: ?Sized>() {});
+
+    let stmts = vec![
+        quote_stmt!(cx, let x = 1;).unwrap(),
+        quote_stmt!(cx, let y = 2;).unwrap(),
+    ];
+    let expr: P<syntax::ast::Expr> = quote_expr!(cx, x + y);
 }
 
 fn main() {