---

yaml
---
r: 3894
b: refs/heads/master
c: 5e1a6da
h: refs/heads/master
v: v3

Author: catamorphism

[refs]

@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 0c913e63d926fc8cf1dd06260546b16f5aa90402
+refs/heads/master: 5e1a6dac4409ba2f584fb41d0759e6c79ec8a8c4

trunk/src/comp/syntax/parse/parser.rs

@@ -948,15 +948,13 @@ fn parse_bottom_expr(&parser p) -> @ast::expr {
         hi = e.span.hi;
         ex = ast::expr_check(ast::unchecked, e);
     } else if (eat_word(p, "ret")) {
-        alt (p.peek()) {
-            case (token::SEMI) { ex = ast::expr_ret(none); }
-            // Handle ret as the block result expression
-            case (token::RBRACE) { ex = ast::expr_ret(none); }
-            case (_) {
-                auto e = parse_expr(p);
-                hi = e.span.hi;
-                ex = ast::expr_ret(some(e));
-            }
+        if (can_begin_expr(p.peek())) {
+            auto e = parse_expr(p);
+            hi = e.span.hi;
+            ex = ast::expr_ret(some(e));
+        }
+        else {
+            ex = ast::expr_ret(none);
         }
     } else if (eat_word(p, "break")) {
         ex = ast::expr_break;

trunk/src/test/run-pass/if-ret.rs

@@ -0,0 +1,6 @@
+// xfail-stage0
+fn foo() {
+    if (ret) { }
+}
+
+fn main() { foo(); }