shadowfacts/grass
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Stop infinite loop when lexing variables

Browse Source
This commit is contained in:
ConnorSkees 2020-01-05 19:10:43 -05:00
parent b0276d8349
commit 31fd8f8127
1 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/lexer.rs
View File

@ -94,6 +94,8 @@ impl<'a> Lexer<'a> {
if !is_whitespace(*c) { if !is_whitespace(*c) {
break; break;
} }
self.buf.next();
self.pos.next_char();
} }
} }
@ -282,7 +284,9 @@ impl<'a> Lexer<'a> {
} }
fn lex_variable(&mut self) -> TokenKind { fn lex_variable(&mut self) -> TokenKind {
let mut string = String::with_capacity(99); self.buf.next();
self.pos.next_char();
let mut name = String::with_capacity(99);
while let Some(c) = self.buf.peek() { while let Some(c) = self.buf.peek() {
if !c.is_alphabetic() && c != &'-' { if !c.is_alphabetic() && c != &'-' {
break; break;
@ -292,9 +296,9 @@ impl<'a> Lexer<'a> {
.next() .next()
.expect("this is impossible because we have already peeked"); .expect("this is impossible because we have already peeked");
self.pos.next_char(); self.pos.next_char();
string.push(tok); name.push(tok);
} }
TokenKind::Variable(string) TokenKind::Variable(name)
} }
fn lex_ident(&mut self) -> TokenKind { fn lex_ident(&mut self) -> TokenKind {