greg/schala
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Make TokenHandler use an array and index

Browse Source 
Instead of a peekable iterator, so I can implement LL(k) parsing
This commit is contained in:
greg 2019-06-14 00:44:54 -07:00
parent 66f71606ef
commit 3a207cf7a7
1 changed files with 6 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
schala-lang/language/src/parsing.rs
View File

@ -143,8 +143,6 @@
//! //!
use std::rc::Rc; use std::rc::Rc;
use std::iter::Peekable;
use std::vec::IntoIter;
use crate::tokenizing::*; use crate::tokenizing::*;
use crate::tokenizing::Kw::*; use crate::tokenizing::Kw::*;
@ -190,8 +188,7 @@ struct ParserRestrictions {
} }
struct TokenHandler { struct TokenHandler {
tokens: Peekable<IntoIter<Token>>, tokens: Vec<Token>,
token_array: Vec<Token>,
idx: usize, idx: usize,
end_of_file: (usize, usize), end_of_file: (usize, usize),
} }
@ -202,22 +199,18 @@ impl TokenHandler {
None => (0, 0), None => (0, 0),
Some(t) => (t.line_num, t.char_num) Some(t) => (t.line_num, t.char_num)
}; };
let token_array = tokens.clone(); TokenHandler { idx: 0, tokens, end_of_file }
let tokens = tokens.into_iter().peekable();
TokenHandler { idx: 0, token_array, tokens, end_of_file }
} }
fn peek_kind(&mut self) -> TokenKind { fn peek_kind(&mut self) -> TokenKind {
let old = self.tokens.peek().map(|ref t| { t.kind.clone() }).unwrap_or(TokenKind::EOF); self.peek().kind
old
} }
fn peek(&mut self) -> Token { fn peek(&mut self) -> Token {
let old = self.tokens.peek().map(|t: &Token| { t.clone()}).unwrap_or(Token { kind: TokenKind::EOF, line_num: self.end_of_file.0, char_num: self.end_of_file.1}); self.tokens.get(self.idx).map(|t: &Token| { t.clone()}).unwrap_or(Token { kind: TokenKind::EOF, line_num: self.end_of_file.0, char_num: self.end_of_file.1})
old
} }
fn next(&mut self) -> Token { fn next(&mut self) -> Token {
let old = self.tokens.next().unwrap_or(Token { kind: TokenKind::EOF, line_num: self.end_of_file.0, char_num: self.end_of_file.1}); self.idx += 1;
old self.tokens.get(self.idx - 1).map(|t: &Token| { t.clone() }).unwrap_or(Token { kind: TokenKind::EOF, line_num: self.end_of_file.0, char_num: self.end_of_file.1})
} }
} }