OpenE2K/rust
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Fix some violations of stronger guarantees for mutable borrows.

Browse Source 
See 159e27aebb
This commit is contained in:
Simon Sapin 2014-06-18 00:06:26 +02:00
parent 612bbaf7a0
commit 8de2618182
1 changed files with 17 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -906,8 +906,9 @@ impl<'a> StringReader<'a> {
// Byte offsetting here is okay because the // Byte offsetting here is okay because the
// character before position `start` are an // character before position `start` are an
// ascii single quote and ascii 'b'. // ascii single quote and ascii 'b'.
let last_pos = self_.last_pos;
self_.fatal_span_verbose( self_.fatal_span_verbose(
start - BytePos(2), self_.last_pos, start - BytePos(2), last_pos,
"unterminated byte constant".to_string()); "unterminated byte constant".to_string());
} }
self_.bump(); // advance curr past token self_.bump(); // advance curr past token
@ -920,7 +921,8 @@ impl<'a> StringReader<'a> {
let mut value = Vec::new(); let mut value = Vec::new();
while !self_.curr_is('"') { while !self_.curr_is('"') {
if self_.is_eof() { if self_.is_eof() {
self_.fatal_span(start, self_.last_pos, let last_pos = self_.last_pos;
self_.fatal_span(start, last_pos,
"unterminated double quote byte string"); "unterminated double quote byte string");
} }
@ -944,20 +946,25 @@ impl<'a> StringReader<'a> {
} }
if self_.is_eof() { if self_.is_eof() {
self_.fatal_span(start_bpos, self_.last_pos, "unterminated raw string"); let last_pos = self_.last_pos;
self_.fatal_span(start_bpos, last_pos, "unterminated raw string");
} else if !self_.curr_is('"') { } else if !self_.curr_is('"') {
self_.fatal_span_char(start_bpos, self_.last_pos, let last_pos = self_.last_pos;
let ch = self_.curr.unwrap();
self_.fatal_span_char(start_bpos, last_pos,
"only `#` is allowed in raw string delimitation; \ "only `#` is allowed in raw string delimitation; \
found illegal character", found illegal character",
self_.curr.unwrap()); ch);
} }
self_.bump(); self_.bump();
let content_start_bpos = self_.last_pos; let content_start_bpos = self_.last_pos;
let mut content_end_bpos; let mut content_end_bpos;
'outer: loop { 'outer: loop {
match self_.curr { match self_.curr {
None => self_.fatal_span(start_bpos, self_.last_pos, None => {
"unterminated raw string"), let last_pos = self_.last_pos;
self_.fatal_span(start_bpos, last_pos, "unterminated raw string")
},
Some('"') => { Some('"') => {
content_end_bpos = self_.last_pos; content_end_bpos = self_.last_pos;
for _ in range(0, hash_count) { for _ in range(0, hash_count) {
@ -969,8 +976,9 @@ impl<'a> StringReader<'a> {
break; break;
}, },
Some(c) => if c > '\x7F' { Some(c) => if c > '\x7F' {
self_.err_span_char(self_.last_pos, self_.last_pos, let last_pos = self_.last_pos;
"raw byte string must be ASCII", c); self_.err_span_char(
last_pos, last_pos, "raw byte string must be ASCII", c);
} }
} }
self_.bump(); self_.bump();