user0/rust
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

libsyntax: fail lexing with an error message on an int literal larger than 2^64.

Browse source 
Stops an ICE.

Closes #5544.
This commit is contained in:
Huon Wilson 2013-04-08 00:39:28 +10:00
parent 41c6f67109
commit 0c2ceb1a2e
3 changed files with 37 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

11
src/libsyntax/parse/lexer.rs
View file

@ -442,7 +442,11 @@ fn scan_number(c: char, rdr: @mut StringReader) -> token::Token {
if str::len(num_str) == 0u {
rdr.fatal(~"no valid digits found for number");
}
let parsed = u64::from_str_radix(num_str, base as uint).get();
let parsed = match u64::from_str_radix(num_str, base as uint) {
Some(p) => p,
None => rdr.fatal(~"int literal is too large")
};
match tp {
either::Left(t) => return token::LIT_INT(parsed as i64, t),
either::Right(t) => return token::LIT_UINT(parsed, t)
@ -503,7 +507,10 @@ fn scan_number(c: char, rdr: @mut StringReader) -> token::Token {
if str::len(num_str) == 0u {
rdr.fatal(~"no valid digits found for number");
}
let parsed = u64::from_str_radix(num_str, base as uint).get();
let parsed = match u64::from_str_radix(num_str, base as uint) {
Some(p) => p,
None => rdr.fatal(~"int literal is too large")
};
debug!("lexing %s as an unsuffixed integer literal",
num_str);