Port in expiration parsing into composable schema DSL #2239
Conversation
This file contains 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
github-actions
bot
added
the
area/tooling
tstirrat15
commented
Feb 7, 2025
Comment on lines
+87
to
+96
| // Parking lot for future keywords | ||
| "and": {}, | ||
| "or": {}, | ||
| "not": {}, | ||
| "under": {}, | ||
| "static": {}, | ||
| "if": {}, | ||
| "where": {}, | ||
| "private": {}, | ||
| "public": {}, |
There was a problem hiding this comment.
This is one change that wasn't a direct copy.
| defer p.mustFinishNode() | ||
|
|
||
| // consume the `use` | ||
| p.consumeKeyword("use") |
There was a problem hiding this comment.
Making this a keyword is one change from the schemadsl package.
| @@ -35,7 +35,7 @@ NodeTypeFile | |||
| caveat-name = somecaveat | |||
| end-rune = 67 | |||
| input-source = caveats type test | |||
| start-rune = 53 | |||
| start-rune = 58 | |||
There was a problem hiding this comment.
There's a number of these changes where with is now on the other side of a node boundary. This results in the start-rune being incremented by 5, which is consistent with #2141.
josephschorr
reviewed
Feb 7, 2025
| @@ -135,8 +141,7 @@ func TestParser(t *testing.T) { | |||
| {"partials with malformed partial block", "partials_with_malformed_partial_block"}, | |||
| } | |||
|
|
|||
| for _, test := range parserTests { | |||
| test := test | |||
| for _, test := range parserTests { test := test | |||
tstirrat15
force-pushed
the
migrate-expiration-into-composable-schema
branch
from
a87be96 to
90453da
Compare
tstirrat15
force-pushed
the
migrate-expiration-into-composable-schema
branch
from
90453da to
726aac4
Compare
tstirrat15
commented
Feb 8, 2025
Comment on lines
+11
to
+48
| {"use expiration", "use expiration", []Lexeme{ | ||
| {TokenTypeKeyword, 0, "use", ""}, | ||
| {TokenTypeWhitespace, 0, " ", ""}, | ||
| {TokenTypeKeyword, 0, "expiration", ""}, | ||
| tEOF, | ||
| }}, | ||
| {"use expiration and", "use expiration and", []Lexeme{ | ||
| {TokenTypeKeyword, 0, "use", ""}, | ||
| {TokenTypeWhitespace, 0, " ", ""}, | ||
| {TokenTypeKeyword, 0, "expiration", ""}, | ||
| {TokenTypeWhitespace, 0, " ", ""}, | ||
| {TokenTypeKeyword, 0, "and", ""}, | ||
| tEOF, | ||
| }}, | ||
| {"expiration as non-keyword", "foo expiration", []Lexeme{ | ||
| {TokenTypeIdentifier, 0, "foo", ""}, | ||
| {TokenTypeWhitespace, 0, " ", ""}, | ||
| {TokenTypeKeyword, 0, "expiration", ""}, | ||
| tEOF, | ||
| }}, | ||
| {"and as non-keyword", "foo and", []Lexeme{ | ||
| {TokenTypeIdentifier, 0, "foo", ""}, | ||
| {TokenTypeWhitespace, 0, " ", ""}, | ||
| {TokenTypeKeyword, 0, "and", ""}, | ||
| tEOF, | ||
| }}, | ||
| {"invalid use flag", "use foobar", []Lexeme{ | ||
| {TokenTypeKeyword, 0, "use", ""}, | ||
| {TokenTypeWhitespace, 0, " ", ""}, | ||
| {TokenTypeIdentifier, 0, "foobar", ""}, | ||
| tEOF, | ||
| }}, | ||
| {"use flag after definition", "definition use expiration", []Lexeme{ | ||
| {TokenTypeKeyword, 0, "definition", ""}, | ||
| {TokenTypeWhitespace, 0, " ", ""}, | ||
| {TokenTypeKeyword, 0, "use", ""}, | ||
| {TokenTypeWhitespace, 0, " ", ""}, | ||
| {TokenTypeKeyword, 0, "expiration", ""}, |
There was a problem hiding this comment.
Is it worth reworking these tests? use and expiration are now keywords, so the semantics of the tests don't completely scan.
There was a problem hiding this comment.
Yes, I think so; we should add them in as formal keywords in the lexer tests
Sign up for free
to subscribe to this conversation on GitHub.
Already have an account?
Sign in.
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.
Description
The first step towards making
use expirationand theexpirationtrait into the composable schema compiler. This mirrors the changes in #2141 into thecomposableschemadslpackage.Changes
Testing
See that tests pass.