From: Krzysztof Wicher Date: Tue, 26 Mar 2019 02:13:42 +0000 (-0700) Subject: Nullable: Int32 (#23443) X-Git-Tag: accepted/tizen/unified/20190813.215958~54^2~70 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=e0362db668b468925190ad3ff9f0a6f2b4c7a539;p=platform%2Fupstream%2Fcoreclr.git Nullable: Int32 (#23443) * Nullable: Int32 * remove restore and move nullable up front * remove trailing \n after #nullable to make it easier to remove later --- diff --git a/src/System.Private.CoreLib/shared/System/Int32.cs b/src/System.Private.CoreLib/shared/System/Int32.cs index 0688f89..8fe2c96 100644 --- a/src/System.Private.CoreLib/shared/System/Int32.cs +++ b/src/System.Private.CoreLib/shared/System/Int32.cs @@ -2,6 +2,7 @@ // The .NET Foundation licenses this file to you under the MIT license. // See the LICENSE file in the project root for more information. +#nullable enable using System.Globalization; using System.Runtime.CompilerServices; using System.Runtime.InteropServices; @@ -20,15 +21,15 @@ namespace System public const int MinValue = unchecked((int)0x80000000); // Compares this object to another object, returning an integer that - // indicates the relationship. + // indicates the relationship. // Returns : // 0 if the values are equal // Negative number if _value is less than value // Positive number if _value is more than value // null is considered to be less than any instance, hence returns positive number // If object is not of type Int32, this method throws an ArgumentException. - // - public int CompareTo(object value) + // + public int CompareTo(object? value) { if (value == null) { @@ -55,7 +56,7 @@ namespace System return 0; } - public override bool Equals(object obj) + public override bool Equals(object? obj) { if (!(obj is int)) { @@ -81,22 +82,22 @@ namespace System return Number.FormatInt32(m_value, null, null); } - public string ToString(string format) + public string ToString(string? format) { return Number.FormatInt32(m_value, format, null); } - public string ToString(IFormatProvider provider) + public string ToString(IFormatProvider? provider) { return Number.FormatInt32(m_value, null, provider); } - public string ToString(string format, IFormatProvider provider) + public string ToString(string? format, IFormatProvider? provider) { return Number.FormatInt32(m_value, format, provider); } - public bool TryFormat(Span destination, out int charsWritten, ReadOnlySpan format = default, IFormatProvider provider = null) + public bool TryFormat(Span destination, out int charsWritten, ReadOnlySpan format = default, IFormatProvider? provider = null) { return Number.TryFormatInt32(m_value, format, provider, destination, out charsWritten); } @@ -115,27 +116,27 @@ namespace System } // Parses an integer from a String in the given style. If - // a NumberFormatInfo isn't specified, the current culture's + // a NumberFormatInfo isn't specified, the current culture's // NumberFormatInfo is assumed. - // - public static int Parse(string s, IFormatProvider provider) + // + public static int Parse(string s, IFormatProvider? provider) { if (s == null) ThrowHelper.ThrowArgumentNullException(ExceptionArgument.s); return Number.ParseInt32(s, NumberStyles.Integer, NumberFormatInfo.GetInstance(provider)); } // Parses an integer from a String in the given style. If - // a NumberFormatInfo isn't specified, the current culture's + // a NumberFormatInfo isn't specified, the current culture's // NumberFormatInfo is assumed. - // - public static int Parse(string s, NumberStyles style, IFormatProvider provider) + // + public static int Parse(string s, NumberStyles style, IFormatProvider? provider) { NumberFormatInfo.ValidateParseStyleInteger(style); if (s == null) ThrowHelper.ThrowArgumentNullException(ExceptionArgument.s); return Number.ParseInt32(s, style, NumberFormatInfo.GetInstance(provider)); } - public static int Parse(ReadOnlySpan s, NumberStyles style = NumberStyles.Integer, IFormatProvider provider = null) + public static int Parse(ReadOnlySpan s, NumberStyles style = NumberStyles.Integer, IFormatProvider? provider = null) { NumberFormatInfo.ValidateParseStyleInteger(style); return Number.ParseInt32(s, style, NumberFormatInfo.GetInstance(provider)); @@ -143,8 +144,8 @@ namespace System // Parses an integer from a String. Returns false rather // than throwing exceptin if input is invalid - // - public static bool TryParse(string s, out int result) + // + public static bool TryParse(string? s, out int result) { if (s == null) { @@ -162,8 +163,8 @@ namespace System // Parses an integer from a String in the given style. Returns false rather // than throwing exceptin if input is invalid - // - public static bool TryParse(string s, NumberStyles style, IFormatProvider provider, out int result) + // + public static bool TryParse(string? s, NumberStyles style, IFormatProvider? provider, out int result) { NumberFormatInfo.ValidateParseStyleInteger(style); @@ -176,7 +177,7 @@ namespace System return Number.TryParseInt32(s, style, NumberFormatInfo.GetInstance(provider), out result) == Number.ParsingStatus.OK; } - public static bool TryParse(ReadOnlySpan s, NumberStyles style, IFormatProvider provider, out int result) + public static bool TryParse(ReadOnlySpan s, NumberStyles style, IFormatProvider? provider, out int result) { NumberFormatInfo.ValidateParseStyleInteger(style); return Number.TryParseInt32(s, style, NumberFormatInfo.GetInstance(provider), out result) == Number.ParsingStatus.OK; @@ -184,84 +185,84 @@ namespace System // // IConvertible implementation - // + // public TypeCode GetTypeCode() { return TypeCode.Int32; } - bool IConvertible.ToBoolean(IFormatProvider provider) + bool IConvertible.ToBoolean(IFormatProvider? provider) { return Convert.ToBoolean(m_value); } - char IConvertible.ToChar(IFormatProvider provider) + char IConvertible.ToChar(IFormatProvider? provider) { return Convert.ToChar(m_value); } - sbyte IConvertible.ToSByte(IFormatProvider provider) + sbyte IConvertible.ToSByte(IFormatProvider? provider) { return Convert.ToSByte(m_value); } - byte IConvertible.ToByte(IFormatProvider provider) + byte IConvertible.ToByte(IFormatProvider? provider) { return Convert.ToByte(m_value); } - short IConvertible.ToInt16(IFormatProvider provider) + short IConvertible.ToInt16(IFormatProvider? provider) { return Convert.ToInt16(m_value); } - ushort IConvertible.ToUInt16(IFormatProvider provider) + ushort IConvertible.ToUInt16(IFormatProvider? provider) { return Convert.ToUInt16(m_value); } - int IConvertible.ToInt32(IFormatProvider provider) + int IConvertible.ToInt32(IFormatProvider? provider) { return m_value; } - uint IConvertible.ToUInt32(IFormatProvider provider) + uint IConvertible.ToUInt32(IFormatProvider? provider) { return Convert.ToUInt32(m_value); } - long IConvertible.ToInt64(IFormatProvider provider) + long IConvertible.ToInt64(IFormatProvider? provider) { return Convert.ToInt64(m_value); } - ulong IConvertible.ToUInt64(IFormatProvider provider) + ulong IConvertible.ToUInt64(IFormatProvider? provider) { return Convert.ToUInt64(m_value); } - float IConvertible.ToSingle(IFormatProvider provider) + float IConvertible.ToSingle(IFormatProvider? provider) { return Convert.ToSingle(m_value); } - double IConvertible.ToDouble(IFormatProvider provider) + double IConvertible.ToDouble(IFormatProvider? provider) { return Convert.ToDouble(m_value); } - decimal IConvertible.ToDecimal(IFormatProvider provider) + decimal IConvertible.ToDecimal(IFormatProvider? provider) { return Convert.ToDecimal(m_value); } - DateTime IConvertible.ToDateTime(IFormatProvider provider) + DateTime IConvertible.ToDateTime(IFormatProvider? provider) { throw new InvalidCastException(SR.Format(SR.InvalidCast_FromTo, "Int32", "DateTime")); } - object IConvertible.ToType(Type type, IFormatProvider provider) + object IConvertible.ToType(Type type, IFormatProvider? provider) { return Convert.DefaultToType((IConvertible)this, type, provider); }