// Miguel de Icaza (miguel@ximian.com)
//
// (C) Ximian, Inc. http://www.ximian.com
+// Copyright (C) 2004 Novell (http://www.novell.com)
+//
+// Permission is hereby granted, free of charge, to any person obtaining
+// a copy of this software and associated documentation files (the
+// "Software"), to deal in the Software without restriction, including
+// without limitation the rights to use, copy, modify, merge, publish,
+// distribute, sublicense, and/or sell copies of the Software, and to
+// permit persons to whom the Software is furnished to do so, subject to
+// the following conditions:
+//
+// The above copyright notice and this permission notice shall be
+// included in all copies or substantial portions of the Software.
+//
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
//
using System.Globalization;
{
[Serializable]
[CLSCompliant (false)]
- public struct UInt16 : IComparable, IFormattable, IConvertible
+#if NET_2_0
+ [System.Runtime.InteropServices.ComVisible (true)]
+#endif
+ public struct UInt16 : IFormattable, IConvertible, IComparable
+#if NET_2_0
+ , IComparable<UInt16>, IEquatable <UInt16>
+#endif
{
public const ushort MaxValue = 0xffff;
public const ushort MinValue = 0;
return m_value;
}
- [CLSCompliant(false)]
- public static ushort Parse (string s)
+#if NET_2_0
+ public int CompareTo (ushort value)
{
- ushort val = 0;
- int len;
- int i;
- bool digits_seen = false;
- bool has_negative_sign = false;
-
- if (s == null)
- throw new ArgumentNullException ("s");
-
- len = s.Length;
-
- char c;
- for (i = 0; i < len; i++) {
- c = s [i];
- if (!Char.IsWhiteSpace (c))
- break;
- }
-
- if (i == len)
- throw new FormatException ();
-
- if (s [i] == '+')
- i++;
+ if (m_value == value)
+ return 0;
+ if (m_value > value)
+ return 1;
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]))
- throw new FormatException ();
- }
- break;
- }
- else
- throw new FormatException ();
- }
- }
- if (!digits_seen)
- throw new FormatException ();
-
- // -0 is legal but other negative values are not
- if (has_negative_sign && (val > 0)) {
- throw new OverflowException (
- Locale.GetText ("Negative number"));
- }
-
- return val;
+ return -1;
+ }
+
+ public bool Equals (ushort value)
+ {
+ return value == m_value;
}
+#endif
+
[CLSCompliant (false)]
public static ushort Parse (string s, IFormatProvider provider)
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;
}
+ [CLSCompliant(false)]
+ public static ushort Parse (string s)
+ {
+ return Parse (s, NumberStyles.Number, null);
+ }
+
+#if NET_2_0
+ [CLSCompliant(false)]
+ public static bool TryParse (string s, out ushort result)
+ {
+ return TryParse (s, NumberStyles.Integer, null, out result);
+ }
+
+ [CLSCompliant(false)]
+ public static bool TryParse (string s, NumberStyles style, IFormatProvider provider, out ushort result)
+ {
+ uint tmpResult;
+ result = 0;
+
+ if (!UInt32.TryParse (s, style, provider, out tmpResult))
+ return false;
+
+ if (tmpResult > UInt16.MaxValue)
+ return false;
+
+ result = (ushort)tmpResult;
+ return true;
+ }
+#endif
+
public override string ToString ()
{
- return ToString (null, null);
+ return NumberFormatter.FormatGeneral (new NumberFormatter.NumberStore (m_value));
}
public string ToString (IFormatProvider provider)
{
- return ToString (null, provider);
+ return NumberFormatter.FormatGeneral (new NumberFormatter.NumberStore (m_value), provider);
}
public string ToString (string format)
public string ToString (string format, IFormatProvider provider)
{
NumberFormatInfo nfi = NumberFormatInfo.GetInstance (provider);
-
- if (format == null)
- format = "G";
-
- return IntegerFormatter.NumberToString (format, nfi, m_value);
+ return NumberFormatter.NumberToString (format, m_value, nfi);
}
// =========== IConvertible Methods =========== //
projects / mono.git / blobdiff