remove warning

[mono.git] / mcs / class / corlib / System / UInt16.cs

diff --git a/mcs/class/corlib/System/UInt16.cs b/mcs/class/corlib/System/UInt16.cs
index de5a1df9d2a9468cc4067b9e99c746c10a7c2c70..1ec9734f71afa1c31a0c797866d7afda72836ff3 100644 (file)
--- a/mcs/class/corlib/System/UInt16.cs
+++ b/mcs/class/corlib/System/UInt16.cs
@@ -87,90 +87,6 @@ namespace System
                }
 #endif
 
-               internal static bool Parse (string s, bool tryParse, out ushort result, out Exception exc)
-               {
-                       ushort val = 0;
-                       int len;
-                       int i;
-                       bool digits_seen = false;
-                       bool has_negative_sign = false;
-
-                       result = 0;
-                       exc = null;
-
-                       if (s == null) {
-                               if (!tryParse)
-                                       exc = new ArgumentNullException ("s");
-                               return false;
-                       }
-
-                       len = s.Length;
-
-                       char c;
-                       for (i = 0; i < len; i++) {
-                               c = s [i];
-                               if (!Char.IsWhiteSpace (c))
-                                       break;
-                       }
-
-                       if (i == len) {
-                               if (!tryParse)
-                                       exc = Int32.GetFormatException ();
-                               return false;
-                       }
-
-                       if (s [i] == '+')
-                               i++;
-                       else
-                               if (s[i] == '-') {
-                                       i++;
-                                       has_negative_sign = true;
-                               }
-
-                       for (; i < len; i++) {
-                               c = s [i];
-
-                               if (c >= '0' && c <= '9') {
-                                       ushort d = (ushort) (c - '0');
-
-                                       val = checked ((ushort) (val * 10 + d));
-                                       digits_seen = true;
-                               }
-                               else {
-                                       if (Char.IsWhiteSpace (c)) {
-                                               for (i++; i < len; i++) {
-                                                       if (!Char.IsWhiteSpace (s [i])) {
-                                                               if (!tryParse)
-                                                                       exc = Int32.GetFormatException ();
-                                                               return false;
-                                                       }
-                                               }
-                                               break;
-                                       }
-                                       else {
-                                               if (!tryParse)
-                                                       exc = Int32.GetFormatException ();
-                                               return false;
-                                       }
-                               }
-                       }
-                       if (!digits_seen) {
-                               if (!tryParse)
-                                       exc = Int32.GetFormatException ();
-                               return false;
-                       }
-
-                       // -0 is legal but other negative values are not
-                       if (has_negative_sign && (val > 0)) {
-                               if (!tryParse)
-                                       exc = new OverflowException (
-                                           Locale.GetText ("Negative number"));
-                               return false;
-                       }
-
-                       result = val;
-                       return true;
-               }
 
                [CLSCompliant (false)]
                public static ushort Parse (string s, IFormatProvider provider)
@@ -188,8 +104,8 @@ namespace System
                public static ushort Parse (string s, NumberStyles style, IFormatProvider provider)
                {
                        uint tmpResult = UInt32.Parse (s, style, provider);
-                       if (tmpResult > UInt16.MaxValue || tmpResult < UInt16.MinValue)
-                               throw new OverflowException (Locale.GetText ("Value too large or too small."));
+                       if (tmpResult > UInt16.MaxValue)
+                               throw new OverflowException (Locale.GetText ("Value too large."));
 
                        return (ushort) tmpResult;
                }
@@ -197,26 +113,14 @@ namespace System
                [CLSCompliant(false)]
                public static ushort Parse (string s) 
                {
-                       Exception exc;
-                       ushort res;
-
-                       if (!Parse (s, false, out res, out exc))
-                               throw exc;
-
-                       return res;
+                       return Parse (s, NumberStyles.Number, null);
                }
 
 #if NET_2_0
                [CLSCompliant(false)]
                public static bool TryParse (string s, out ushort result) 
                {
-                       Exception exc;
-                       if (!Parse (s, true, out result, out exc)) {
-                               result = 0;
-                               return false;
-                       }
-
-                       return true;
+                       return TryParse (s, NumberStyles.Integer, null, out result);
                }
 
                [CLSCompliant(false)]
@@ -228,7 +132,7 @@ namespace System
                        if (!UInt32.TryParse (s, style, provider, out tmpResult))
                                return false;
                                
-                       if (tmpResult > UInt16.MaxValue || tmpResult < UInt16.MinValue)
+                       if (tmpResult > UInt16.MaxValue)
                                return false;
                                
                        result = (ushort)tmpResult;