Skip to content

Refactor the lexer to make it easier to understand, maintain and more swifty #1227

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

Merged
merged 20 commits into from
Jan 17, 2023
Merged

Refactor the lexer to make it easier to understand, maintain and more swifty #1227

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
20 commits
Select commit Hold shift + click to select a range
fb72bc6
Make peeking in the lexer automatically check for end of file
ahoppen Jan 13, 2023
9dbe501
Split Lexer into multiple files
ahoppen Jan 12, 2023
88e4b84
A few miscellaneous lexer improvements
ahoppen Jan 12, 2023
2f27a9a
Lowercase all variables in the lexer
ahoppen Jan 12, 2023
e7dbd8e
Use argument labels in the lexer
ahoppen Jan 12, 2023
a1362a8
Refactor and document lexer cusor advancing
ahoppen Jan 12, 2023
fc75223
Refactor operator boundness
ahoppen Jan 13, 2023
879053c
Refactor advanceValidatingUTF8Character
ahoppen Jan 13, 2023
5710473
Re-arrange string literal lexing and main lexer entry point
ahoppen Jan 13, 2023
39caacd
Refactor lexUnknown
ahoppen Jan 13, 2023
34b13fe
Refactor lexTrivia
ahoppen Jan 13, 2023
dc8cd52
Add test cases for BOM
ahoppen Jan 13, 2023
95b1c33
Re-arrange some more string-related lexing functions
ahoppen Jan 13, 2023
701d13b
Refactor `lexNumber`
ahoppen Jan 13, 2023
02994da
Refactor lexMagicPoundLiteral
ahoppen Jan 13, 2023
a728bd2
Make operator lexing peek-based
ahoppen Jan 13, 2023
c5e4ef3
Refactor `tryLexRegexLiteral`
ahoppen Jan 13, 2023
c648e85
Make lexUnknown peek-based
ahoppen Jan 13, 2023
050d162
Make `lexImpl` peek-based
ahoppen Jan 13, 2023
8addb9a
Rename `peek(matches:)` to `is(at:)`
ahoppen Jan 13, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 8 additions & 2 deletions Sources/SwiftParser/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,6 @@ add_swift_host_library(SwiftParser
Declarations.swift
Directives.swift
Expressions.swift
Lexer.swift
Lookahead.swift
LoopProgressCondition.swift
Modifiers.swift
Expand All @@ -34,7 +33,14 @@ add_swift_host_library(SwiftParser

generated/DeclarationModifier.swift
generated/Parser+Entry.swift
generated/TypeAttribute.swift)
generated/TypeAttribute.swift

Lexer/Cursor.swift
Lexer/Lexeme.swift
Lexer/LexemeSequence.swift
Lexer/Lexer.swift
Lexer/UnicodeScalarExtensions.swift
)

target_link_libraries(SwiftParser PUBLIC
SwiftSyntax
Expand Down
2 changes: 1 addition & 1 deletion Sources/SwiftParser/Declarations.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1253,7 +1253,7 @@ extension Parser {
(buffer: UnsafeBufferPointer<UInt8>) -> Bool in
var cursor = Lexer.Cursor(input: buffer, previous: 0, state: .normal)
guard buffer[0] == UInt8(ascii: "/") else { return false }
switch cursor.lexOperatorIdentifier(cursor, cursor).tokenKind {
switch cursor.lexOperatorIdentifier(sourceBufferStart: cursor).tokenKind {
case .unknown:
return false

Expand Down
Loading