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

More infra 

Don't want EOF after all
This commit is contained in:
greg 2017-09-09 01:27:15 -07:00
parent ea08f8cab8
commit cfefceabf9
1 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/schala_lang/parsing.rs
View File

@ -25,7 +25,6 @@ pub enum TokenType {
Identifier(Rc<String>), Identifier(Rc<String>),
Keyword(Kw), Keyword(Kw),
EOF,
Error(String), Error(String),
} }
@ -287,8 +286,12 @@ impl Parser {
Parser { tokens: input.into_iter().peekable() } Parser { tokens: input.into_iter().peekable() }
} }
fn peek(&mut self) -> TokenType { fn peek(&mut self) -> Option<TokenType> {
self.tokens.peek().map(|ref t| { t.token_type.clone() }).unwrap_or(TokenType::EOF) self.tokens.peek().map(|ref t| { t.token_type.clone() })
}
fn next(&mut self) -> Option<TokenType> {
self.tokens.next().map(|ref t| { t.token_type.clone() })
} }
fn program(&mut self) -> ParseResult<AST> { fn program(&mut self) -> ParseResult<AST> {