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

Tell unicode escapes can’t be used as bytes earlier/more

Browse Source
This commit is contained in:
Simonas Kazlauskas
2015-07-10 22:31:44 +03:00
parent d22f189da1
commit 4d65ef4549
2 changed files with 19 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -738,26 +738,24 @@ impl<'a> StringReader<'a> {
return match e {
'n' | 'r' | 't' | '\\' | '\'' | '"' | '0' => true,
'x' => self.scan_byte_escape(delim, !ascii_only),
'u' if self.curr_is('{') => {
let valid = self.scan_unicode_escape(delim);
if valid && ascii_only {
self.err_span_(
start,
self.last_pos,
'u' => {
let valid = if self.curr_is('{') {
self.scan_unicode_escape(delim) && !ascii_only
} else {
self.err_span_(start, self.last_pos,
"incorrect unicode escape sequence");
self.help_span_(start, self.last_pos,
"format of unicode escape sequences is `\\u{…}`");
false
};
if ascii_only {
self.err_span_(start, self.last_pos,
"unicode escape sequences cannot be used as a byte or in \
a byte string"
);
false
} else {
valid
}
}
'u' if !ascii_only => {
self.err_span_(start, self.last_pos,
"incomplete unicode escape sequence");
self.help_span_(start, self.last_pos,
"format of unicode escape sequences is `\\u{…}`");
false
valid
}
'\n' if delim == '"' => {
self.consume_whitespace();