diff options
| author | Huon Wilson <dbau.pp+github@gmail.com> | 2013-04-08 00:39:28 +1000 |
|---|---|---|
| committer | Huon Wilson <dbau.pp+github@gmail.com> | 2013-04-08 16:40:40 +1000 |
| commit | 0c2ceb1a2e93e2e7624d384e19da6783cbb720ba (patch) | |
| tree | f5eb8790214a06ee59a45c6e741a070dba44edbb /src/libsyntax | |
| parent | 41c6f67109ed8adee209f28ce7f9dbe1432a45bd (diff) | |
| download | rust-0c2ceb1a2e93e2e7624d384e19da6783cbb720ba.tar.gz rust-0c2ceb1a2e93e2e7624d384e19da6783cbb720ba.zip | |
libsyntax: fail lexing with an error message on an int literal larger than 2^64.
Stops an ICE. Closes #5544.
Diffstat (limited to 'src/libsyntax')
| -rw-r--r-- | src/libsyntax/parse/lexer.rs | 11 |
1 files changed, 9 insertions, 2 deletions
diff --git a/src/libsyntax/parse/lexer.rs b/src/libsyntax/parse/lexer.rs index 5e06ecf6090..b6ec15d8641 100644 --- a/src/libsyntax/parse/lexer.rs +++ b/src/libsyntax/parse/lexer.rs @@ -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); |
