Changeset 14967 for lang/csharp

Timestamp:

07/01/08 03:18:10 (5 months ago)

Author:

mayuki

Message:

ちょこっと修正とテストっぽい物を追加。

Location:

lang/csharp/CommandLineParser

Files:

• CommandLineParser.sln (modified) (2 diffs)
• CommandLineParser/CommandLineParser.cs (modified) (3 diffs)
• CommandLineParserTest (added)
• CommandLineParserTest/AuthoringTests.txt (added)
• CommandLineParserTest/CommandLineParserTest.csproj (added)
• CommandLineParserTest/Properties (added)
• CommandLineParserTest/Properties/AssemblyInfo.cs (added)
• CommandLineParserTest/UnitTest1.cs (added)

lang/csharp/CommandLineParser/CommandLineParser.sln

@@ -6 +6 @@
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Sample", "Sample\Sample.csproj", "{6D08D680-D1F4-4FF3-8598-5EACEFCB6B71}"
 EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "CommandLineParserTest", "CommandLineParserTest\CommandLineParserTest.csproj", "{1138FFD8-09C8-4F6E-92F1-E35AC8AB04AC}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{646A3556-EC2F-4816-BAAC-56FA3CD80A79}"
+        ProjectSection(SolutionItems) = preProject
+                CommandLineParser.vsmdi = CommandLineParser.vsmdi
+                LocalTestRun.testrunconfig = LocalTestRun.testrunconfig
+        EndProjectSection
+EndProject
 Global
+        GlobalSection(TestCaseManagementSettings) = postSolution
+                CategoryFile = CommandLineParser.vsmdi
+        EndGlobalSection
         GlobalSection(SolutionConfigurationPlatforms) = preSolution
                 Debug|Any CPU = Debug|Any CPU
@@ -20 +31 @@
                 {6D08D680-D1F4-4FF3-8598-5EACEFCB6B71}.Release|Any CPU.ActiveCfg = Release|Any CPU
                 {6D08D680-D1F4-4FF3-8598-5EACEFCB6B71}.Release|Any CPU.Build.0 = Release|Any CPU
+                {1138FFD8-09C8-4F6E-92F1-E35AC8AB04AC}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+                {1138FFD8-09C8-4F6E-92F1-E35AC8AB04AC}.Debug|Any CPU.Build.0 = Debug|Any CPU
+                {1138FFD8-09C8-4F6E-92F1-E35AC8AB04AC}.Release|Any CPU.ActiveCfg = Release|Any CPU
+                {1138FFD8-09C8-4F6E-92F1-E35AC8AB04AC}.Release|Any CPU.Build.0 = Release|Any CPU
         EndGlobalSection
         GlobalSection(SolutionProperties) = preSolution

lang/csharp/CommandLineParser/CommandLineParser/CommandLineParser.cs

@@ -169 +169 @@
                 
                 String[] parts = args[i].Split(ValueParamDelimiter, 2);
-                String memberName = (DelimiterizeAndToLowerCase ? ToUpperCamelCase(parts[0]) : parts[0].Substring(Prefix.Length));
+                parts[0] = parts[0].Substring(Prefix.Length);
+                String memberName = (DelimiterizeAndToLowerCase ? ToUpperCamelCase(parts[0]) : parts[0]);
 
                 // Help
@@ -175 +176 @@
                     return default(T);
                 
-                if (!_availableOptions.ContainsKey(memberName))
+                if (!_availableOptions.ContainsKey(memberName) && !_availableOptions.ContainsKey(parts[0]))
                 {
                     //Debug.WriteLine(String.Format("Unknown option '{0}'", parts[0]));
@@ -182 +183 @@
                 }
 
-                PropertyInfo optionProperty = _availableOptions[memberName];
+                PropertyInfo optionProperty = _availableOptions[_availableOptions.ContainsKey(memberName) ? memberName : parts[0]];
                 if (parts.Length == 1)
                 {