X-Git-Url: http://wien.tomnetworks.com/gitweb/?a=blobdiff_plain;f=mcs%2Fclass%2Fcorlib%2FSystem%2FInt64.cs;h=09538f8ea6e59eca30c9301f37bdd7552e96d617;hb=60979ce4a41d1be8f9d3d4d38162c0803207b4d5;hp=968c50ba5bdd0aeebbb0daf620b8b97c25925c93;hpb=e514e8522dfefc68b5f7fbc232acd0c0495a90da;p=mono.git diff --git a/mcs/class/corlib/System/Int64.cs b/mcs/class/corlib/System/Int64.cs index 968c50ba5bd..09538f8ea6e 100644 --- a/mcs/class/corlib/System/Int64.cs +++ b/mcs/class/corlib/System/Int64.cs @@ -1,12 +1,13 @@ // // System.Int64.cs // -// Author: +// Authors: // Miguel de Icaza (miguel@ximian.com) +// Marek Safar (marek.safar@gmail.com) // // (C) Ximian, Inc. http://www.ximian.com -// // Copyright (C) 2004 Novell, Inc (http://www.novell.com) +// Copyright (C) 2012 Xamarin Inc (http://www.xamarin.com) // // Permission is hereby granted, free of charge, to any person obtaining // a copy of this software and associated documentation files (the @@ -34,13 +35,8 @@ using System.Threading; namespace System { [Serializable] -#if NET_2_0 [System.Runtime.InteropServices.ComVisible (true)] -#endif - public struct Int64 : IFormattable, IConvertible, IComparable -#if NET_2_0 - , IComparable, IEquatable -#endif + public struct Int64 : IFormattable, IConvertible, IComparable, IComparable, IEquatable { public const long MaxValue = 0x7fffffffffffffff; @@ -77,7 +73,6 @@ namespace System { return (int)(m_value & 0xffffffff) ^ (int)(m_value >> 32); } -#if NET_2_0 public int CompareTo (long value) { if (m_value == value) @@ -92,18 +87,17 @@ namespace System { { return obj == m_value; } -#endif internal static bool Parse (string s, bool tryParse, out long result, out Exception exc) { long val = 0; int len; - int i; - int sign = 1; + int i, sign = 1; bool digits_seen = false; result = 0; exc = null; + NumberFormatInfo nfi = Thread.CurrentThread.CurrentCulture.NumberFormat; if (s == null) { if (!tryParse) @@ -126,12 +120,11 @@ namespace System { return false; } - c = s [i]; - if (c == '+') - i++; - else if (c == '-'){ + if (String.Compare (s, i, nfi.PositiveSign, 0, nfi.PositiveSign.Length) == 0) + i += nfi.PositiveSign.Length; + else if (String.Compare (s, i, nfi.NegativeSign, 0, nfi.NegativeSign.Length) == 0) { sign = -1; - i++; + i += nfi.NegativeSign.Length; } for (; i < len; i++){ @@ -159,11 +152,9 @@ namespace System { } else val = val * 10 + d; - digits_seen = true; } else if (!Int32.ProcessTrailingWhitespace (tryParse, s, i, ref exc)) return false; - } if (!digits_seen) { if (!tryParse) @@ -207,17 +198,16 @@ namespace System { if (s.Length == 0) { if (!tryParse) - exc = new FormatException ("Input string was not " + - "in the correct format: s.Length==0."); + exc = Int32.GetFormatException (); return false; } - NumberFormatInfo nfi; + NumberFormatInfo nfi = null; if (fp != null) { Type typeNFI = typeof (System.Globalization.NumberFormatInfo); nfi = (NumberFormatInfo) fp.GetFormat (typeNFI); - } - else + } + if (nfi == null) nfi = Thread.CurrentThread.CurrentCulture.NumberFormat; if (!Int32.CheckStyle (style, tryParse, ref exc)) @@ -232,6 +222,7 @@ namespace System { bool AllowLeadingSign = (style & NumberStyles.AllowLeadingSign) != 0; bool AllowTrailingWhite = (style & NumberStyles.AllowTrailingWhite) != 0; bool AllowLeadingWhite = (style & NumberStyles.AllowLeadingWhite) != 0; + bool AllowExponent = (style & NumberStyles.AllowExponent) != 0; int pos = 0; @@ -255,14 +246,13 @@ namespace System { if (s.Substring (pos, nfi.NegativeSign.Length) == nfi.NegativeSign) { if (!tryParse) - exc = new FormatException ("Input string was not in the correct " + - "format: Has Negative Sign."); + exc = Int32.GetFormatException (); return false; } + if (s.Substring (pos, nfi.PositiveSign.Length) == nfi.PositiveSign) { if (!tryParse) - exc = new FormatException ("Input string was not in the correct " + - "format: Has Positive Sign."); + exc = Int32.GetFormatException (); return false; } } @@ -303,7 +293,7 @@ namespace System { long number = 0; int nDigits = 0; - bool decimalPointFound = false; + int decimalPointPos = -1; int digitValue; char hexDigit; @@ -315,18 +305,20 @@ namespace System { (Int32.FindOther (ref pos, s, nfi.NumberGroupSeparator) || Int32.FindOther (ref pos, s, nfi.CurrencyGroupSeparator))) continue; - else - if (!decimalPointFound && AllowDecimalPoint && + + if (AllowDecimalPoint && decimalPointPos < 0 && (Int32.FindOther (ref pos, s, nfi.NumberDecimalSeparator) || Int32.FindOther (ref pos, s, nfi.CurrencyDecimalSeparator))) { - decimalPointFound = true; + decimalPointPos = nDigits; continue; } break; } - else if (AllowHexSpecifier) { - nDigits++; + + nDigits++; + + if (AllowHexSpecifier) { hexDigit = s [pos++]; if (Char.IsDigit (hexDigit)) digitValue = (int) (hexDigit - '0'); @@ -345,64 +337,47 @@ namespace System { exc = e; return false; } - } - else if (decimalPointFound) { - nDigits++; - // Allows decimal point as long as it's only - // followed by zeroes. - if (s [pos++] != '0') { - if (!tryParse) - exc = new OverflowException ("Value too large or too " + - "small."); - return false; - } - } - else { - nDigits++; - try { - // Calculations done as negative - // (abs (MinValue) > abs (MaxValue)) - number = checked ( - number * 10 - - (long) (s [pos++] - '0') - ); - } catch (OverflowException) { - if (!tryParse) - exc = new OverflowException ("Value too large or too " + - "small."); - return false; - } + continue; } + + try { + // Calculations done as negative + // (abs (MinValue) > abs (MaxValue)) + number = checked (number * 10 - (long) (s [pos++] - '0')); + } catch (OverflowException) { + if (!tryParse) + exc = new OverflowException ("Value too large or too small."); + return false; + } } while (pos < s.Length); // Post number stuff if (nDigits == 0) { if (!tryParse) - exc = new FormatException ("Input string was not in the correct format: nDigits == 0."); + exc = Int32.GetFormatException (); return false; } + int exponent = 0; + if (AllowExponent) + if (Int32.FindExponent (ref pos, s, ref exponent, tryParse, ref exc) && exc != null) + return false; + if (AllowTrailingSign && !foundSign) { // Sign + Currency Int32.FindSign (ref pos, s, nfi, ref foundSign, ref negative); - if (foundSign) { + if (foundSign && pos < s.Length) { if (AllowTrailingWhite && !Int32.JumpOverWhite (ref pos, s, true, tryParse, ref exc)) return false; - if (AllowCurrencySymbol) - Int32.FindCurrency (ref pos, s, nfi, - ref foundCurrency); } } if (AllowCurrencySymbol && !foundCurrency) { + if (AllowTrailingWhite && pos < s.Length && !Int32.JumpOverWhite (ref pos, s, false, tryParse, ref exc)) + return false; + // Currency + sign - if (nfi.CurrencyPositivePattern == 3 && s[pos++] != ' ') - if (tryParse) - return false; - else - throw new FormatException ("Input string was not in the correct format: no space between number and currency symbol."); - Int32.FindCurrency (ref pos, s, nfi, ref foundCurrency); if (foundCurrency && pos < s.Length) { if (AllowTrailingWhite && !Int32.JumpOverWhite (ref pos, s, true, tryParse, ref exc)) @@ -419,8 +394,7 @@ namespace System { if (foundOpenParentheses) { if (pos >= s.Length || s [pos++] != ')') { if (!tryParse) - exc = new FormatException ("Input string was not in the correct " + - "format: No room for close parens."); + exc = Int32.GetFormatException (); return false; } if (AllowTrailingWhite && pos < s.Length && !Int32.JumpOverWhite (ref pos, s, false, tryParse, ref exc)) @@ -429,12 +403,10 @@ namespace System { if (pos < s.Length && s [pos] != '\u0000') { if (!tryParse) - exc = new FormatException ("Input string was not in the correct format: Did not parse entire string. pos = " - + pos + " s.Length = " + s.Length); + exc = Int32.GetFormatException (); return false; } - if (!negative && !AllowHexSpecifier){ try { number = checked (-number); @@ -445,6 +417,36 @@ namespace System { } } + if (decimalPointPos >= 0) + exponent = exponent - nDigits + decimalPointPos; + + if (exponent < 0) { + // + // Any non-zero values after decimal point are not allowed + // + long remainder; + number = Math.DivRem (number, (long) Math.Pow (10, -exponent), out remainder); + if (remainder != 0) { + if (!tryParse) + exc = new OverflowException ("Value too large or too small."); + return false; + } + } else if (exponent > 0) { + // + // result *= 10^exponent + // + // Reduce the risk of throwing an overflow exc + // + double res = checked (Math.Pow (10, exponent) * number); + if (res < MinValue || res > MaxValue) { + if (!tryParse) + exc = new OverflowException ("Value too large or too small."); + return false; + } + + number = (long)res; + } + result = number; return true; } @@ -471,7 +473,6 @@ namespace System { return res; } -#if NET_2_0 public static bool TryParse (string s, out long result) { Exception exc; @@ -493,7 +494,6 @@ namespace System { return true; } -#endif public override string ToString () { @@ -564,65 +564,39 @@ namespace System { long IConvertible.ToInt64 (IFormatProvider provider) { - return System.Convert.ToInt64 (m_value); + return m_value; } -#if ONLY_1_1 -#pragma warning disable 3019 - [CLSCompliant (false)] -#endif sbyte IConvertible.ToSByte (IFormatProvider provider) { return System.Convert.ToSByte (m_value); } -#if ONLY_1_1 -#pragma warning restore 3019 -#endif float IConvertible.ToSingle (IFormatProvider provider) { return System.Convert.ToSingle (m_value); } - object IConvertible.ToType (Type type, IFormatProvider provider) + object IConvertible.ToType (Type targetType, IFormatProvider provider) { - return System.Convert.ToType (m_value, type, provider, false); + if (targetType == null) + throw new ArgumentNullException ("targetType"); + return System.Convert.ToType (m_value, targetType, provider, false); } -#if ONLY_1_1 -#pragma warning disable 3019 - [CLSCompliant (false)] -#endif ushort IConvertible.ToUInt16 (IFormatProvider provider) { return System.Convert.ToUInt16 (m_value); } -#if ONLY_1_1 -#pragma warning restore 3019 -#endif -#if ONLY_1_1 -#pragma warning disable 3019 - [CLSCompliant (false)] -#endif uint IConvertible.ToUInt32 (IFormatProvider provider) { return System.Convert.ToUInt32 (m_value); } -#if ONLY_1_1 -#pragma warning restore 3019 -#endif -#if ONLY_1_1 -#pragma warning disable 3019 - [CLSCompliant (false)] -#endif ulong IConvertible.ToUInt64 (IFormatProvider provider) { return System.Convert.ToUInt64 (m_value); } -#if ONLY_1_1 -#pragma warning restore 3019 -#endif } }