rust-lang/rust
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Display better snippet for invalid char literal

Browse Source 
Given this code:

    fn main() {
        let _ = 'abcd';
    }

The compiler would give a message like:

    error: character literal may only contain one codepoint: ';
    let _ = 'abcd';
                 ^~

With this change, the message now displays:

    error: character literal may only contain one codepoint: 'abcd'
    let _ = 'abcd'
            ^~~~~~

Fixes #30033
This commit is contained in:
Greg Chapple
2016-01-07 16:12:28 +00:00
parent d3c83fef24
commit acc9428c6a
6 changed files with 81 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
src/libsyntax/parse/lexer/mod.rs
View File

@@ -1195,6 +1195,7 @@ impl<'a> StringReader<'a> {
}
'\'' => {
// Either a character constant 'a' OR a lifetime name 'abc
let start_with_quote = self.last_pos;
self.bump();
let start = self.last_pos;
@@ -1208,6 +1209,14 @@ impl<'a> StringReader<'a> {
while ident_continue(self.curr) {
self.bump();
}
// lifetimes shouldn't end with a single quote
// if we find one, then this is an invalid character literal
if self.curr_is('\'') {
panic!(self.fatal_span_verbose(
start_with_quote, self.pos,
String::from("character literal may only contain one codepoint")));
}
// Include the leading `'` in the real identifier, for macro
// expansion purposes. See #12512 for the gory details of why
@@ -1233,26 +1242,22 @@ impl<'a> StringReader<'a> {
!keyword_checking_token.is_keyword(token::keywords::Static) {
self.err_span_(start, last_bpos, "invalid lifetime name");
}
return token::Lifetime(ident);
}
// Otherwise it is a character constant:
let valid = self.scan_char_or_byte(start,
c2,
// ascii_only =
false,
'\'');
if !self.curr_is('\'') {
let last_bpos = self.last_pos;
panic!(self.fatal_span_verbose(// Byte offsetting here is okay because the
// character before position `start` is an
// ascii single quote.
start - BytePos(1),
last_bpos,
String::from("character literal may only \
contain one codepoint")));
if !self.curr_is('\'') {
panic!(self.fatal_span_verbose(
start_with_quote, self.last_pos,
String::from("character literal may only contain one codepoint")));
}
let id = if valid {
self.name_from(start)
} else {