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

Parsing sorta works

Browse Source 
Need to handle double >> bug
This commit is contained in:
greg 2017-09-29 14:10:49 -07:00
parent bb93d29beb
commit d60cf99ab5
1 changed files with 20 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
src/schala_lang/parsing.rs
View File

@ -502,10 +502,22 @@ macro_rules! parse_method {
} }
macro_rules! delimited { macro_rules! delimited {
($self:expr, $parse_fn:expr, $delim:pat, $end:pat) => { ($self:expr, $start:pat, $parse_fn:ident, $delim:pat, $end:pat) => {
{ {
let mut acc = vec![]; expect!($self, $start, "Expected <start symbol figure out string interpol in macros>");
acc let mut acc = vec![];
loop {
if let $end = $self.peek() {
break;
}
acc.push($self.$parse_fn()?);
match $self.peek() {
$delim => { $self.next(); continue },
_ => break
};
}
expect!($self, $end, "Expected <end symbol figure out string interpol in macros>");
acc
} }
} }
} }
@ -603,6 +615,10 @@ impl Parser {
parse_method!(type_anno(&mut self) -> ParseResult<TypeAnno> { parse_method!(type_anno(&mut self) -> ParseResult<TypeAnno> {
expect!(self, Colon, "Expected ':'"); expect!(self, Colon, "Expected ':'");
self.type_name()
});
parse_method!(type_name(&mut self) -> ParseResult<TypeAnno> {
Ok(match self.peek() { Ok(match self.peek() {
LParen => { LParen => {
unimplemented!("Not done with tuple types yet") unimplemented!("Not done with tuple types yet")
@ -610,7 +626,7 @@ impl Parser {
_ => { _ => {
let type_name = self.identifier()?; let type_name = self.identifier()?;
let params = match self.peek() { let params = match self.peek() {
LAngleBracket => delimited!(self, self.type_anno, Comma, RAngleBracket), LAngleBracket => delimited!(self, LAngleBracket, type_name, Comma, RAngleBracket),
_ => vec![], _ => vec![],
}; };
TypeAnno::Singleton { TypeAnno::Singleton {