---

pcwalton · pcwalton · commit 3b983221414a · 2012-08-01T12:28:47.000-07:00
yaml --- r: 20788 b: refs/heads/snap-stage3 c: 899400c h: refs/heads/master v: v3
diff --git a/[refs] b/[refs]
@@ -1,7 +1,7 @@
 ---
 refs/heads/master: e430a699f2c60890d9b86069fd0c68a70ece7120
 refs/heads/snap-stage1: e33de59e47c5076a89eadeb38f4934f58a3618a6
-refs/heads/snap-stage3: 300e2b851324bac92c8e0cd21735b5550be51435
+refs/heads/snap-stage3: 899400cd1a7465ffcc80d848d6cb2b6fb2436e02
 refs/heads/try: ffbe0e0e00374358b789b0037bcb3a577cd218be
 refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105
 refs/heads/ndm: f3868061cd7988080c30d6d5bf352a5a5fe2460b
diff --git a/branches/snap-stage3/src/libsyntax/parse/parser.rs b/branches/snap-stage3/src/libsyntax/parse/parser.rs
@@ -1693,8 +1693,8 @@ class parser {
             }
           }
           tok {
-            if !is_ident(tok) || self.is_keyword(~"true")
-                || self.is_keyword(~"false") {
+            if (!is_ident(tok) && tok != token::BINOP(token::PLUS)) ||
+                    self.is_keyword(~"true") || self.is_keyword(~"false") {
                 let val = self.parse_expr_res(RESTRICT_NO_BAR_OP);
                 if self.eat_keyword(~"to") {
                     let end = self.parse_expr_res(RESTRICT_NO_BAR_OP);

Original file line number	Diff line number	Diff line change
`@@ -1693,8 +1693,8 @@ class parser {`
`1693`	`1693`	`}`
`1694`	`1694`	`}`
`1695`	`1695`	`tok {`
`1696`		`- if !is_ident(tok) \|\| self.is_keyword(~"true")`
`1697`		`- \|\| self.is_keyword(~"false") {`
	`1696`	`+ if (!is_ident(tok) && tok != token::BINOP(token::PLUS)) \|\|`
	`1697`	`+ self.is_keyword(~"true") \|\| self.is_keyword(~"false") {`
`1698`	`1698`	`let val = self.parse_expr_res(RESTRICT_NO_BAR_OP);`
`1699`	`1699`	`if self.eat_keyword(~"to") {`
`1700`	`1700`	`let end = self.parse_expr_res(RESTRICT_NO_BAR_OP);`