Changeset 14987 for lang/csharp

Timestamp:

07/01/08 15:36:49 (5 months ago)

Author:

mayuki

Message:

DefaultValue?(null)の時に正しく設定できなかったのを修正した。

Files:

• lang/csharp/CommandLineParser/CommandLineParser/CommandLineParser.cs (modified) (4 diffs)

lang/csharp/CommandLineParser/CommandLineParser/CommandLineParser.cs

@@ -79 +79 @@
                 foreach (String optName in GetOptionNames(pi))
                     _availableOptions.Add(optName, pi);
-                
-                if (GetDefaultValue(pi) == null)
+
+                Object defaultValue;
+                if (!GetDefaultValue(pi, out defaultValue))
                 {
                     _mandatoryOptions.Add(pi.Name);
@@ -100 +101 @@
                     continue;
 
-                Object defaultValue = GetDefaultValue(pi);
-                String defaultOrRequired = (defaultValue == null ? "(Required)" : "(Default: " + defaultValue.ToString() + ")");
+                Object defaultValue;
+                Boolean hasDefaultValue = GetDefaultValue(pi, out defaultValue);
+                String defaultOrRequired = (hasDefaultValue ? "(Required)" : "(Default: " + defaultValue.ToString() + ")");
                 String[] optionNames = GetOptionNames(pi);
                 String optionName = (DelimiterizeAndToLowerCase ? ToLowerAndDelimiterize(optionNames[0]) : optionNames[0]);
@@ -225 +227 @@
             foreach (PropertyInfo pi in _availableOptions.Values)
             {
-                Object value = GetDefaultValue(pi);
-                if (pi != null)
-                    pi.SetValue(returnValue, value, null);
+                Object defaultValue;
+                if (GetDefaultValue(pi, out defaultValue))
+                    pi.SetValue(returnValue, defaultValue, null);
             }
             return returnValue;
@@ -268 +270 @@
         }
 
-        private static Object GetDefaultValue(MemberInfo memberInfo)
+        private static Boolean GetDefaultValue(MemberInfo memberInfo, out Object value)
         {
             Object[] attrs = memberInfo.GetCustomAttributes(typeof(DefaultValueAttribute), true);
             if (attrs.Length == 0)
-                return null;
+            {
+                value = null;
+                return false;
+            }
 
             DefaultValueAttribute attr = attrs[0] as DefaultValueAttribute;
-            return attr.Value;
+            value = attr.Value;
+            return true;
         }