Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Refactor parser #23

Merged
merged 12 commits into from Mar 21, 2024
Merged

Refactor parser #23

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
12 commits
Select commit Hold shift + click to select a range
3a3cd2a
Started refactoring.
quephird Mar 17, 2024
8ba4348
Parsing of functions/methods is now in sync with grammar.
quephird Mar 17, 2024
4b94913
Refactored helpers for `for`, `if`, and `print` statements.
quephird Mar 17, 2024
26e5074
Refactored helper for jump statements.
quephird Mar 17, 2024
efbfcb3
Refactored helper for while statements.
quephird Mar 17, 2024
8b0102b
Refactored helper for parsing blocks.
quephird Mar 17, 2024
881e2b4
Moved parsing of lambdas and groupings into privte methods.
quephird Mar 18, 2024
5808a84
Moved parsing of list and super expressions into private methods.
quephird Mar 18, 2024
95486f3
More refining of code.
quephird Mar 18, 2024
0bfcd2c
Refactored `parsePostfix()`.
quephird Mar 18, 2024
e3cb57b
Introduced `consumeToken()` to reduce boilerplate and rid calls to `a…
quephird Mar 19, 2024
ddf644e
Tiny tweak to logic for clarity.
quephird Mar 19, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
3 changes: 0 additions & 3 deletions slox/ParseError.swift
View file
Open in desktop
Expand Up @@ -34,7 +34,6 @@ enum ParseError: CustomStringConvertible, Equatable, LocalizedError {
case missingDotAfterSuper(Token)
case expectedSuperclassMethodName(Token)
case missingCloseBracketForSubscriptAccess(Token)
case unsupportedJumpStatement(Token)

var description: String {
switch self {
Expand Down Expand Up @@ -90,8 +89,6 @@ enum ParseError: CustomStringConvertible, Equatable, LocalizedError {
return "[Line \(token.line)] Error: expected superclass method name"
case .missingCloseBracketForSubscriptAccess(let token):
return "[Line \(token.line)] Error: expected closing bracket after subscript index"
case .unsupportedJumpStatement(let token):
return "[Line \(token.line)] Error: unsupported jump statement"
}
}
}