---

yaml
---
r: 3827
b: refs/heads/master
c: 9a0e85a
h: refs/heads/master
i:
  3825: 7543afa
  3823: e9242fa
v: v3

Author: paulstansifer

[refs]

@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 48dbee6b470571241a9f7f6e8b9b36c579296cc7
+refs/heads/master: 9a0e85a92038529e177440f01be127f13cd8d8c8

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

@@ -1465,19 +1465,19 @@ fn parse_pat(&parser p) -> @ast::pat {
             auto etc = false;
             auto first = true;
             while (p.peek() != token::RBRACE) {
-                if (p.peek() == token::DOT) {
+                if (first) { first = false; }
+                else { expect(p, token::COMMA); }
+
+                if (p.peek() == token::UNDERSCORE) {
                     p.bump();
-                    expect(p, token::DOT);
-                    expect(p, token::DOT);
                     if (p.peek() != token::RBRACE) {
                         p.fatal("expecting }, found " +
                                 token::to_str(p.get_reader(), p.peek()));
                     }
                     etc = true;
                     break;
                 }
-                if (first) { first = false; }
-                else { expect(p, token::COMMA); }
+
                 auto fieldname = parse_ident(p);
                 auto subpat;
                 if (p.peek() == token::COLON) {

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

@@ -116,6 +116,7 @@ fn to_str(lexer::reader r, token t) -> str {
              /* Structural symbols */
         case (AT) { ret "@"; }
         case (DOT) { ret "."; }
+        case (ELIPSIS) { ret "..."; }
         case (COMMA) { ret ","; }
         case (SEMI) { ret ";"; }
         case (COLON) { ret ":"; }

trunk/src/test/run-pass/record-pat.rs

@@ -4,7 +4,7 @@ tag t3 { c(t2, uint); }
 
 fn m(&t3 in) -> int {
     alt in {
-        c({x: a(?m) ...}, _) { ret m; }
+        c({x: a(?m), _}, _) { ret m; }
         c({x: b(?m), y}, ?z) { ret (m + z) as int + y; }
     }
 }