Rename some things that are not lexical tokens, from Token to Origin #5956
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
MikaelMayer
approved these changes
Dec 3, 2024
There was a problem hiding this comment.
document.querySelectorAll("button.load-diff-button").forEach(b => b.click()) was my friend for this one ! I like the new taxonomy much more than the previous one, thanks for the refactoring. Just a coment about variable renaming that you can skip if you prefer.
| @@ -20,8 +20,8 @@ public MapComprehension(Cloner cloner, MapComprehension original) : base(cloner, | |||
| Finite = original.Finite; | |||
| } | |||
|
|
|||
| public MapComprehension(IToken tok, RangeToken rangeToken, bool finite, List<BoundVar> bvars, Expression range, Expression/*?*/ termLeft, Expression termRight, Attributes attrs) | |||
| : base(tok, rangeToken, bvars, range, termRight, attrs) { | |||
| public MapComprehension(IOrigin tok, RangeToken rangeOrigin, bool finite, List<BoundVar> bvars, Expression range, Expression/*?*/ termLeft, Expression termRight, Attributes attrs) | |||
There was a problem hiding this comment.
I'm puzzled as I would that thought that you'd rename tok to origin but not that you'd rename rangeToken to rangeOrigin
Anyway, these are parameter names so I presume they don't wieght a lot.
There was a problem hiding this comment.
I'll fix it in a follow-up. Hope that's OK.
keyboardDrummer
added a commit
that referenced
this pull request
Dec 3, 2024
This PR extract some refactorings from #5931 to make that PR easier to review. ### Description Use Token instead of IToken in locations where we want to work with a lexical token. This only makes sense in conjunction with other changes. Namely I will rename `IToken` to `IOrigin` (#5956) and make `Token` no longer inherit from `IOrigin` (future PR). ### How has this been tested? Covered by existing tests <small>By submitting this pull request, I confirm that my contribution is made under the terms of the [MIT license](https://github.com/dafny-lang/dafny/blob/master/LICENSE.txt).</small>
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.
This PR extract some refactorings from #5931 to make that PR easier to review.
Description
Microsoft.Dafny.ITokenis nowMicrosoft.Dafny.IOrigin. Same renaming is done for classes that inherit fromIToken, exceptTokenandRangeTokenIOriginandOriginWrapperIOrigindoes not make sense. That is addressed by this PR: Use Token instead of IToken in lexical token locations #5957How has this been tested?
Pure refactoring, covered by existing tests
By submitting this pull request, I confirm that my contribution is made under the terms of the MIT license.