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

use match syntax in simple_parse

Browse Source
This commit is contained in:
greg 2015-08-06 21:54:43 -07:00
parent 582a7fd6dc
commit 868373f409
1 changed files with 10 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
src/parser.rs
View File

@ -68,7 +68,6 @@ pub fn parse(input: Vec<Token>) -> ParseResult {
return ParseResult::Ok(AST::Statements(vec!())); return ParseResult::Ok(AST::Statements(vec!()));
} }
match statements(&mut tokens) { match statements(&mut tokens) {
ok@ParseResult::Ok(_) => { ok@ParseResult::Ok(_) => {
expect!(EOF, &mut tokens); expect!(EOF, &mut tokens);
@ -250,19 +249,19 @@ fn get_binop_precedence(token: &Token) -> Option<i32> {
fn simple_expression(tokens: &mut Tokens) -> ParseResult { fn simple_expression(tokens: &mut Tokens) -> ParseResult {
let next = tokens.next(); let next = tokens.next();
if let Some(&Identifier(ref value)) = next {
return ParseResult::Ok(AST::Name(value.clone()));
}
if let Some(&StrLiteral(ref value)) = next { match next {
return ParseResult::Ok(AST::LangString(value.clone())); Some(&Identifier(ref value)) =>
} ParseResult::Ok(AST::Name(value.clone())),
if let Some(&NumLiteral(n)) = next { Some(&StrLiteral(ref value)) =>
return ParseResult::Ok(AST::Number(n)); ParseResult::Ok(AST::LangString(value.clone())),
}
return ParseResult::Err("Bad parse in simple_expression()".to_string()); Some(&NumLiteral(n)) =>
ParseResult::Ok(AST::Number(n)),
_ => ParseResult::Err("Bad parse in simple_expression()".to_string())
}
} }
#[cfg(test)] #[cfg(test)]