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

Convert state_identifier

Browse source
This commit is contained in:
Eryn Wells 2016-12-27 11:23:56 -07:00
parent 245e6e711f
commit 0870727241
1 changed files with 10 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

15
src/lexer/mod.rs
View file

@ -105,6 +105,10 @@ impl Lexer {
fn token_result(&self, token: Token) -> StateResult { fn token_result(&self, token: Token) -> StateResult {
Ok(Some(token)) Ok(Some(token))
} }
fn generic_error(c: char) -> StateResult {
Err(self.error_string(format!("Invalid token character: {}", c)));
}
} }
impl Lexer { impl Lexer {
@ -163,25 +167,26 @@ impl Lexer {
} }
else { else {
return Err(self.error_string(format!("Invalid token character: {}", c))); return self.generic_error(c);
} }
Ok(None) Ok(None)
} }
/// Handle self.state == State::Identifier /// Handle self.state == State::Identifier
fn state_identifier(&mut self, c: char, token: &mut Option<Token>) { fn state_identifier(&mut self, c: char) -> StateResult {
if c.is_identifier_subsequent() { if c.is_identifier_subsequent() {
// Stay in Identifier state. // Stay in Identifier state.
self.advance(); self.advance();
} }
else if c.is_identifier_delimiter() { else if c.is_identifier_delimiter() {
*token = Some(Token::Identifier(self.value())); self.token_result(Token::Identifier(self.value()));
self.retract(); self.retract();
} }
else { else {
assert!(false, "Invalid token character: '{}'", c); return self.generic_error(c);
} }
Ok(None)
} }
fn state_dot(&mut self, c: char, token: &mut Option<Token>) { fn state_dot(&mut self, c: char, token: &mut Option<Token>) {
@ -369,7 +374,7 @@ impl Iterator for Lexer {
let previous_forward = self.forward; let previous_forward = self.forward;
match self.state { match self.state {
State::Initial => self.state_initial(c), State::Initial => self.state_initial(c),
State::Identifier => self.state_identifier(c, &mut token), State::Identifier => self.state_identifier(c),
State::Dot => self.state_dot(c, &mut token), State::Dot => self.state_dot(c, &mut token),
State::Hash => self.state_hash(c, &mut token), State::Hash => self.state_hash(c, &mut token),
State::Number => self.state_number(c, &mut token), State::Number => self.state_number(c, &mut token),