Rename parser mode enums as per discussion

After discussion in PR commandlineparser#684, renamed ParserMode enums to GetoptParserV1
and GetoptParserV2, so as to not communicate the idea that the older
mode is in any way obsolete (it will continue to be supported for the
foreseeable future).

Author: rmunn

src/CommandLine/Parser.cs

@@ -187,13 +187,13 @@ private static Result<IEnumerable<Token>, Error> Tokenize(
         {
             switch (settings.ParserMode)
             {
-                case ParserMode.Classic:
+                case ParserMode.GetoptParserV1:
                 return Tokenizer.ConfigureTokenizer(
                     settings.NameComparer,
                     settings.IgnoreUnknownArguments,
                     settings.EnableDashDash)(arguments, optionSpecs);
 
-                case ParserMode.Getopt:
+                case ParserMode.GetoptParserV2:
                 return GetoptTokenizer.ConfigureTokenizer(
                     settings.NameComparer,
                     settings.IgnoreUnknownArguments,

src/CommandLine/ParserSettings.cs

@@ -11,10 +11,10 @@ namespace CommandLine
 {
     public enum ParserMode
     {
-        Classic,
-        Getopt,
+        GetoptParserV1,
+        GetoptParserV2,
 
-        Default = Classic
+        Default = GetoptParserV1
     }
 
     /// <summary>
@@ -174,11 +174,11 @@ public bool AutoVersion
         /// <summary>
         /// Gets or sets a value indicating whether enable double dash '--' syntax,
         /// that forces parsing of all subsequent tokens as values.
-        /// Normally defaults to false. If ParserMode = ParserMode.Getopt, this defaults to true, but can be turned off by explicitly specifying EnableDashDash = false.
+        /// Normally defaults to false. If ParserMode = ParserMode.GetoptParserV2, this defaults to true, but can be turned off by explicitly specifying EnableDashDash = false.
         /// </summary>
         public bool EnableDashDash
         {
-            get => enableDashDash.MatchJust(out bool value) ? value : (parserMode == ParserMode.Getopt);
+            get => enableDashDash.MatchJust(out bool value) ? value : (parserMode == ParserMode.GetoptParserV2);
             set => PopsicleSetter.Set(Consumed, ref enableDashDash, Maybe.Just(value));
         }
 
@@ -193,11 +193,11 @@ public int MaximumDisplayWidth
 
         /// <summary>
         /// Gets or sets a value indicating whether options are allowed to be specified multiple times.
-        /// If ParserMode = ParserMode.Getopt, this defaults to true, but can be turned off by explicitly specifying AllowMultiInstance = false.
+        /// If ParserMode = ParserMode.GetoptParserV2, this defaults to true, but can be turned off by explicitly specifying AllowMultiInstance = false.
         /// </summary>
         public bool AllowMultiInstance
         {
-            get => allowMultiInstance.MatchJust(out bool value) ? value : (parserMode == ParserMode.Getopt);
+            get => allowMultiInstance.MatchJust(out bool value) ? value : (parserMode == ParserMode.GetoptParserV2);
             set => PopsicleSetter.Set(Consumed, ref allowMultiInstance, Maybe.Just(value));
         }
 

tests/CommandLine.Tests/Unit/GetoptParserTests.cs

@@ -155,7 +155,7 @@ public void Getopt_parser_without_posixly_correct_allows_mixed_options_and_nonop
         {
             // Arrange
             var sut = new Parser(config => {
-                config.ParserMode = ParserMode.Getopt;
+                config.ParserMode = ParserMode.GetoptParserV2;
                 config.PosixlyCorrect = false;
             });
 
@@ -215,7 +215,7 @@ public void Getopt_parser_with_posixly_correct_stops_parsing_at_first_nonoption(
         {
             // Arrange
             var sut = new Parser(config => {
-                config.ParserMode = ParserMode.Getopt;
+                config.ParserMode = ParserMode.GetoptParserV2;
                 config.PosixlyCorrect = true;
                 config.EnableDashDash = true;
             });
@@ -233,7 +233,7 @@ public void Getopt_mode_defaults_to_EnableDashDash_being_true()
         {
             // Arrange
             var sut = new Parser(config => {
-                config.ParserMode = ParserMode.Getopt;
+                config.ParserMode = ParserMode.GetoptParserV2;
                 config.PosixlyCorrect = false;
             });
             var args = new string [] {"--stringvalue", "foo", "256", "--", "-x", "-sbar" };
@@ -259,7 +259,7 @@ public void Getopt_mode_can_have_EnableDashDash_expicitly_disabled()
         {
             // Arrange
             var sut = new Parser(config => {
-                config.ParserMode = ParserMode.Getopt;
+                config.ParserMode = ParserMode.GetoptParserV2;
                 config.PosixlyCorrect = false;
                 config.EnableDashDash = false;
             });

tests/CommandLine.Tests/Unit/SequenceParsingTests.cs

@@ -17,8 +17,8 @@ public class SequenceParsingTests
     {
         // Issue #91
         [Theory]
-        [InlineData(ParserMode.Classic)]
-        [InlineData(ParserMode.Getopt)]
+        [InlineData(ParserMode.GetoptParserV1)]
+        [InlineData(ParserMode.GetoptParserV2)]
         public static void Enumerable_with_separator_before_values_does_not_try_to_parse_too_much(ParserMode parserMode)
         {
             var args = "--exclude=a,b InputFile.txt".Split();
@@ -35,8 +35,8 @@ public static void Enumerable_with_separator_before_values_does_not_try_to_parse
 
         // Issue #396
         [Theory]
-        [InlineData(ParserMode.Classic)]
-        [InlineData(ParserMode.Getopt)]
+        [InlineData(ParserMode.GetoptParserV1)]
+        [InlineData(ParserMode.GetoptParserV2)]
         public static void Options_with_similar_names_are_not_ambiguous(ParserMode parserMode)
         {
             var args = new[] { "--configure-profile", "deploy", "--profile", "local" };
@@ -68,8 +68,8 @@ public static void Values_with_same_name_as_sequence_option_do_not_cause_later_v
 
         // Issue #454
         [Theory]
-        [InlineData(ParserMode.Classic)]
-        [InlineData(ParserMode.Getopt)]
+        [InlineData(ParserMode.GetoptParserV1)]
+        [InlineData(ParserMode.GetoptParserV2)]
 
         public static void Enumerable_with_colon_separator_before_values_does_not_try_to_parse_too_much(ParserMode parserMode)
         {
@@ -86,8 +86,8 @@ public static void Enumerable_with_colon_separator_before_values_does_not_try_to
 
         // Issue #510
         [Theory]
-        [InlineData(ParserMode.Classic)]
-        [InlineData(ParserMode.Getopt)]
+        [InlineData(ParserMode.GetoptParserV1)]
+        [InlineData(ParserMode.GetoptParserV2)]
 
         public static void Enumerable_before_values_does_not_try_to_parse_too_much(ParserMode parserMode)
         {
@@ -101,8 +101,8 @@ public static void Enumerable_before_values_does_not_try_to_parse_too_much(Parse
 
         // Issue #617
         [Theory]
-        [InlineData(ParserMode.Classic)]
-        [InlineData(ParserMode.Getopt)]
+        [InlineData(ParserMode.GetoptParserV1)]
+        [InlineData(ParserMode.GetoptParserV2)]
 
         public static void Enumerable_with_enum_before_values_does_not_try_to_parse_too_much(ParserMode parserMode)
         {
@@ -119,8 +119,8 @@ public static void Enumerable_with_enum_before_values_does_not_try_to_parse_too_
 
         // Issue #619
         [Theory]
-        [InlineData(ParserMode.Classic)]
-        [InlineData(ParserMode.Getopt)]
+        [InlineData(ParserMode.GetoptParserV1)]
+        [InlineData(ParserMode.GetoptParserV2)]
 
         public static void Separator_just_before_values_does_not_try_to_parse_values(ParserMode parserMode)
         {