|
9 | 9 | # recursive descent, top-down parser
|
10 | 10 | class Parser:
|
11 | 11 | def __init__(
|
12 |
| - self, tokens: List[Token], report_error: Optional[Callable] = None |
| 12 | + self, tokens: List[Token], report_error: Optional[Callable] = None |
13 | 13 | ) -> None:
|
14 | 14 | self.tokens = tokens
|
15 | 15 | self.current = 0
|
@@ -104,10 +104,10 @@ def comparison(self) -> ast.Expr:
|
104 | 104 | expr = self.term()
|
105 | 105 |
|
106 | 106 | while self.match(
|
107 |
| - TokenType.GREATER, |
108 |
| - TokenType.GREATER_EQUAL, |
109 |
| - TokenType.LESS, |
110 |
| - TokenType.LESS_EQUAL, |
| 107 | + TokenType.GREATER, |
| 108 | + TokenType.GREATER_EQUAL, |
| 109 | + TokenType.LESS, |
| 110 | + TokenType.LESS_EQUAL, |
111 | 111 | ):
|
112 | 112 | op = self.previous()
|
113 | 113 | right = self.term()
|
@@ -163,4 +163,35 @@ def primary(self) -> ast.Expr:
|
163 | 163 | self.consume(TokenType.RIGHT_PAREN, "Expect ')' after expression.")
|
164 | 164 | return ast.Grouping(expr)
|
165 | 165 |
|
| 166 | + # Error handling |
| 167 | + if self.match(TokenType.BANG_EQUAL, TokenType.EQUAL_EQUAL): |
| 168 | + err = self.error(self.previous(), "Missing left-hand operand.") |
| 169 | + self.equality() |
| 170 | + raise err |
| 171 | + |
| 172 | + if self.match(TokenType.BANG_EQUAL, TokenType.EQUAL_EQUAL): |
| 173 | + err = self.error(self.previous(), "Missing left-hand operand.") |
| 174 | + self.equality() |
| 175 | + raise err |
| 176 | + |
| 177 | + if self.match( |
| 178 | + TokenType.GREATER, |
| 179 | + TokenType.GREATER_EQUAL, |
| 180 | + TokenType.LESS, |
| 181 | + TokenType.LESS_EQUAL, |
| 182 | + ): |
| 183 | + err = self.error(self.previous(), "Missing left-hand operand.") |
| 184 | + self.comparison() |
| 185 | + raise err |
| 186 | + |
| 187 | + if self.match(TokenType.PLUS): |
| 188 | + err = self.error(self.previous(), "Missing left-hand operand.") |
| 189 | + self.term() |
| 190 | + raise err |
| 191 | + |
| 192 | + if self.match(TokenType.SLASH, TokenType.STAR): |
| 193 | + err = self.error(self.previous(), "Missing left-hand operand.") |
| 194 | + self.factor() |
| 195 | + raise err |
| 196 | + |
166 | 197 | raise self.error(self.peek(), "Expect expression")
|
0 commit comments