Forráskód Böngészése

2002-05-01 Duncan Mak <[email protected]>

	* DebuggableAttribute.cs: Added missing AttributeUsage attribute.

	* Convert.cs:
	* Math.cs: Added missing CLSCompliant attributes where necessary.

svn path=/trunk/mcs/; revision=4185
Duncan Mak 24 éve
szülő
commit
515cb9600d

+ 4 - 0
mcs/class/corlib/System.Diagnostics/ChangeLog

@@ -1,3 +1,7 @@
+2002-05-01  Duncan Mak  <[email protected]>
+
+	* DebuggableAttribute.cs: Added missing AttributeUsage attribute.
+
 2002-04-08  Jonathan Pryor  <[email protected]>
 
 	* Debugger.cs: Added [MonoTODO] attribute to methods; modified IsLogging() 

+ 2 - 1
mcs/class/corlib/System.Diagnostics/DebuggableAttribute.cs

@@ -8,7 +8,8 @@
 //
 
 namespace System.Diagnostics {
-
+	
+	[AttributeUsage (AttributeTargets.Assembly | AttributeTargets.Module)]
 	public sealed class DebuggableAttribute : System.Attribute {
 
 		private bool JITTrackingEnabledFlag;

+ 5 - 0
mcs/class/corlib/System/ChangeLog

@@ -1,3 +1,8 @@
+2002-05-01  Duncan Mak  <[email protected]>
+
+	* Convert.cs: 
+	* Math.cs: Added missing CLSCompliant attributes where necessary.
+	
 2002-04-30  Duncan Mak  <[email protected]>
 
 	* ArgumentException.cs (Message): 

+ 81 - 68
mcs/class/corlib/System/Convert.cs

@@ -80,8 +80,8 @@ namespace System {
 		// Fields
 		public static readonly object DBNull;
 	
-		private Convert () {}
-
+		private Convert () {}
+
 		// ========== BASE 64 Conversions ========== //
 		// the BASE64 convert methods are using the Base64 converting methods
 		// from System.Security.Cryptography.ToBase64Transform and
@@ -224,6 +224,7 @@ namespace System {
 			return (value != 0); 
 		}
 
+		[CLSCompliant (false)]
 		public static bool ToBoolean (sbyte value) 
 		{ 
 			return (value != 0); 
@@ -243,17 +244,20 @@ namespace System {
 		{
 			return Boolean.Parse (value); // provider is ignored.
 		}
-	
+
+		[CLSCompliant (false)]
 		public static bool ToBoolean (uint value) 
 		{ 
 			return (value != 0);
 		}
 
+		[CLSCompliant (false)]
 		public static bool ToBoolean (ulong value) 
 		{ 
 			return (value != 0); 
 		}
 
+		[CLSCompliant (false)]
 		public static bool ToBoolean (ushort value) 
 		{ 
 			return (value != 0); 
@@ -261,14 +265,14 @@ namespace System {
 
 		public static bool ToBoolean (object value)
 		{
-			return ToBoolean (value, null);
+			return ToBoolean (value, null);
 		}
 
 		public static bool ToBoolean (object value, IFormatProvider provider)
 		{
-			if (value == null)
-				return false;
-			return ((IConvertible) value).ToBoolean (provider);
+			if (value == null)
+				return false;
+			return ((IConvertible) value).ToBoolean (provider);
 		}
 
 		// ========== Byte Conversions ========== //
@@ -358,6 +362,7 @@ namespace System {
 			return (byte)value;
 		}
 
+		[CLSCompliant (false)]
 		public static byte ToByte (sbyte value) 
 		{ 
 			if (value < Byte.MinValue)
@@ -390,7 +395,8 @@ namespace System {
 		{
 			return (byte) ConvertFromBase (value, fromBase);
 		}
-	
+
+		[CLSCompliant (false)]
 		public static byte ToByte (uint value) 
 		{ 
 			if (value > Byte.MaxValue)
@@ -400,6 +406,7 @@ namespace System {
 			return (byte)value;
 		}
 
+		[CLSCompliant (false)]
 		public static byte ToByte (ulong value) 
 		{ 
 			if (value > Byte.MaxValue)
@@ -409,6 +416,7 @@ namespace System {
 			return (byte)value;
 		}
 
+		[CLSCompliant (false)]
 		public static byte ToByte (ushort value) 
 		{ 
 			if (value > Byte.MaxValue)
@@ -420,14 +428,14 @@ namespace System {
 
 		public static byte ToByte (object value)
 		{
-			return ToByte (value, null);
+			return ToByte (value, null);
 		}
 
 		public static byte ToByte (object value, IFormatProvider provider)
 		{
-			if (value == null)
-				return 0;
-			return ((IConvertible) value).ToByte (provider);
+			if (value == null)
+				return 0;
+			return ((IConvertible) value).ToByte (provider);
 		}
 
 		// ========== Char Conversions ========== //
@@ -485,6 +493,7 @@ namespace System {
 			throw new InvalidCastException ("This conversion is not supported.");
 		}
 
+		[CLSCompliant (false)]
 		public static char ToChar (sbyte value) 
 		{ 
 			if (value < Char.MinValue)
@@ -512,7 +521,8 @@ namespace System {
 		{
 			return Char.Parse (value); // provider is ignored.
 		}
-	
+
+		[CLSCompliant (false)]
 		public static char ToChar (uint value) 
 		{ 
 			if (value > Char.MaxValue)
@@ -522,6 +532,7 @@ namespace System {
 			return (char)value; 
 		}
 
+		[CLSCompliant (false)]
 		public static char ToChar (ulong value) 
 		{ 
 			if (value > Char.MaxValue)
@@ -531,6 +542,7 @@ namespace System {
 			return (char)value; 
 		}
 
+		[CLSCompliant (false)]
 		public static char ToChar (ushort value) 
 		{ 
 			if (value > Char.MaxValue)
@@ -542,14 +554,14 @@ namespace System {
 
 		public static char ToChar (object value)
 		{
-			return ToChar (value, null);
+			return ToChar (value, null);
 		}
 
 		public static char ToChar (object value, IFormatProvider provider)
 		{
-			if (value == null)
-				return (char) 0;
-			return ((IConvertible) value).ToChar (provider);
+			if (value == null)
+				return (char) 0;
+			return ((IConvertible) value).ToChar (provider);
 		}
 
 		// ========== DateTime Conversions ========== //
@@ -616,14 +628,14 @@ namespace System {
 
 		public static DateTime ToDateTime (object value)
 		{
-			return ToDateTime (value, null);
+			return ToDateTime (value, null);
 		}
 
 		public static DateTime ToDateTime (object value, IFormatProvider provider)
 		{
-			if (value == null)
-				return DateTime.MinValue;
-			return ((IConvertible) value).ToDateTime (provider);
+			if (value == null)
+				return DateTime.MinValue;
+			return ((IConvertible) value).ToDateTime (provider);
 		}
 
 		[CLSCompliant (false)]
@@ -741,14 +753,14 @@ namespace System {
 
 		public static decimal ToDecimal (object value)
 		{
-			return ToDecimal (value, null);
+			return ToDecimal (value, null);
 		}
 
 		public static decimal ToDecimal (object value, IFormatProvider provider)
 		{
-			if (value == null)
-				return new Decimal (0);
-			return ((IConvertible) value).ToDecimal (provider);
+			if (value == null)
+				return new Decimal (0);
+			return ((IConvertible) value).ToDecimal (provider);
 		}
 						 
 
@@ -840,14 +852,14 @@ namespace System {
 
 		public static double ToDouble (object value)
 		{
-			return ToDouble (value, null);
+			return ToDouble (value, null);
 		}
 
 		public static double ToDouble (object value, IFormatProvider provider)
 		{
-			if (value == null)
-				return 0.0;
-			return ((IConvertible) value).ToDouble (provider);
+			if (value == null)
+				return 0.0;
+			return ((IConvertible) value).ToDouble (provider);
 		}
 
 		// ========== Int16 Conversions ========== //
@@ -982,14 +994,14 @@ namespace System {
 
 		public static short ToInt16 (object value)
 		{
-			return ToInt16 (value, null);
+			return ToInt16 (value, null);
 		}
 
 		public static short ToInt16 (object value, IFormatProvider provider)
 		{
-			if (value == null)
-				return 0;
-			return ((IConvertible) value).ToInt16 (provider);
+			if (value == null)
+				return 0;
+			return ((IConvertible) value).ToInt16 (provider);
 		}
 	
 		// ========== Int32 Conversions ========== //
@@ -1114,14 +1126,14 @@ namespace System {
 
 		public static int ToInt32 (object value)
 		{
-			return ToInt32 (value, null);
+			return ToInt32 (value, null);
 		}
 
 		public static int ToInt32 (object value, IFormatProvider provider)
 		{
-			if (value == null)
-				return 0;
-			return ((IConvertible) value).ToInt32 (provider);
+			if (value == null)
+				return 0;
+			return ((IConvertible) value).ToInt32 (provider);
 		}
 
 		// ========== Int64 Conversions ========== //
@@ -1240,14 +1252,14 @@ namespace System {
 
 		public static long ToInt64 (object value)
 		{
-			return ToInt64 (value, null);
+			return ToInt64 (value, null);
 		}
 
 		public static long ToInt64 (object value, IFormatProvider provider)
 		{
-			if (value == null)
-				return 0;
-			return ((IConvertible) value).ToInt64 (provider);
+			if (value == null)
+				return 0;
+			return ((IConvertible) value).ToInt64 (provider);
 		}
 		
 		// ========== SByte Conversions ========== //
@@ -1404,15 +1416,15 @@ namespace System {
 		[CLSCompliant (false)]
 		public static sbyte ToSByte (object value)
 		{
-			return ToSByte (value, null);
+			return ToSByte (value, null);
 		}
 
 		[CLSCompliant (false)]
 		public static sbyte ToSByte (object value, IFormatProvider provider)
 		{
-			if (value == null)
-				return 0;
-			return ((IConvertible) value).ToSByte (provider);
+			if (value == null)
+				return 0;
+			return ((IConvertible) value).ToSByte (provider);
 		}
 
 		// ========== Single Conversions ========== //
@@ -1505,18 +1517,17 @@ namespace System {
 			return (float)value; 
 		}
 
-		[CLSCompliant (false)]
 		public static float ToSingle (object value)
 		{
-			return ToSingle (value, null);
+			return ToSingle (value, null);
 		}
 
 		[CLSCompliant (false)]
 		public static float ToSingle (object value, IFormatProvider provider)
 		{
-			if (value == null)
-				return 0;
-			return ((IConvertible) value).ToSingle (provider);
+			if (value == null)
+				return 0;
+			return ((IConvertible) value).ToSingle (provider);
 		}
 
 		// ========== String Conversions ========== //
@@ -1632,23 +1643,25 @@ namespace System {
 
 		public static string ToString (object value)
 		{
-			return ToString (value, null);
+			return ToString (value, null);
 		}		
 
 		public static string ToString (object value, IFormatProvider provider)
 		{
-			if (value is IConvertible)
-				return ((IConvertible) value).ToString (provider);
-			else if (value != null)
-				return value.ToString ();
-			return String.Empty;
+			if (value is IConvertible)
+				return ((IConvertible) value).ToString (provider);
+			else if (value != null)
+				return value.ToString ();
+			return String.Empty;
 		}				
 
+		[CLSCompliant (false)]
 		public static string ToString (sbyte value) 
 		{ 
 			return value.ToString (); 
 		}
 
+		[CLSCompliant (false)]				
 		public static string ToString (sbyte value, IFormatProvider provider) 
 		{ 
 			return value.ToString (provider); 
@@ -1861,15 +1874,15 @@ namespace System {
 		[CLSCompliant (false)]
 		public static ushort ToUInt16 (object value)
 		{
-			return ToUInt16 (value, null);
+			return ToUInt16 (value, null);
 		}
 
 		[CLSCompliant (false)]
 		public static ushort ToUInt16 (object value, IFormatProvider provider)
 		{
-			if (value == null)
-				return 0;
-			return ((IConvertible) value).ToUInt16 (provider);
+			if (value == null)
+				return 0;
+			return ((IConvertible) value).ToUInt16 (provider);
 		}
 
 		// ========== UInt32 Conversions ========== //
@@ -2014,15 +2027,15 @@ namespace System {
 		[CLSCompliant (false)]
 		public static uint ToUInt32 (object value)
 		{
-			return ToUInt32 (value, null);
+			return ToUInt32 (value, null);
 		}		
 
 		[CLSCompliant (false)]
 		public static uint ToUInt32 (object value, IFormatProvider provider)
 		{
-			if (value == null)
-				return 0;
-			return ((IConvertible) value).ToUInt32 (provider);
+			if (value == null)
+				return 0;
+			return ((IConvertible) value).ToUInt32 (provider);
 		}		
 		
 
@@ -2164,15 +2177,15 @@ namespace System {
 		[CLSCompliant (false)]
 		public static ulong ToUInt64 (object value)
 		{
-			return ToUInt64 (value, null);
+			return ToUInt64 (value, null);
 		}		
 
 		[CLSCompliant (false)]
 		public static ulong ToUInt64 (object value, IFormatProvider provider)
 		{
-			if (value == null)
-				return 0;
-			return ((IConvertible) value).ToUInt64 (provider);
+			if (value == null)
+				return 0;
+			return ((IConvertible) value).ToUInt64 (provider);
 		}		
 		
 

+ 19 - 0
mcs/class/corlib/System/Math.cs

@@ -46,6 +46,7 @@ namespace System
                                 throw new OverflowException(Locale.GetText ("Value is too small"));
                         return (value < 0)? -value: value;
                 }
+		[CLSCompliant (false)]
                 public static sbyte Abs(sbyte value)
                 {
                         if (value == SByte.MinValue)
@@ -107,6 +108,8 @@ namespace System
                 {
                         return (val1 > val2)? val1: val2;
                 }
+
+		[CLSCompliant (false)]
                 public static sbyte Max(sbyte val1, sbyte val2)
                 {
                         return (val1 > val2)? val1: val2;
@@ -115,14 +118,20 @@ namespace System
                 {
                         return (val1 > val2)? val1: val2;
                 }
+
+		[CLSCompliant (false)]
                 public static uint Max(uint val1, uint val2)
                 {
                         return (val1 > val2)? val1: val2;
                 }
+
+		[CLSCompliant (false)]
                 public static ulong Max(ulong val1, ulong val2)
                 {
                         return (val1 > val2)? val1: val2;
                 }
+
+		[CLSCompliant (false)]
                 public static ushort Max(ushort val1, ushort val2)
                 {
                         return (val1 > val2)? val1: val2;
@@ -151,6 +160,8 @@ namespace System
                 {
                         return (val1 < val2)? val1: val2;
                 }
+
+		[CLSCompliant (false)]
                 public static sbyte Min(sbyte val1, sbyte val2)
                 {
                         return (val1 < val2)? val1: val2;
@@ -159,14 +170,20 @@ namespace System
                 {
                         return (val1 < val2)? val1: val2;
                 }
+
+		[CLSCompliant (false)]
                 public static uint Min(uint val1, uint val2)
                 {
                         return (val1 < val2)? val1: val2;
                 }
+
+		[CLSCompliant (false)]
                 public static ulong Min(ulong val1, ulong val2)
                 {
                         return (val1 < val2)? val1: val2;
                 }
+
+		[CLSCompliant (false)]
                 public static ushort Min(ushort val1, ushort val2)
                 {
                         return (val1 < val2)? val1: val2;
@@ -252,6 +269,8 @@ namespace System
                         if (value > 0) return 1;
                         return (value == 0)? 0: -1;
                 }
+
+		[CLSCompliant (false)]
                 public static int Sign(sbyte value)
                 {
                         if (value > 0) return 1;