---

yaml
---
r: 947
b: refs/heads/master
c: 756880a
h: refs/heads/master
i:
  945: 0a85ea7
  943: 79b22de
v: v3

Author: pcwalton

[refs]

@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 5d72dae1d13fdbe6275d732aac7dd9a9ad604b6f
+refs/heads/master: 756880a5f5e5df2474a9770d27fa3751b0be4916

trunk/src/comp/front/ast.rs

@@ -39,6 +39,15 @@ type block = spanned[block_];
 type block_ = rec(vec[@stmt] stmts,
                   hashmap[ident,uint] index);
 
+type pat = spanned[pat_];
+tag pat_ {
+    pat_wild;
+    pat_bind(ident);
+    pat_tag(ident, vec[@pat]);
+}
+
+type arm = rec(@pat pat, block block);
+
 tag binop {
     add;
     sub;
@@ -104,6 +113,7 @@ tag expr_ {
     expr_if(@expr, block, option.t[block], ann);
     expr_while(@expr, block, ann);
     expr_do_while(block, @expr, ann);
+    expr_alt(@expr, vec[arm], ann);
     expr_block(block, ann);
     expr_assign(@expr /* TODO: @expr|is_lval */, @expr, ann);
     expr_field(@expr, ident, ann);

trunk/src/comp/front/parser.rs

@@ -745,6 +745,38 @@ impure fn parse_do_while_expr(parser p) -> @ast.expr {
     ret @spanned(lo, hi, ast.expr_do_while(body, cond, ast.ann_none));
 }
 
+impure fn parse_alt_expr(parser p) -> @ast.expr {
+    auto lo = p.get_span();
+    expect(p, token.ALT);
+    expect(p, token.LPAREN);
+    auto discriminant = parse_expr(p);
+    expect(p, token.RPAREN);
+    expect(p, token.LBRACE);
+
+    let vec[ast.arm] arms = vec();
+    while (p.peek() != token.RBRACE) {
+        alt (p.peek()) {
+            case (token.CASE) {
+                p.bump();
+                expect(p, token.LPAREN);
+                auto pat = parse_pat(p);
+                expect(p, token.RPAREN);
+                auto block = parse_block(p);
+                arms += vec(rec(pat=pat, block=block));
+            }
+            case (token.RBRACE) { /* empty */ }
+            case (?tok) {
+                p.err("expected 'case' or '}' when parsing 'alt' statement " +
+                      "but found " + token.to_str(tok));
+            }
+        }
+    }
+
+    auto expr = ast.expr_alt(discriminant, arms, ast.ann_none);
+    auto hi = p.get_span();
+    ret @spanned(lo, hi, expr);
+}
+
 impure fn parse_expr(parser p) -> @ast.expr {
     alt (p.peek()) {
         case (token.LBRACE) {
@@ -761,6 +793,9 @@ impure fn parse_expr(parser p) -> @ast.expr {
         case (token.DO) {
             ret parse_do_while_expr(p);
         }
+        case (token.ALT) {
+            ret parse_alt_expr(p);
+        }
         case (_) {
             ret parse_assign_expr(p);
         }
@@ -777,6 +812,48 @@ impure fn parse_initializer(parser p) -> option.t[@ast.expr] {
     ret none[@ast.expr];
 }
 
+impure fn parse_pat(parser p) -> @ast.pat {
+    auto lo = p.get_span();
+
+    auto pat = ast.pat_wild;    // FIXME: typestate bug
+    alt (p.peek()) {
+        case (token.UNDERSCORE) { p.bump(); pat = ast.pat_wild; }
+        case (token.QUES) {
+            p.bump();
+            alt (p.peek()) {
+                case (token.IDENT(?id)) { p.bump(); pat = ast.pat_bind(id); }
+                case (?tok) {
+                    p.err("expected identifier after '?' in pattern but " +
+                          "found " + token.to_str(tok));
+                    fail;
+                }
+            }
+        }
+        case (token.IDENT(?id)) {
+            p.bump();
+
+            let vec[@ast.pat] args;
+            alt (p.peek()) {
+                case (token.LPAREN) {
+                    auto f = parse_pat;
+                    args = parse_seq[@ast.pat](token.LPAREN, token.RPAREN,
+                                               some(token.COMMA), f, p).node;
+                }
+                case (_) { args = vec(); }
+            }
+
+            pat = ast.pat_tag(id, args);
+        }
+        case (?tok) {
+            p.err("expected pattern but found " + token.to_str(tok));
+            fail;
+        }
+    }
+
+    auto hi = p.get_span();
+    ret @spanned(lo, hi, pat);
+}
+
 impure fn parse_let(parser p) -> @ast.decl {
     auto lo = p.get_span();