---

yaml
---
r: 138481
b: refs/heads/try2
c: f396582
h: refs/heads/master
i:
  138479: 578e461
v: v3

Author: erickt

[refs]

@@ -5,7 +5,7 @@ refs/heads/snap-stage3: 78a7676898d9f80ab540c6df5d4c9ce35bb50463
 refs/heads/try: 519addf6277dbafccbb4159db4b710c37eaa2ec5
 refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105
 refs/heads/ndm: f3868061cd7988080c30d6d5bf352a5a5fe2460b
-refs/heads/try2: 4650da5888427b60c6d38308bcdd76da40f1b181
+refs/heads/try2: f3965829ffd1e2eb4e2b8c4c8f151379f504ed7f
 refs/heads/dist-snap: ba4081a5a8573875fed17545846f6f6902c8ba8d
 refs/tags/release-0.2: c870d2dffb391e14efb05aa27898f1f6333a9596
 refs/tags/release-0.3: b5f0d0f648d9a6153664837026ba1be43d3e2503

branches/try2/src/libsyntax/parse/parser.rs

@@ -1228,7 +1228,7 @@ pub impl Parser {
                   _ => self.fatal(~"expected open delimiter")
                 };
 
-                let ket = token::flip_delimiter(*self.token);
+                let ket = token::flip_delimiter(&*self.token);
                 let tts = self.parse_unspanned_seq(*self.token,
                                                    ket,
                                                    seq_sep_none(),
@@ -1433,7 +1433,7 @@ pub impl Parser {
           }
           token::LPAREN | token::LBRACE | token::LBRACKET => {
               // tjc: ??????
-            let ket = token::flip_delimiter(*self.token);
+            let ket = token::flip_delimiter(&*self.token);
             tt_delim(vec::append(
                 // the open delimiter:
                 ~[parse_any_tt_tok(self)],
@@ -1465,7 +1465,7 @@ pub impl Parser {
           token::LBRACE | token::LPAREN | token::LBRACKET => {
             self.parse_matcher_subseq(name_idx, *self.token,
                                       // tjc: not sure why we need a copy
-                                      token::flip_delimiter(*self.token))
+                                      token::flip_delimiter(&*self.token))
           }
           _ => self.fatal(~"expected open delimiter")
         }
@@ -3915,7 +3915,7 @@ pub impl Parser {
             // eat a matched-delimiter token tree:
             let tts = match *self.token {
               token::LPAREN | token::LBRACE => {
-                let ket = token::flip_delimiter(*self.token);
+                let ket = token::flip_delimiter(&*self.token);
                 self.parse_unspanned_seq(*self.token, ket,
                                          seq_sep_none(),
                                          |p| p.parse_token_tree())

branches/try2/src/libsyntax/parse/token.rs

@@ -257,8 +257,8 @@ pub pure fn can_begin_expr(t: Token) -> bool {
 }
 
 /// what's the opposite delimiter?
-pub fn flip_delimiter(t: token::Token) -> token::Token {
-    match t {
+pub fn flip_delimiter(t: &token::Token) -> token::Token {
+    match *t {
       token::LPAREN => token::RPAREN,
       token::LBRACE => token::RBRACE,
       token::LBRACKET => token::RBRACKET,