diff options
| author | Seo Sanghyeon <sanxiyn@gmail.com> | 2013-11-20 02:15:49 +0900 |
|---|---|---|
| committer | Seo Sanghyeon <sanxiyn@gmail.com> | 2013-11-20 16:51:25 +0900 |
| commit | 5e1e487624a134e99371fff073862c90da479755 (patch) | |
| tree | 0be3e812df267b8bbe5fda86eefa2457841ce9d3 /src/libsyntax/parse | |
| parent | c4e28ae06842c2066fadb70a1a4f3dc3f1e26e3c (diff) | |
| download | rust-5e1e487624a134e99371fff073862c90da479755.tar.gz rust-5e1e487624a134e99371fff073862c90da479755.zip | |
Make BytePos 32-bit
Diffstat (limited to 'src/libsyntax/parse')
| -rw-r--r-- | src/libsyntax/parse/lexer.rs | 10 | ||||
| -rw-r--r-- | src/libsyntax/parse/parser.rs | 2 |
2 files changed, 6 insertions, 6 deletions
diff --git a/src/libsyntax/parse/lexer.rs b/src/libsyntax/parse/lexer.rs index 06a2c557e42..2974b90d97e 100644 --- a/src/libsyntax/parse/lexer.rs +++ b/src/libsyntax/parse/lexer.rs @@ -241,7 +241,7 @@ pub fn bump(rdr: &mut StringReader) { let last_char = rdr.curr; let next = rdr.src.char_range_at(current_byte_offset); let byte_offset_diff = next.next - current_byte_offset; - rdr.pos = rdr.pos + BytePos(byte_offset_diff); + rdr.pos = rdr.pos + Pos::from_uint(byte_offset_diff); rdr.curr = next.ch; rdr.col = rdr.col + CharPos(1u); if last_char == '\n' { @@ -251,7 +251,7 @@ pub fn bump(rdr: &mut StringReader) { if byte_offset_diff > 1 { rdr.filemap.record_multibyte_char( - BytePos(current_byte_offset), byte_offset_diff); + Pos::from_uint(current_byte_offset), byte_offset_diff); } } else { rdr.curr = unsafe { transmute(-1u32) }; // FIXME: #8971: unsound @@ -327,7 +327,7 @@ fn consume_any_line_comment(rdr: @mut StringReader) bump(rdr); // line comments starting with "///" or "//!" are doc-comments if rdr.curr == '/' || rdr.curr == '!' { - let start_bpos = rdr.pos - BytePos(3u); + let start_bpos = rdr.pos - BytePos(3); while rdr.curr != '\n' && !is_eof(rdr) { bump(rdr); } @@ -381,7 +381,7 @@ fn consume_block_comment(rdr: @mut StringReader) -> Option<TokenAndSpan> { // block comments starting with "/**" or "/*!" are doc-comments let is_doc_comment = rdr.curr == '*' || rdr.curr == '!'; - let start_bpos = rdr.pos - BytePos(if is_doc_comment {3u} else {2u}); + let start_bpos = rdr.pos - BytePos(if is_doc_comment {3} else {2}); let mut level: int = 1; while level > 0 { @@ -809,7 +809,7 @@ fn next_token_inner(rdr: @mut StringReader) -> token::Token { // Byte offsetting here is okay because the // character before position `start` is an // ascii single quote. - start - BytePos(1u), + start - BytePos(1), rdr.last_pos, ~"unterminated character constant"); } diff --git a/src/libsyntax/parse/parser.rs b/src/libsyntax/parse/parser.rs index 2ea6878f4a3..2a270b392bc 100644 --- a/src/libsyntax/parse/parser.rs +++ b/src/libsyntax/parse/parser.rs @@ -608,7 +608,7 @@ impl Parser { token::GT => self.bump(), token::BINOP(token::SHR) => self.replace_token( token::GT, - self.span.lo + BytePos(1u), + self.span.lo + BytePos(1), self.span.hi ), _ => self.fatal(format!("expected `{}`, found `{}`", |