//
using System.Globalization;
+using System.Runtime.CompilerServices;
namespace System {
if (!(v is System.Double))
throw new ArgumentException (Locale.GetText ("Value is not a System.Double"));
- if (IsPositiveInfinity(value) && IsPositiveInfinity((double) v)){
+ double dv = (double)v;
+
+ if (IsPositiveInfinity(value) && IsPositiveInfinity(dv))
return 0;
- }
- if (IsNegativeInfinity(value) && IsNegativeInfinity((double) v)){
+ if (IsNegativeInfinity(value) && IsNegativeInfinity(dv))
return 0;
- }
- if (IsNaN((double) v)) {
+ if (IsNaN(dv))
if (IsNaN(value))
return 0;
else
return 1;
- }
- return (int) (value - ((double) v));
+ if (IsNaN(value))
+ if (IsNaN(dv))
+ return 0;
+ else
+ return -1;
+
+ if (value > dv) return 1;
+ else if (value < dv) return -1;
+ else return 0;
}
public override bool Equals (object o)
return Parse (s, style, null);
}
+ // We're intentionally using constants here to avoid some bigger headaches in mcs.
+ // This struct must be compiled before System.Enum so we can't use enums here.
+ private const int State_AllowSign = 1;
+ private const int State_Digits = 2;
+ private const int State_Decimal = 3;
+ private const int State_ExponentSign = 4;
+ private const int State_Exponent = 5;
+ private const int State_ConsumeWhiteSpace = 6;
+
+ [MonoTODO("check if digits are group in correct numbers between the group separators")]
public static double Parse (string s, NumberStyles style, IFormatProvider provider)
{
if (s == null) throw new ArgumentNullException();
if (s == format.NaNSymbol) return Double.NaN;
if (s == format.PositiveInfinitySymbol) return Double.PositiveInfinity;
if (s == format.NegativeInfinitySymbol) return Double.NegativeInfinity;
- string[] sl;
- long integral = 0;
- long fraction = 0;
- long exponent = 1;
- double retval = 0;
- if ((style & NumberStyles.AllowLeadingWhite) != 0)
- {
- s.TrimStart(null);
+
+ //
+ // validate and prepare string for C
+ //
+ int len = s.Length;
+ byte [] b = new byte [len + 1];
+ int didx = 0;
+ int sidx = 0;
+ char c;
+
+ if ((style & NumberStyles.AllowLeadingWhite) != 0){
+ while (sidx < len && Char.IsWhiteSpace (c = s [sidx]))
+ sidx++;
+
+ if (sidx == len)
+ throw new FormatException();
}
- if ((style & NumberStyles.AllowTrailingWhite) != 0)
- {
- s.TrimEnd(null);
+
+ bool allow_trailing_white = ((style & NumberStyles.AllowTrailingWhite) != 0);
+
+ //
+ // Machine state
+ //
+ int state = State_AllowSign;
+
+ //
+ // Setup
+ //
+ string decimal_separator = null;
+ string group_separator = null;
+ int decimal_separator_len = 0;
+ int group_separator_len = 0;
+ if ((style & NumberStyles.AllowDecimalPoint) != 0){
+ decimal_separator = format.NumberDecimalSeparator;
+ decimal_separator_len = decimal_separator.Length;
}
- sl = s.Split(new Char[] {'e', 'E'}, 2);
- if (sl.Length > 1)
- {
- if ((style & NumberStyles.AllowExponent) == 0)
- {
- throw new FormatException();
- }
- exponent = long.Parse(sl[1], NumberStyles.AllowLeadingSign, format);
+ if ((style & NumberStyles.AllowThousands) != 0){
+ group_separator = format.NumberGroupSeparator;
+ group_separator_len = group_separator.Length;
}
- s = sl[0];
- sl = s.Split(format.NumberDecimalSeparator.ToCharArray(), 2);
- if (sl.Length > 1)
- {
- if ((style & NumberStyles.AllowDecimalPoint) == 0)
- {
- throw new FormatException();
+ string positive = format.PositiveSign;
+ string negative = format.NegativeSign;
+
+ for (; sidx < len; sidx++){
+ c = s [sidx];
+
+ switch (state){
+ case State_AllowSign:
+ if ((style & NumberStyles.AllowLeadingSign) != 0){
+ if (c == positive [0] &&
+ s.Substring (sidx, positive.Length) == positive){
+ state = State_Digits;
+ sidx += positive.Length-1;
+ continue;
+ }
+
+ if (c == negative [0] &&
+ s.Substring (sidx, negative.Length) == negative){
+ state = State_Digits;
+ b [didx++] = (byte) '-';
+ sidx += negative.Length-1;
+ continue;
+ }
+ }
+ state = State_Digits;
+ goto case State_Digits;
+
+ case State_Digits:
+ if (Char.IsDigit (c)){
+ b [didx++] = (byte) c;
+ break;
+ }
+ if (c == 'e' || c == 'E')
+ goto case State_Decimal;
+
+ if (decimal_separator != null &&
+ decimal_separator [0] == c){
+ if (s.Substring (sidx, decimal_separator_len) ==
+ decimal_separator){
+ b [didx++] = (byte) '.';
+ sidx += decimal_separator_len-1;
+ state = State_Decimal;
+ break;
+ }
+ }
+ if (group_separator != null &&
+ group_separator [0] == c){
+ if (s.Substring (sidx, group_separator_len) ==
+ group_separator){
+ sidx += group_separator_len-1;
+ state = State_Digits;
+ break;
+ }
+ }
+
+ if (Char.IsWhiteSpace (c))
+ goto case State_ConsumeWhiteSpace;
+
+ throw new FormatException ("Unknown char: " + c);
+
+ case State_Decimal:
+ if (Char.IsDigit (c)){
+ b [didx++] = (byte) c;
+ break;
+ }
+
+ if (c == 'e' || c == 'E'){
+ if ((style & NumberStyles.AllowExponent) == 0)
+ throw new FormatException ("Unknown char: " + c);
+ b [didx++] = (byte) c;
+ state = State_ExponentSign;
+ break;
+ }
+
+ if (Char.IsWhiteSpace (c))
+ goto case State_ConsumeWhiteSpace;
+ throw new FormatException ("Unknown char: " + c);
+
+ case State_ExponentSign:
+ if (Char.IsDigit (c)){
+ state = State_Exponent;
+ goto case State_Exponent;
+ }
+
+ if (c == positive [0] &&
+ s.Substring (sidx, positive.Length) == positive){
+ state = State_Digits;
+ sidx += positive.Length-1;
+ continue;
+ }
+
+ if (c == negative [0] &&
+ s.Substring (sidx, negative.Length) == negative){
+ state = State_Digits;
+ b [didx++] = (byte) '-';
+ sidx += negative.Length-1;
+ continue;
+ }
+
+ if (Char.IsWhiteSpace (c))
+ goto case State_ConsumeWhiteSpace;
+
+ throw new FormatException ("Unknown char: " + c);
+
+ case State_Exponent:
+ if (Char.IsDigit (c)){
+ b [didx++] = (byte) c;
+ break;
+ }
+
+ if (Char.IsWhiteSpace (c))
+ goto case State_ConsumeWhiteSpace;
+ throw new FormatException ("Unknown char: " + c);
+
+ case State_ConsumeWhiteSpace:
+ if (allow_trailing_white && Char.IsWhiteSpace (c))
+ break;
+ throw new FormatException ("Unknown char");
}
- fraction = long.Parse(sl[1], NumberStyles.None, format);
- }
- NumberStyles tempstyle = NumberStyles.None;
- if ((style & NumberStyles.AllowLeadingSign) != 0){
- tempstyle = NumberStyles.AllowLeadingSign;
}
- integral = long.Parse(sl[0], tempstyle, format);
- retval = fraction;
- while (retval >1) retval /= 10;
- if (integral < 0){
- retval -= integral;
- retval = -retval;
+
+ b [didx] = 0;
+ unsafe {
+ fixed (byte *p = &b [0]){
+ double retVal = ParseImpl (p);
+ if (IsPositiveInfinity(retVal) || IsNegativeInfinity(retVal))
+ throw new OverflowException();
+
+ return retVal;
+ }
}
- else retval += integral;
- if (exponent != 1) retval *= Math.Pow(10, exponent);
- return retval;
}
+ [MethodImplAttribute(MethodImplOptions.InternalCall)]
+ unsafe private static extern double ParseImpl (byte *byte_ptr);
+
public override string ToString ()
{
return ToString (null, null);
[MonoTODO]
public string ToString (string format, IFormatProvider fp)
{
- throw new NotImplementedException ();
+ // FIXME: Need to pass format and provider info to this call too.
+ return ToStringImpl(value);
}
+ [MethodImplAttribute(MethodImplOptions.InternalCall)]
+ private static extern string ToStringImpl (double value);
+
// =========== IConvertible Methods =========== //
public TypeCode GetTypeCode ()
return TypeCode.Double;
}
- public object ToType (Type conversionType, IFormatProvider provider)
+ object IConvertible.ToType (Type conversionType, IFormatProvider provider)
{
return System.Convert.ToType(value, conversionType, provider);
}
- public bool ToBoolean (IFormatProvider provider)
+ bool IConvertible.ToBoolean (IFormatProvider provider)
{
return System.Convert.ToBoolean(value);
}
- public byte ToByte (IFormatProvider provider)
+ byte IConvertible.ToByte (IFormatProvider provider)
{
return System.Convert.ToByte(value);
}
- public char ToChar (IFormatProvider provider)
+ char IConvertible.ToChar (IFormatProvider provider)
{
throw new InvalidCastException();
}
[CLSCompliant(false)]
- public DateTime ToDateTime (IFormatProvider provider)
+ DateTime IConvertible.ToDateTime (IFormatProvider provider)
{
throw new InvalidCastException();
}
- public decimal ToDecimal (IFormatProvider provider)
+ decimal IConvertible.ToDecimal (IFormatProvider provider)
{
return System.Convert.ToDecimal(value);
}
- public double ToDouble (IFormatProvider provider)
+ double IConvertible.ToDouble (IFormatProvider provider)
{
return System.Convert.ToDouble(value);
}
- public short ToInt16 (IFormatProvider provider)
+ short IConvertible.ToInt16 (IFormatProvider provider)
{
return System.Convert.ToInt16(value);
}
- public int ToInt32 (IFormatProvider provider)
+ int IConvertible.ToInt32 (IFormatProvider provider)
{
return System.Convert.ToInt32(value);
}
- public long ToInt64 (IFormatProvider provider)
+ long IConvertible.ToInt64 (IFormatProvider provider)
{
return System.Convert.ToInt64(value);
}
[CLSCompliant(false)]
- public sbyte ToSByte (IFormatProvider provider)
+ sbyte IConvertible.ToSByte (IFormatProvider provider)
{
return System.Convert.ToSByte(value);
}
- public float ToSingle (IFormatProvider provider)
+ float IConvertible.ToSingle (IFormatProvider provider)
{
return System.Convert.ToSingle(value);
}
+/*
string IConvertible.ToString (IFormatProvider provider)
{
return ToString(provider);
}
+*/
[CLSCompliant(false)]
- public ushort ToUInt16 (IFormatProvider provider)
+ ushort IConvertible.ToUInt16 (IFormatProvider provider)
{
return System.Convert.ToUInt16(value);
}
[CLSCompliant(false)]
- public uint ToUInt32 (IFormatProvider provider)
+ uint IConvertible.ToUInt32 (IFormatProvider provider)
{
return System.Convert.ToUInt32(value);
}
[CLSCompliant(false)]
- public ulong ToUInt64 (IFormatProvider provider)
+ ulong IConvertible.ToUInt64 (IFormatProvider provider)
{
return System.Convert.ToUInt64(value);
}