eryn/sibil
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Track character offset relative to line

Browse source
This commit is contained in:
Eryn Wells 2016-12-27 10:50:43 -07:00
parent f7e990925c
commit 5b88ec73ec
1 changed files with 6 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

6
src/lexer/mod.rs
View file

@ -52,6 +52,7 @@ impl Lexer {
begin: 0, begin: 0,
forward: 0, forward: 0,
line: 1, line: 1,
line_char: 1,
state: State::Initial, state: State::Initial,
number_builder: NumberBuilder::new(), number_builder: NumberBuilder::new(),
} }
@ -67,12 +68,15 @@ impl Lexer {
/// Advance the forward pointer to the next character. /// Advance the forward pointer to the next character.
fn advance(&mut self) { fn advance(&mut self) {
self.forward = self.input.index_after(self.forward); self.forward = self.input.index_after(self.forward);
self.line_char += 1;
println!("> forward={}", self.forward); println!("> forward={}", self.forward);
} }
/// Retract the forward pointer to the previous character. /// Retract the forward pointer to the previous character.
fn retract(&mut self) { fn retract(&mut self) {
self.forward = self.input.index_before(self.forward); self.forward = self.input.index_before(self.forward);
self.line_char -= 1;
assert!(self.line_char >= 1, "Invalid line character count: {}", self.line_char);
println!("< forward={}", self.forward); println!("< forward={}", self.forward);
} }
@ -83,8 +87,10 @@ impl Lexer {
println!("> begin={}, forward={}", self.begin, self.forward); println!("> begin={}, forward={}", self.begin, self.forward);
} }
/// Update lexer state when it encounters a newline.
fn handle_newline(&mut self) { fn handle_newline(&mut self) {
self.line += 1; self.line += 1;
self.line_char = 1;
} }
/// Get the substring between the two input indexes. This is the value to give to a new Token instance. /// Get the substring between the two input indexes. This is the value to give to a new Token instance.