-
Notifications
You must be signed in to change notification settings - Fork 263
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.
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
Do IOrigin
wrapping around RangeToken, instead of inside its StartToken
#5931
Open
keyboardDrummer
wants to merge
88
commits into
dafny-lang:master
Choose a base branch
from
keyboardDrummer:iOriginStart
base: master
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
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
keyboardDrummer
changed the title
Rename
Introduce Nov 26, 2024
IToken
to IOrigin
and reduce messiness around 'token wrapping'IOrigin
to reduce headache around tokens
keyboardDrummer
changed the title
Introduce
Introduce Nov 26, 2024
IOrigin
to reduce headache around tokensIOrigin
to make the Dafny AST easier to work with
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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
IOrigin
s, which could be wrapped, but instead takes twoToken
instances. Wrapping now happens around the RangeToken instead of inside its StartToken.Token StartToken
,Token EndToken
andToken Center
toIOrigin
.IOrigin Origin
property toINode
, and remove the getter for theRangeToken
property (I'll remove the setter in a follow-up). Any usages ofRangeToken
s getter are replaced withOrigin
.INode
still has a.Tok
as well, but we'll replace that in a follow-up PR with usages ofOrigin
.RangeToken
now includes an optional field for containing the "Center". Replace most overrides of Node.Tok with assignments toRangeToken.Centre
.Future
RangeToken
toSourceOrigin
. RenameRangeNode
toOriginNode
.Node.tok/Tok
withNode.Origin
TokenNode
withOriginNode
(which requires computing the start and end of expression in the parser already), makingOriginWithComputedRange
obsolete, and allowingOriginNode
to be merged intoNode
IOrigin
, so users must always choose to use Start/End/Center.MakeAutoGenerated
andMakeRefined
How has this been tested?
There are several classes of small changes to reported locations. I have manually inspected all of these changes. Here's some of the categories:
==
inensures a == b
, and now it is the center of the ensures clause itself, which for now is the start token of the predicate. I would rather it be the keyword of the ensures itself, but that would have introduced more changes and I'd prefer to do that in another PR.{:only}
but now it's the center, which apparently is theo
ofonly
.Warning: unnecessary requires clause
and "Warning: unnecessary (or partly unnecessary) assume statement" are now reported at the center of the predicate instead of the startBy submitting this pull request, I confirm that my contribution is made under the terms of the MIT license.