Addressed code review + remote merge

Author: zii-dmg

src/CommandLine/Core/InstanceBuilder.cs

@@ -67,7 +67,7 @@ public static ParserResult<T> Build<T>(
 
                 var valueSpecPropsResult =
                     ValueMapper.MapValues(
-                        (from pt in specProps where pt.Specification.IsValue() select pt),
+                        (from pt in specProps where pt.Specification.IsValue() orderby ((ValueSpecification)pt.Specification).Index select pt),
                         valuesPartition,
                         (vals, type, isScalar) => TypeConverter.ChangeType(vals, type, isScalar, parsingCulture, ignoreValueCase));
 

src/CommandLine/Core/TokenPartitioner.cs

@@ -28,7 +28,7 @@ public static
                 .Where(t => !scalars.Contains(t, ReferenceEqualityComparer.Default))
                 .Where(t => !sequences.Contains(t, ReferenceEqualityComparer.Default)).Memorize();
             var values = nonOptions.Where(v => v.IsValue()).Memorize();
-            var errors = nonOptions.Except(values, ReferenceEqualityComparer.Default).Cast<Token>().Memorize();
+            var errors = nonOptions.Except(values, (IEqualityComparer<Token>)ReferenceEqualityComparer.Default).Memorize();
 
             return Tuple.Create(
                     KeyValuePairHelper.ForSwitch(switches)

src/CommandLine/Infrastructure/ReferenceEqualityComparer.cs

@@ -13,7 +13,7 @@ internal sealed class ReferenceEqualityComparer : IEqualityComparer, IEqualityCo
 
         public new bool Equals(object x, object y)
         {
-            return x == y; // reference equality because operator== is static and resolved at compile-time
+            return ReferenceEquals(x, y);
         }
 
         public int GetHashCode(object obj)

tests/CommandLine.Tests/CommandLine.Tests.csproj

@@ -62,6 +62,7 @@
     <Compile Include="Fakes\Options_With_Guid.cs" />
     <Compile Include="Fakes\Options_With_Option_And_Value_Of_String_Type.cs" />
     <Compile Include="Fakes\Options_With_SetName_That_Ends_With_Previous_SetName.cs" />
+    <Compile Include="Fakes\Options_With_Shuffled_Index_Values.cs" />
     <Compile Include="Fakes\Options_With_Uri_And_SimpleType.cs" />
     <Compile Include="Fakes\Options_With_Switches.cs" />
     <Compile Include="Fakes\Options_With_Two_Option_Required_Set_To_True_And_Two_Sets.cs" />

tests/CommandLine.Tests/Fakes/Options_With_Shuffled_Index_Values.cs

@@ -0,0 +1,19 @@
+// Copyright 2005-2015 Giacomo Stelluti Scala & Contributors. All rights reserved. See License.md in the project root for license information.
+
+using System;
+using System.Linq;
+
+namespace CommandLine.Tests.Fakes
+{
+    class Options_With_Shuffled_Index_Values
+    {
+        [Value(1)]
+        public string Arg1 { get; set; }
+
+        [Value(2)]
+        public string Arg2 { get; set; }
+
+        [Value(0)]
+        public string Arg0 { get; set; }
+    }
+}

tests/CommandLine.Tests/Unit/ParserTests.cs

@@ -833,5 +833,19 @@ public void Parse_verb_with_same_option_and_value_args()
                     Assert.Equal("arg", args.PosValue);
                 });
         }
+
+        public void Parse_options_with_shuffled_index_values()
+        {
+            var parser = Parser.Default;
+            parser.ParseArguments<Options_With_Shuffled_Index_Values>(
+                new[] { "zero", "one", "two" })
+                .WithNotParsed(errors => { throw new InvalidOperationException("Must be parsed."); })
+                .WithParsed(args =>
+                {
+                    Assert.Equal("zero", args.Arg0);
+                    Assert.Equal("one", args.Arg1);
+                    Assert.Equal("two", args.Arg2);
+                });
+        }
     }
 }