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

Fixed arg list parsing

Browse Source
This commit is contained in:
greg 2015-08-08 17:58:51 -07:00
parent 48ee6c9a75
commit dffab8ae94
2 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
Grammar
View File

@ -12,6 +12,7 @@
<fn_block> := fn <id> ( <arg_list> ) <statements> end <fn_block> := fn <id> ( <arg_list> ) <statements> end
<arg_list> := e <arg_list> := e
| <id>
| <id> , <arg_list> | <id> , <arg_list>
<expr> := if <expr> then <statements> end <expr> := if <expr> then <statements> end

6
src/parser.rs
View File

@ -147,7 +147,11 @@ fn argument_list(tokens: &mut Tokens) -> ParseResult {
Some(&Identifier(ref s)) => { Some(&Identifier(ref s)) => {
args.push(s.clone()); args.push(s.clone());
tokens.next(); tokens.next();
expect!(Comma, tokens); if let Some(&Comma) = tokens.peek().map(|i| i.clone()) {
tokens.next();
} else {
break;
}
}, },
_ => break _ => break
} }