trimill/complexpr
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

aaa more ambiguity fixed

Browse source
This commit is contained in:
TriMill 2022-09-22 22:34:23 -04:00
parent 99f2ce851c
commit 3744062c71
2 changed files with 3 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
complexpr/src/lexer.rs
View file

@ -219,6 +219,7 @@ impl Lexer {
}, },
_ => self.add_token(TokenType::Pipe, "|"), _ => self.add_token(TokenType::Pipe, "|"),
}, },
'~' => self.add_token(TokenType::Tilde, "~"),
',' => self.add_token(TokenType::Comma, ","), ',' => self.add_token(TokenType::Comma, ","),
';' => self.add_token(TokenType::Semicolon, ";"), ';' => self.add_token(TokenType::Semicolon, ";"),
':' => self.add_token(TokenType::Colon, ":"), ':' => self.add_token(TokenType::Colon, ":"),

4
complexpr/src/parser.rs
View file

@ -449,7 +449,7 @@ impl Parser {
match self.peek().ty { match self.peek().ty {
TokenType::LParen => expr = self.fncall_inner(expr)?, TokenType::LParen => expr = self.fncall_inner(expr)?,
TokenType::LBrack => expr = self.arrindex_inner(expr)?, TokenType::LBrack => expr = self.arrindex_inner(expr)?,
TokenType::Colon => expr = self.structinit_inner(expr)?, TokenType::Tilde => expr = self.structinit_inner(expr)?,
_ => return Ok(expr) _ => return Ok(expr)
} }
} }
@ -478,7 +478,7 @@ impl Parser {
fn structinit_inner(&mut self, expr: Expr) -> Result<Expr, ParserError> { fn structinit_inner(&mut self, expr: Expr) -> Result<Expr, ParserError> {
let colon = self.next(); let colon = self.next();
if !self.expect(TokenType::LBrace).0 { if !self.expect(TokenType::LBrace).0 {
return Err(self.mk_error("Expected left brace in struct initialization")) return Err(self.mk_error("Expected tilde in struct initialization"))
} }
let args = self.commalist(TokenType::RBrace, Self::assignment)?; let args = self.commalist(TokenType::RBrace, Self::assignment)?;
Ok(Expr::StructInit { ty: Box::new(expr), args, pos: colon.pos }) Ok(Expr::StructInit { ty: Box::new(expr), args, pos: colon.pos })