Rename lexer state to match what it holds#277
Open
git-hulk wants to merge 1 commit into
Open
Conversation
l.lastToken and p.last() actually hold the *current* lookahead token - the one the parser is looking at but has not consumed - not a previously-consumed token. Likewise l.current held the input byte offset, not a token. Rename for accuracy, no behavior change: - lexerState.current (int) -> offset - lexerState.lastToken -> current - Parser.last() -> cur() - Parser.lastTokenKind() -> curTokenKind() - Parser.lastTokenString() -> curTokenString() - local `lastToken` vars -> curToken (parser files) The one genuinely-previous token - the local in Lexer.consumeToken used to disambiguate unary +/- - is named prevToken. Also give TokenKindDot its missing TokenKind type annotation. Co-Authored-By: Claude Fable 5 <noreply@anthropic.com>
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
1 participant
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Summary
Internal naming cleanup, no behavior change.
l.lastTokenandp.last()actually hold the current lookahead token — the one the parser is looking at but has not consumed yet — not a previously-consumed token. Andl.currentheld the input byte offset, not a token.lexerState.current(int)offsetlexerState.lastTokencurrentParser.last()cur()Parser.lastTokenKind()curTokenKind()Parser.lastTokenString()curTokenString()lastTokenvars in parser filescurTokenThe one token that genuinely is the previous one — the local in
Lexer.consumeTokenused to disambiguate unary+/-from binary — is now namedprevToken.Also gives
TokenKindDotits missingTokenKindtype annotation (it was an untyped string constant in an otherwise fully-typed block).All renamed identifiers are unexported; the public API is unchanged.
Testing
Full suite passes including
-race -compatible.🤖 Generated with Claude Code