---

erickt · erickt · commit 5033bcbef299 · 2013-03-27T07:04:14.000-07:00
yaml --- r: 51039 b: refs/heads/try c: b26ae28 h: refs/heads/master i: 51037: a53ba89 51035: 5f9d928 51031: 019c121 51023: b9d26d8 51007: b391918 v: v3
diff --git a/[refs] b/[refs]
@@ -2,7 +2,7 @@
 refs/heads/master: 5f13e9ccc2e3328d4cd8ca49f84e6840dd998346
 refs/heads/snap-stage1: e33de59e47c5076a89eadeb38f4934f58a3618a6
 refs/heads/snap-stage3: f7a2371c176663d59062ec5158f39faecba45768
-refs/heads/try: 4e9a63ff917af32bd9ddfee65f5871a5586771e1
+refs/heads/try: b26ae289d0c69350742daa9cadb1c099d2ec3816
 refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105
 refs/heads/ndm: f3868061cd7988080c30d6d5bf352a5a5fe2460b
 refs/heads/try2: 147ecfdd8221e4a4d4e090486829a06da1e0ca3c
diff --git a/branches/try/src/libsyntax/parse/parser.rs b/branches/try/src/libsyntax/parse/parser.rs
@@ -2728,8 +2728,9 @@ pub impl Parser {
                     }
                     self.bump();
                 }
-                token::IDENT(*) => {
+                token::MOD_SEP | token::IDENT(*) => {
                     let maybe_bound = match *self.token {
+                        token::MOD_SEP => None,
                         token::IDENT(copy sid, _) => {
                             match *self.id_to_str(sid) {
                                 ~"send" |
@@ -2757,7 +2758,7 @@ pub impl Parser {
                             result.push(bound);
                         }
                         None => {
-                            let ty = self.parse_ty(false);
+                            let ty = self.parse_ty(true);
                             result.push(TraitTyParamBound(ty));
                         }
                     }
diff --git a/branches/try/src/test/run-pass/issue-5572.rs b/branches/try/src/test/run-pass/issue-5572.rs
@@ -0,0 +1,3 @@
+fn foo<T: ::cmp::Eq>(t: T) { }
+
+fn main() { }

Original file line number	Diff line number	Diff line change
`@@ -2728,8 +2728,9 @@ pub impl Parser {`
`2728`	`2728`	`}`
`2729`	`2729`	`self.bump();`
`2730`	`2730`	`}`
`2731`		`- token::IDENT(*) => {`
	`2731`	`+ token::MOD_SEP \| token::IDENT(*) => {`
`2732`	`2732`	`let maybe_bound = match *self.token {`
	`2733`	`+ token::MOD_SEP => None,`
`2733`	`2734`	`token::IDENT(copy sid, _) => {`
`2734`	`2735`	`match *self.id_to_str(sid) {`
`2735`	`2736`	`~"send" \|`
`@@ -2757,7 +2758,7 @@ pub impl Parser {`
`2757`	`2758`	`result.push(bound);`
`2758`	`2759`	`}`
`2759`	`2760`	`None => {`
`2760`		`- let ty = self.parse_ty(false);`
	`2761`	`+ let ty = self.parse_ty(true);`
`2761`	`2762`	`result.push(TraitTyParamBound(ty));`
`2762`	`2763`	`}`
`2763`	`2764`	`}`
Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,3 @@`
	`1`	`+fn foo<T: ::cmp::Eq>(t: T) { }`
	`2`	`+`
	`3`	`+fn main() { }`