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

Change Symbol -> Word for token

Browse Source
This commit is contained in:
greg 2017-12-01 03:00:42 -08:00
parent 485e869c90
commit 630ead289c
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/rukka_lang/mod.rs
View File

@ -58,7 +58,7 @@ fn read(input: &str) -> Result<Vec<Sexp>, String> {
enum Token { enum Token {
LParen, LParen,
RParen, RParen,
Symbol(String) Word(String)
} }
#[derive(Debug)] #[derive(Debug)]
@ -90,7 +90,7 @@ fn tokenize(input: &mut Peekable<Chars>) -> Vec<Token> {
_ => true _ => true
} }
}).collect(); }).collect();
tokens.push(Symbol(format!("{}{}", c, sym))); tokens.push(Word(format!("{}{}", c, sym)));
} }
} }
} }
@ -100,7 +100,7 @@ fn tokenize(input: &mut Peekable<Chars>) -> Vec<Token> {
fn parse(tokens: &mut Peekable<IntoIter<Token>>) -> Result<Sexp, String> { fn parse(tokens: &mut Peekable<IntoIter<Token>>) -> Result<Sexp, String> {
use self::Token::*; use self::Token::*;
match tokens.next() { match tokens.next() {
Some(Symbol(s)) => Ok(Sexp::Atom(AtomT::Symbol(s))), Some(Word(s)) => Ok(Sexp::Atom(AtomT::Symbol(s))),
Some(LParen) => parse_sexp(tokens), Some(LParen) => parse_sexp(tokens),
Some(RParen) => Err(format!("Unexpected ')'")), Some(RParen) => Err(format!("Unexpected ')'")),
None => Err(format!("Unexpected end of input")), None => Err(format!("Unexpected end of input")),