OpenE2K/rust
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

auto merge of #4816 : lifthrasiir/rust/float-literal, r=graydon

Browse Source 
See #4804 for details.
This commit is contained in:
bors 2013-02-07 00:14:14 -08:00
commit d9a61f2a19
3 changed files with 41 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/libsyntax/parse/lexer.rs
View File

@ -431,6 +431,13 @@ fn scan_number(c: char, rdr: string_reader) -> token::Token {
let dec_part = scan_digits(rdr, 10u);
num_str += ~"." + dec_part;
}
if is_float {
match base {
16u => rdr.fatal(~"hexadecimal float literal is not supported"),
2u => rdr.fatal(~"binary float literal is not supported"),
_ => ()
}
}
match scan_exponent(rdr) {
Some(ref s) => {
is_float = true;

17
src/test/compile-fail/no-binary-float-literal.rs Normal file
View File

@ -0,0 +1,17 @@
// Copyright 2013 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.
// error-pattern:binary float literal is not supported
fn main() {
0b101010f;
0b101.010;
0b101p4f;
}

17
src/test/compile-fail/no-hex-float-literal.rs Normal file
View File

@ -0,0 +1,17 @@
// Copyright 2013 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.
// error-pattern:hexadecimal float literal is not supported
fn main() {
0xABC.Df;
0x567.89;
0xDEAD.BEEFp-2f;
}