Make resolve follow FileOptions.TopLevelControl #510
Merged
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
The new struct FileOptions allows for fine grained control over language feature. However, it didn't respect FileOptions.TopLevelControl flag as the only way to actually allow if/for/while in the top level context was to enable FileOptions.GlobalReassign flag.
adonovan
reviewed
Sep 22, 2023
resolve/resolve.go
Outdated
| @@ -505,7 +505,7 @@ func (r *resolver) stmt(stmt syntax.Stmt) { | |||
| } | |||
|
|
|||
| case *syntax.IfStmt: | |||
| if !r.options.GlobalReassign && r.container().function == nil { | |||
| if !r.options.GlobalReassign && !r.options.TopLevelControl && r.container().function == nil { | |||
There was a problem hiding this comment.
I think these three should just be if !r.options.TopLevelControl ..., since the GlobalReassign flag was split into two fine-grained options fields.
| @@ -16,14 +16,14 @@ import ( | |||
|
|
|||
| // A test may enable non-standard options by containing (e.g.) "option:recursion". | |||
| func getOptions(src string) *syntax.FileOptions { | |||
| // TODO(adonovan): use new fine-grained names. | |||
There was a problem hiding this comment.
The intent of this TODO was to get rid of the test option globalreassign and express it in terms of the fine-grained flags. When the TODO is done, every field in getOptions' FileOptions will be set by exactly one option(src, "...") call. Would you care to make that change?
There was a problem hiding this comment.
Ok, I think I did that. I removed the new tests from resolve.star as that functionality was already tested in others. I updated the flags in the tests according to this suggestion.
adonovan
approved these changes
Sep 25, 2023
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.
The new struct
FileOptionsallows for fine grained control over language feature.However, it didn't respect
FileOptions.TopLevelControlflag, as the only way to actually allow if/for/while in the top level context was to enableFileOptions.GlobalReassignflag.