OpenE2K/rust
2
0
Fork 0
Code Issues Pull Requests 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
Show Stats 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();

8
src/test/parse-fail/issue-23620-invalid-escapes.rs
View File

@ -16,7 +16,8 @@ fn main() {
//~^ ERROR unicode escape sequences cannot be used as a byte or in a byte string
let _ = b'\u';
//~^ ERROR unknown byte escape: u
//~^ ERROR incorrect unicode escape sequence
//~^^ ERROR unicode escape sequences cannot be used as a byte or in a byte string
let _ = b'\x5';
//~^ ERROR numeric character escape is too short
@ -35,11 +36,12 @@ fn main() {
let _ = b"\u{a4a4} \xf \u";
//~^ ERROR unicode escape sequences cannot be used as a byte or in a byte string
//~^^ ERROR illegal character in numeric character escape:
//~^^^ ERROR unknown byte escape: u
//~^^^ ERROR incorrect unicode escape sequence
//~^^^^ ERROR unicode escape sequences cannot be used as a byte or in a byte string
let _ = "\u{ffffff} \xf \u";
//~^ ERROR illegal unicode character escape
//~^^ ERROR illegal character in numeric character escape:
//~^^^ ERROR form of character escape may only be used with characters in the range [\x00-\x7f]
//~^^^^ ERROR incomplete unicode escape sequence
//~^^^^ ERROR incorrect unicode escape sequence
}