squiid/rust
1
0
Fork 0
Code Issues Pull requests Projects Activity

syntax: lexer doesn't need to store the src length

Browse source
This commit is contained in:
Brian Anderson 2012-04-15 04:02:25 -07:00
parent 2319c2d1ba
commit 4b4f064315
1 changed files with 4 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
src/librustsyntax/parse/lexer.rs
View file

@ -7,7 +7,6 @@ export reader, new_reader, next_token, is_whitespace;
type reader = @{
span_diagnostic: diagnostic::span_handler,
src: @str,
len: uint,
mut col: uint,
mut pos: uint,
mut curr: char,
@ -25,12 +24,12 @@ impl reader for reader {
ret str::slice(*self.src, start - 1u, self.pos - 1u);
}
fn next() -> char {
if self.pos < self.len {
if self.pos < (*self.src).len() {
ret str::char_at(*self.src, self.pos);
} else { ret -1 as char; }
}
fn bump() {
if self.pos < self.len {
if self.pos < (*self.src).len() {
self.col += 1u;
self.chpos += 1u;
if self.curr == '\n' {
@ -59,12 +58,11 @@ impl reader for reader {
fn new_reader(span_diagnostic: diagnostic::span_handler,
filemap: codemap::filemap,
itr: @interner::interner<str>) -> reader {
let r = @{span_diagnostic: span_diagnostic,
src: filemap.src, len: str::len(*filemap.src),
let r = @{span_diagnostic: span_diagnostic, src: filemap.src,
mut col: 0u, mut pos: 0u, mut curr: -1 as char,
mut chpos: filemap.start_pos.ch, mut strs: [],
filemap: filemap, interner: itr};
if r.pos < r.len {
if r.pos < (*filemap.src).len() {
let next = str::char_range_at(*r.src, r.pos);
r.pos = next.next;
r.curr = next.ch;