Refactor how options are registered #5675
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
alex-chew
reviewed
Aug 9, 2024
Comment on lines
56
to
78
| // public static void RegisterLibraryCheck(Option option, OptionCompatibility.OptionCheck check) { | ||
| // if (NoChecksNeeded.Contains(option)) { | ||
| // throw new ArgumentException($"Option already registered as not needing a library check: {option.Name}"); | ||
| // } | ||
| // OptionChecks.Add(option, check); | ||
| // } | ||
| // | ||
| // public static void RegisterLibraryChecks(IDictionary<Option, OptionCompatibility.OptionCheck> checks) { | ||
| // foreach (var (option, check) in checks) { | ||
| // RegisterLibraryCheck(option, check); | ||
| // } | ||
| // } | ||
| // | ||
| // public static void RegisterNoChecksNeeded(Option option, bool semantic) { | ||
| // if (semantic) { | ||
| // RegisterLibraryCheck(option, OptionCompatibility.NoOpOptionCheck); | ||
| // } else { | ||
| // if (OptionChecks.ContainsKey(option)) { | ||
| // throw new ArgumentException($"Option already registered as needing a library check: {option.Name}"); | ||
| // } | ||
| // NoChecksNeeded.Add(option); | ||
| // } | ||
| // } |
There was a problem hiding this comment.
nit: unused
Suggested change
| // public static void RegisterLibraryCheck(Option option, OptionCompatibility.OptionCheck check) { | |
| // if (NoChecksNeeded.Contains(option)) { | |
| // throw new ArgumentException($"Option already registered as not needing a library check: {option.Name}"); | |
| // } | |
| // OptionChecks.Add(option, check); | |
| // } | |
| // | |
| // public static void RegisterLibraryChecks(IDictionary<Option, OptionCompatibility.OptionCheck> checks) { | |
| // foreach (var (option, check) in checks) { | |
| // RegisterLibraryCheck(option, check); | |
| // } | |
| // } | |
| // | |
| // public static void RegisterNoChecksNeeded(Option option, bool semantic) { | |
| // if (semantic) { | |
| // RegisterLibraryCheck(option, OptionCompatibility.NoOpOptionCheck); | |
| // } else { | |
| // if (OptionChecks.ContainsKey(option)) { | |
| // throw new ArgumentException($"Option already registered as needing a library check: {option.Name}"); | |
| // } | |
| // NoChecksNeeded.Add(option); | |
| // } | |
| // } |
| @@ -216,7 +215,8 @@ public class ManifestData { | |||
| result.Options.OptionArguments[option] = libraryValue; | |||
| result.ApplyBinding(option); | |||
| var prefix = $"cannot load {options.GetPrintPath(libraryFile.LocalPath)}"; | |||
| success = success && check(reporter, origin, prefix, option, localValue, libraryValue); | |||
| var checkpasses = OptionRegistry.GlobalCheck(option)?.Invoke(reporter, origin, prefix, option, localValue, libraryValue) ?? true; | |||
There was a problem hiding this comment.
The CI warns that libraryValue is possibly null, is that intended?
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
Refactor how options are registered. Replaces the various ways of registering options by these four types:
ModuleDecl.Optionsprogram.Compilation.AlreadyTranslatedRecord.OptionsByModuleFollow-up
ModuleDecl.Optionsand replace usages ofCompilationData.AlreadyTranslatedRecordwithModuleDecl.Options,How has this been tested?
It's a refactoring so no additional tests are needed.
By submitting this pull request, I confirm that my contribution is made under the terms of the MIT license.