Parsing sorta works
Need to handle double >> bug
This commit is contained in:
parent
bb93d29beb
commit
d60cf99ab5
@ -502,9 +502,21 @@ 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) => {
|
||||||
{
|
{
|
||||||
|
expect!($self, $start, "Expected <start symbol figure out string interpol in macros>");
|
||||||
let mut acc = vec![];
|
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
|
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 {
|
||||||
|
Loading…
Reference in New Issue
Block a user