diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/compiler.rs | 27 | ||||
| -rw-r--r-- | src/tokenizer.rs | 2 |
2 files changed, 24 insertions, 5 deletions
diff --git a/src/compiler.rs b/src/compiler.rs index 4fdd13b..22256e4 100644 --- a/src/compiler.rs +++ b/src/compiler.rs @@ -1403,12 +1403,29 @@ impl Compiler { } fn parse_type(&mut self) -> Result<Type, ()> { - let ty = self.parse_simple_type(); - if self.peek() == Token::Questionmark { - self.eat(); - ty.map(|x| Type::Union(vec![x, Type::Void])) + let mut tys = vec![self.parse_simple_type()?]; + loop { + match self.peek() { + Token::Questionmark => { + self.eat(); + tys.push(Type::Void); + return Ok(Type::Union(tys)); + }, + + Token::Pipe => { + self.eat(); + tys.push(self.parse_simple_type()?); + }, + + _ => { + break; + }, + } + } + if tys.len() == 1 { + Ok(tys[0].clone()) } else { - ty + Ok(Type::Union(tys)) } } diff --git a/src/tokenizer.rs b/src/tokenizer.rs index 664532a..4d1280d 100644 --- a/src/tokenizer.rs +++ b/src/tokenizer.rs @@ -122,6 +122,8 @@ pub enum Token { Bang, #[token("?")] Questionmark, + #[token("|")] + Pipe, #[token(",")] Comma, |