rustc: Add patterns to fold

2 files changed, 15 insertions, 9 deletions

diff --git a/src/comp/front/ast.rs b/src/comp/front/ast.rs
index 954440dd..cc0f2961 100644
--- a/src/comp/front/ast.rs
+++ b/src/comp/front/ast.rs
@@ -41,13 +41,11 @@ type block_ = rec(vec[@stmt] stmts,
 
 type pat = spanned[pat_];
 tag pat_ {
-    pat_wild;
-    pat_bind(ident);
-    pat_tag(ident, vec[@pat]);
+    pat_wild(ann);
+    pat_bind(ident, ann);
+    pat_tag(ident, vec[@pat], ann);
 }
 
-type arm = rec(@pat pat, block block);
-
 tag binop {
     add;
     sub;
@@ -100,6 +98,8 @@ tag decl_ {
     decl_item(@item);
 }
 
+type arm = rec(@pat pat, block block);
+
 type expr = spanned[expr_];
 tag expr_ {
     expr_vec(vec[@expr], ann);
diff --git a/src/comp/front/parser.rs b/src/comp/front/parser.rs
index 16c6ed11..a3cc00a0 100644
--- a/src/comp/front/parser.rs
+++ b/src/comp/front/parser.rs
@@ -815,13 +815,19 @@ impure fn parse_initializer(parser p) -> option.t[@ast.expr] {
 impure fn parse_pat(parser p) -> @ast.pat {
     auto lo = p.get_span();
 
-    auto pat = ast.pat_wild;    // FIXME: typestate bug
+    auto pat = ast.pat_wild(ast.ann_none);  // FIXME: typestate bug
     alt (p.peek()) {
-        case (token.UNDERSCORE) { p.bump(); pat = ast.pat_wild; }
+        case (token.UNDERSCORE) {
+            p.bump();
+            pat = ast.pat_wild(ast.ann_none);
+        }
         case (token.QUES) {
             p.bump();
             alt (p.peek()) {
-                case (token.IDENT(?id)) { p.bump(); pat = ast.pat_bind(id); }
+                case (token.IDENT(?id)) {
+                    p.bump();
+                    pat = ast.pat_bind(id, ast.ann_none);
+                }
                 case (?tok) {
                     p.err("expected identifier after '?' in pattern but " +
                           "found " + token.to_str(tok));
@@ -842,7 +848,7 @@ impure fn parse_pat(parser p) -> @ast.pat {
                 case (_) { args = vec(); }
             }
 
-            pat = ast.pat_tag(id, args);
+            pat = ast.pat_tag(id, args, ast.ann_none);
         }
         case (?tok) {
             p.err("expected pattern but found " + token.to_str(tok));