---

yaml
---
r: 29784
b: refs/heads/incoming
c: 55ee06b
h: refs/heads/master
v: v3

Author: pcwalton

[refs]

@@ -6,7 +6,7 @@ refs/heads/try: d324a424d8f84b1eb049b12cf34182bda91b0024
 refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105
 refs/heads/ndm: f3868061cd7988080c30d6d5bf352a5a5fe2460b
 refs/heads/try2: d0c6ce338884ee21843f4b40bf6bf18d222ce5df
-refs/heads/incoming: 36d8682269fb29a10da93634cff4a9320c45a2f4
+refs/heads/incoming: 55ee06b8ce70cf86e9df7e501f700cc3e520376d
 refs/heads/dist-snap: 2f32a1581f522e524009138b33b1c7049ced668d
 refs/tags/release-0.2: c870d2dffb391e14efb05aa27898f1f6333a9596
 refs/tags/release-0.3: b5f0d0f648d9a6153664837026ba1be43d3e2503

branches/incoming/src/libsyntax/parse/lexer.rs

@@ -377,7 +377,8 @@ fn scan_number(c: char, rdr: string_reader) -> token::token {
         }
     }
     let mut is_float = false;
-    if rdr.curr == '.' && !(is_alpha(nextch(rdr)) || nextch(rdr) == '_') {
+    if rdr.curr == '.' && !(is_alpha(nextch(rdr)) || nextch(rdr) == '_' ||
+                            nextch(rdr) == '.') {
         is_float = true;
         bump(rdr);
         let dec_part = scan_digits(rdr, 10u);

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

@@ -1797,7 +1797,7 @@ class parser {
                 || self.is_keyword(~"false")
             {
                 let val = self.parse_expr_res(RESTRICT_NO_BAR_OP);
-                if self.eat_keyword(~"to") {
+                if self.eat_keyword(~"to") || self.eat(token::DOTDOT) {
                     let end = self.parse_expr_res(RESTRICT_NO_BAR_OP);
                     pat = pat_range(val, end);
                 } else {

branches/incoming/src/libsyntax/print/pprust.rs

@@ -1512,7 +1512,7 @@ fn print_pat(s: ps, &&pat: @ast::pat) {
       ast::pat_range(begin, end) => {
         print_expr(s, begin);
         space(s.s);
-        word_space(s, ~"to");
+        word(s.s, ~"..");
         print_expr(s, end);
       }
     }

branches/incoming/src/test/run-pass/alt-range.rs

@@ -1,30 +1,30 @@
 fn main() {
     match 5u {
-      1u to 5u => {}
+      1u..5u => {}
       _ => fail ~"should match range",
     }
     match 5u {
-      6u to 7u => fail ~"shouldn't match range",
+      6u..7u => fail ~"shouldn't match range",
       _ => {}
     }
     match check 5u {
       1u => fail ~"should match non-first range",
-      2u to 6u => {}
+      2u..6u => {}
     }
     match 'c' {
-      'a' to 'z' => {}
+      'a'..'z' => {}
       _ => fail ~"should suppport char ranges"
     }
     match -3 {
-      -7 to 5 => {}
+      -7..5 => {}
       _ => fail ~"should match signed range"
     }
     match 3.0 {
-      1.0 to 5.0 => {}
+      1.0..5.0 => {}
       _ => fail ~"should match float range"
     }
     match -1.5 {
-      -3.6 to 3.6 => {}
+      -3.6..3.6 => {}
       _ => fail ~"should match negative float range"
     }
 }