---

yaml
---
r: 123697
b: refs/heads/try
c: c2dd553
h: refs/heads/master
i:
  123695: ba61646
v: v3

Author: emberian

[refs]

@@ -2,7 +2,7 @@
 refs/heads/master: da4e4e4e0a7778a85748aa4a303b13f603e96b4b
 refs/heads/snap-stage1: e33de59e47c5076a89eadeb38f4934f58a3618a6
 refs/heads/snap-stage3: 8ddd286ea4ba4384a0dc9eae393ed515460a986e
-refs/heads/try: 91357a9c4eebf9ac9ff2b5c4ab5b27496cf818cd
+refs/heads/try: c2dd553bed572368953801dd1d339013f58b53d6
 refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105
 refs/heads/ndm: f3868061cd7988080c30d6d5bf352a5a5fe2460b
 refs/heads/try2: 147ecfdd8221e4a4d4e090486829a06da1e0ca3c

branches/try/src/test/compile-fail/lex-illegal-num-char-escape.rs renamed to branches/try/src/test/compile-fail/lex-bad-char-literals.rs

@@ -31,5 +31,19 @@ static s: &'static str =
 
 static s2: &'static str =
     "\u23q" //~ ERROR: illegal character in numeric character escape
+    //~^ ERROR: numeric character escape is too short
+;
+
+static c: char =
+    '\●' //~ ERROR: unknown character escape
+;
+
+static s: &'static str =
+    "\●" //~ ERROR: unknown character escape
+;
+
+// THIS MUST BE LAST, since unterminated character constants kill the lexer
+
+static c: char =
+    '●  //~ ERROR: unterminated character constant
 ;
-//~^^ ERROR: numeric character escape is too short

branches/try/src/test/compile-fail/lex-bad-fp-base-2.rs

@@ -0,0 +1,57 @@
+// Copyright 2014 The Rust Project Developers. See the COPYRIGHT
+// file at the top-level directory of this distribution and at
+// http://rust-lang.org/COPYRIGHT.
+//
+// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
+// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
+// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
+// option. This file may not be copied, modified, or distributed
+// except according to those terms.
+
+fn main() {
+    0o1.0; //~ ERROR: octal float literal is not supported
+    0o2f32; //~ ERROR: octal float literal is not supported
+    0o3.0f32; //~ ERROR: octal float literal is not supported
+    0o4e4; //~ ERROR: octal float literal is not supported
+    0o5.0e5; //~ ERROR: octal float literal is not supported
+    0o6e6f32; //~ ERROR: octal float literal is not supported
+    0o7.0e7f64; //~ ERROR: octal float literal is not supported
+    0x8.0e+9; //~ ERROR: hexadecimal float literal is not supported
+    0x9.0e-9; //~ ERROR: hexadecimal float literal is not supported
+}
+
+static F: f32 =
+    1e+ //~ ERROR: scan_exponent: bad fp literal
+;
+
+
+static F: f32 =
+    0x539.0 //~ ERROR: hexadecimal float literal is not supported
+;
+
+static I: int =
+    99999999999999999999999999999999 //~ ERROR: int literal is too large
+;
+
+static J: int =
+    99999999999999999999999999999999u32 //~ ERROR: int literal is too large
+;
+
+static A: int =
+    0x //~ ERROR: no valid digits
+;
+static B: int =
+    0xu32 //~ ERROR: no valid digits
+;
+static C: int =
+    0ou32 //~ ERROR: no valid digits
+;
+static D: int =
+    0bu32 //~ ERROR: no valid digits
+;
+static E: int =
+    0b //~ ERROR: no valid digits
+;
+static F: int =
+    0o //~ ERROR: no valid digits
+;

branches/try/src/test/compile-fail/lex-bad-fp-base-3.rs

@@ -8,6 +8,4 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
-fn main() {
-    let a = 0o1.0; //~ ERROR: octal float literal is not supported
-}
+● //~ ERROR: unknown start of token