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

Add function name to parse

Browse Source
This commit is contained in:
greg 2015-08-08 16:09:03 -07:00
parent 58d399dace
commit 48ee6c9a75
1 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/parser.rs
View File

@ -15,7 +15,7 @@ pub enum AST {
Statements(Vec<AST>), Statements(Vec<AST>),
IfStatement(Box<AST>, Box<AST>, Option<Box<AST>>), IfStatement(Box<AST>, Box<AST>, Option<Box<AST>>),
WhileStatement(Box<AST>, Box<AST>), WhileStatement(Box<AST>, Box<AST>),
Function(Box<AST>, Box<AST>), Function(String, Box<AST>, Box<AST>),
ArgList(Vec<String>), ArgList(Vec<String>),
DoNothing DoNothing
} }
@ -115,8 +115,8 @@ fn statement(tokens: &mut Tokens) -> ParseResult {
fn function_block(tokens: &mut Tokens) -> ParseResult { fn function_block(tokens: &mut Tokens) -> ParseResult {
expect!(Keyword(Kw::Fn), tokens); expect!(Keyword(Kw::Fn), tokens);
let name = match tokens.next() { let name: String = match tokens.next() {
Some(&Identifier(ref s)) => AST::Name(s.clone()), Some(&Identifier(ref s)) => s.clone(),
_ => return Err("bad parse in function_block()".to_string()) _ => return Err("bad parse in function_block()".to_string())
}; };
@ -131,6 +131,7 @@ fn function_block(tokens: &mut Tokens) -> ParseResult {
expect!(Keyword(Kw::End), tokens); expect!(Keyword(Kw::End), tokens);
Ok(AST::Function( Ok(AST::Function(
name,
Box::new(arguments), Box::new(arguments),
Box::new(body) Box::new(body)
)) ))