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

More parsing work

Browse Source
This commit is contained in:
greg 2017-09-11 20:37:19 -07:00
parent 117e0e38a8
commit 0755d42112
1 changed files with 13 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
src/schala_lang/parsing.rs
View File

@ -286,7 +286,9 @@ statement := expression | declaration
declaration := type_declaration | func_declaration declaration := type_declaration | func_declaration
type_declaration := TYPE identifier type_declaration := TYPE identifier
func_declaration := FN func_declaration := FN identifier LParen param_list RParen
param_list := (identifier type_anno+ Comma)*
expression := primary expression := primary
primary := literal primary := literal
@ -403,7 +405,16 @@ impl Parser {
} }
fn func_declaration(&mut self) -> ParseResult<Declaration> { fn func_declaration(&mut self) -> ParseResult<Declaration> {
unimplemented!() expect!(self, Keyword(Func), "Expected 'fn'");
let name = self.identifier()?;
expect!(self, LParen, "Expected '('");
let params = self.param_list();
expect!(self, RParen, "Expected ')'");
Ok(Declaration::FuncDecl)
}
fn param_list(&mut self) -> ParseResult<Vec<Rc<String>>> {
Ok(vec!())
} }
fn expression(&mut self) -> ParseResult<Expression> { fn expression(&mut self) -> ParseResult<Expression> {
@ -451,7 +462,6 @@ impl Parser {
fn float_literal(&mut self) -> ParseResult<Expression> { fn float_literal(&mut self) -> ParseResult<Expression> {
use self::Expression::*; use self::Expression::*;
let mut digits = self.digits()?; let mut digits = self.digits()?;
let p = self.peek();
if let TokenType::Period = self.peek() { if let TokenType::Period = self.peek() {
self.next(); self.next();
digits.push_str("."); digits.push_str(".");