Merge pull request #401 from zii-dmg/same-value-option-arg

Fix for no value if [Option] arg equals to [Value] arg

Author: nemec

src/CommandLine/CommandLine.csproj

@@ -84,6 +84,7 @@
  <CompileInclude="Infrastructure\ExceptionExtensions.cs" />
  <CompileInclude="Infrastructure\FSharpOptionHelper.cs" />
  <CompileInclude="Infrastructure\PopsicleSetter.cs" />
+ <CompileInclude="Infrastructure\ReferenceEqualityComparer.cs" />
  <CompileInclude="Infrastructure\ReflectionHelper.cs" />
  <CompileInclude="Infrastructure\ResultExtensions.cs" />
  <CompileInclude="Infrastructure\StringExtensions.cs" />

src/CommandLine/Core/TokenPartitioner.cs

@@ -3,6 +3,7 @@
 usingSystem;
 usingSystem.Collections.Generic;
 usingSystem.Linq;
+usingCommandLine.Infrastructure;
 usingCSharpx;
 
 namespaceCommandLine.Core
@@ -23,11 +24,11 @@ public static
 varscalars=Scalar.Partition(tokenList,typeLookup).Memorize();
 varsequences=Sequence.Partition(tokenList,typeLookup).Memorize();
 varnonOptions=tokenList
-.Where(t =>!switches.Contains(t))
-.Where(t =>!scalars.Contains(t))
-.Where(t =>!sequences.Contains(t)).Memorize();
+.Where(t =>!switches.Contains(t,ReferenceEqualityComparer.Default))
+.Where(t =>!scalars.Contains(t,ReferenceEqualityComparer.Default))
+.Where(t =>!sequences.Contains(t,ReferenceEqualityComparer.Default)).Memorize();
 varvalues=nonOptions.Where(v =>v.IsValue()).Memorize();
-varerrors=nonOptions.Except(values).Memorize();
+varerrors=nonOptions.Except(values,(IEqualityComparer<Token>)ReferenceEqualityComparer.Default).Memorize();
 
 returnTuple.Create(
 KeyValuePairHelper.ForSwitch(switches)

src/CommandLine/Infrastructure/ReferenceEqualityComparer.cs

@@ -0,0 +1,24 @@
+// Copyright 2005-2015 Giacomo Stelluti Scala & Contributors. All rights reserved. See License.md in the project root for license information.
+
+usingSystem;
+usingSystem.Collections;
+usingSystem.Collections.Generic;
+usingSystem.Runtime.CompilerServices;
+
+namespaceCommandLine.Infrastructure
+{
+internalsealedclassReferenceEqualityComparer:IEqualityComparer,IEqualityComparer<object>
+{
+publicstaticreadonlyReferenceEqualityComparerDefault=newReferenceEqualityComparer();
+
+publicnewboolEquals(objectx,objecty)
+{
+returnReferenceEquals(x,y);
+}
+
+publicintGetHashCode(objectobj)
+{
+returnRuntimeHelpers.GetHashCode(obj);
+}
+}
+}

tests/CommandLine.Tests/CommandLine.Tests.csproj

@@ -60,6 +60,7 @@
  <CompileInclude="CultureInfoExtensions.cs" />
  <CompileInclude="Fakes\Options_With_Default_Set_To_Sequence.cs" />
  <CompileInclude="Fakes\Options_With_Guid.cs" />
+ <CompileInclude="Fakes\Options_With_Option_And_Value_Of_String_Type.cs" />
  <CompileInclude="Fakes\Options_With_SetName_That_Ends_With_Previous_SetName.cs" />
  <CompileInclude="Fakes\Options_With_Shuffled_Index_Values.cs" />
  <CompileInclude="Fakes\Options_With_Uri_And_SimpleType.cs" />

tests/CommandLine.Tests/Fakes/Options_With_Option_And_Value_Of_String_Type.cs

@@ -0,0 +1,16 @@
+// Copyright 2005-2015 Giacomo Stelluti Scala & Contributors. All rights reserved. See License.md in the project root for license information.
+
+usingSystem;
+usingSystem.Linq;
+
+namespaceCommandLine.Tests.Fakes
+{
+classOptions_With_Option_And_Value_Of_String_Type
+{
+[Option('o',"opt")]
+publicstringOptValue{get;set;}
+
+[Value(0)]
+publicstringPosValue{get;set;}
+}
+}

tests/CommandLine.Tests/Fakes/Verb_Fakes.cs

@@ -75,4 +75,14 @@ class Derived_Verb : Base_Class_For_Verb
 HelpText="Allow adding otherwise ignored files.")]
 publicboolForce{get;set;}
 }
+
+[Verb("test")]
+classVerb_With_Option_And_Value_Of_String_Type
+{
+[Option('o',"opt")]
+publicstringOptValue{get;set;}
+
+[Value(0)]
+publicstringPosValue{get;set;}
+}
 }

tests/CommandLine.Tests/Unit/ParserTests.cs

@@ -805,6 +805,35 @@ public class NullDefaultCommandLineArguments
 }
 
 [Fact]
+publicvoidParse_options_with_same_option_and_value_args()
+{
+varparser=Parser.Default;
+parser.ParseArguments<Options_With_Option_And_Value_Of_String_Type>(
+new[]{"arg","-o","arg"})
+.WithNotParsed(errors =>{thrownewInvalidOperationException("Must be parsed.");})
+.WithParsed(args =>
+{
+Assert.Equal("arg",args.OptValue);
+Assert.Equal("arg",args.PosValue);
+});
+}
+
+[Fact]
+publicvoidParse_verb_with_same_option_and_value_args()
+{
+varparser=Parser.Default;
+varresult=parser.ParseArguments(
+new[]{"test","arg","-o","arg"},
+typeof(Verb_With_Option_And_Value_Of_String_Type));
+result
+.WithNotParsed(errors =>{thrownewInvalidOperationException("Must be parsed.");})
+.WithParsed<Verb_With_Option_And_Value_Of_String_Type>(args =>
+{
+Assert.Equal("arg",args.OptValue);
+Assert.Equal("arg",args.PosValue);
+});
+}
+
 publicvoidParse_options_with_shuffled_index_values()
 {
 varparser=Parser.Default;