From 9743757113afbdaeca8a06e38f06a2ea4329b75e Mon Sep 17 00:00:00 2001
From: Brian Anderson <banderson@mozilla.com>
Date: Sun, 1 Jul 2012 22:18:41 -0700
Subject: [PATCH] syntax: Support dropping argument list from for/do

---
 src/libsyntax/parse/parser.rs       | 42 +++++++++++++++++++++++------
 src/test/compile-fail/do1.rs        |  2 +-
 src/test/run-pass/do-for-no-args.rs | 10 +++++++
 3 files changed, 45 insertions(+), 9 deletions(-)
 create mode 100644 src/test/run-pass/do-for-no-args.rs

diff --git a/src/libsyntax/parse/parser.rs b/src/libsyntax/parse/parser.rs
index 754fbcd23fe..0492ab27346 100644
--- a/src/libsyntax/parse/parser.rs
+++ b/src/libsyntax/parse/parser.rs
@@ -1357,21 +1357,47 @@ class parser {
 
     // `|args| { ... }` like in `do` expressions
     fn parse_lambda_block_expr() -> @expr {
-        self.parse_lambda_expr_(|| {
-            let blk = self.parse_block();
-            self.mk_expr(blk.span.lo, blk.span.hi, expr_block(blk))
-        })
+        self.parse_lambda_expr_(
+            || {
+                alt self.token {
+                  token::BINOP(token::OR) | token::OROR {
+                    self.parse_fn_block_decl()
+                  }
+                  _ {
+                    // No argument list - `do foo {`
+                    ({
+                        {
+                            inputs: ~[],
+                            output: @{
+                                id: self.get_id(),
+                                node: ty_infer,
+                                span: self.span
+                            },
+                            purity: impure_fn,
+                            cf: return_val,
+                            constraints: ~[]
+                        }
+                    },
+                    @~[])
+                  }
+                }
+            },
+            || {
+                let blk = self.parse_block();
+                self.mk_expr(blk.span.lo, blk.span.hi, expr_block(blk))
+            })
     }
 
     // `|args| expr`
     fn parse_lambda_expr() -> @expr {
-        self.parse_lambda_expr_(|| self.parse_expr())
+        self.parse_lambda_expr_(|| self.parse_fn_block_decl(),
+                                || self.parse_expr())
     }
 
-    fn parse_lambda_expr_(parse_body: fn&() -> @expr) -> @expr {
+    fn parse_lambda_expr_(parse_decl: fn&() -> (fn_decl, capture_clause),
+                          parse_body: fn&() -> @expr) -> @expr {
         let lo = self.last_span.lo;
-        // New style lambdas `|args| expr`
-        let (decl, captures) = self.parse_fn_block_decl();
+        let (decl, captures) = parse_decl();
         let body = parse_body();
         let fakeblock = {view_items: ~[], stmts: ~[], expr: some(body),
                          id: self.get_id(), rules: default_blk};
diff --git a/src/test/compile-fail/do1.rs b/src/test/compile-fail/do1.rs
index 85997046b4e..49ffcd86a5f 100644
--- a/src/test/compile-fail/do1.rs
+++ b/src/test/compile-fail/do1.rs
@@ -1,3 +1,3 @@
 fn main() {
-    let x = do y; //! ERROR: expecting '|' but found
+    let x = do y; //! ERROR: expecting '{' but found
 }
diff --git a/src/test/run-pass/do-for-no-args.rs b/src/test/run-pass/do-for-no-args.rs
new file mode 100644
index 00000000000..d3f860e16ec
--- /dev/null
+++ b/src/test/run-pass/do-for-no-args.rs
@@ -0,0 +1,10 @@
+// Testing that we can drop the || in for/do exprs
+
+fn f(f: fn@() -> bool) { }
+
+fn d(f: fn@()) { }
+
+fn main() {
+    for f { }
+    do d { }
+}
\ No newline at end of file