2005-01-31 Zoltan Varga <vargaz@freemail.hu>

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

diff --git a/mcs/class/corlib/System/Single.cs b/mcs/class/corlib/System/Single.cs
index fbddba20a548cc6fcd06b6251f79bbe206c08cda..bd6992946b4c42f3cb5895b6fb9b3514c066d624 100644 (file)
--- a/mcs/class/corlib/System/Single.cs
+++ b/mcs/class/corlib/System/Single.cs
@@ -7,12 +7,38 @@
 // (C) Ximian, Inc.  http://www.ximian.com
 //
 
+//
+// Copyright (C) 2004 Novell, Inc (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;
 
 namespace System
 {
        [Serializable]
        public struct Single : IComparable, IFormattable, IConvertible
+#if NET_2_0
+               , IComparable <float>
+#endif
        {
                public const float Epsilon = 1.4e-45f;
                public const float MaxValue =  3.40282346638528859e38f;
@@ -33,6 +59,24 @@ namespace System
 
                        float fv = (float)v;
 
+                       if (IsPositiveInfinity (m_value) && IsPositiveInfinity (fv))
+                               return 0;
+
+                       if (IsNegativeInfinity (m_value) && IsNegativeInfinity (fv))
+                               return 0;
+
+                       if (IsNaN (fv))
+                               if (IsNaN (m_value))
+                                       return 0;
+                               else
+                                       return 1;
+
+                       if (IsNaN (m_value))
+                               if (IsNaN (fv))
+                                       return 0;
+                               else
+                                       return -1;
+
                        if (this.m_value == fv)
                                return 0;
                        else if (this.m_value > fv)
@@ -46,12 +90,55 @@ namespace System
                        if (!(o is System.Single))
                                return false;
 
+                       if (IsNaN ((float) o)) {
+                               return IsNaN (m_value);
+                       }
+
                        return ((float) o) == m_value;
                }
 
-               public override int GetHashCode ()
+#if NET_2_0
+               public int CompareTo (float value)
+               {
+                       if (IsPositiveInfinity (m_value) && IsPositiveInfinity (value))
+                               return 0;
+
+                       if (IsNegativeInfinity (m_value) && IsNegativeInfinity (value))
+                               return 0;
+
+                       if (IsNaN (value))
+                               if (IsNaN (m_value))
+                                       return 0;
+                               else
+                                       return 1;
+
+                       if (IsNaN (m_value))
+                               if (IsNaN (value))
+                                       return 0;
+                               else
+                                       return -1;
+
+                       if (this.m_value == value)
+                               return 0;
+                       else if (this.m_value > value)
+                               return 1;
+                       else
+                               return -1;
+               }
+
+               public bool Equals (float value)
+               {
+                       if (IsNaN (value))
+                               return IsNaN (m_value);
+
+                       return value == m_value;
+               }
+#endif
+
+               public unsafe override int GetHashCode ()
                {
-                       return (int) m_value;
+                       float f = m_value;
+                       return *((int*)&f);
                }
 
                public static bool IsInfinity (float f)