Author: manjula
Date: 2005-03-16 00:32:07 -0500 (Wed, 16 Mar 2005)
New Revision: 41869
Modified:
trunk/mcs/class/Microsoft.VisualBasic/Microsoft.VisualBasic/ChangeLog
trunk/mcs/class/Microsoft.VisualBasic/Microsoft.VisualBasic/Collection.cs
trunk/mcs/class/Microsoft.VisualBasic/Microsoft.VisualBasic/DateAndTime.cs
trunk/mcs/class/Microsoft.VisualBasic/Microsoft.VisualBasic/ErrObject.cs
trunk/mcs/class/Microsoft.VisualBasic/Microsoft.VisualBasic/FileSystem.cs
trunk/mcs/class/Microsoft.VisualBasic/Microsoft.VisualBasic/Strings.cs
Log:
Added type casting in some places and moved "optional" attribute to be AFTER
that __Default*
attribute
Modified: trunk/mcs/class/Microsoft.VisualBasic/Microsoft.VisualBasic/ChangeLog
===================================================================
--- trunk/mcs/class/Microsoft.VisualBasic/Microsoft.VisualBasic/ChangeLog
2005-03-16 00:26:10 UTC (rev 41868)
+++ trunk/mcs/class/Microsoft.VisualBasic/Microsoft.VisualBasic/ChangeLog
2005-03-16 05:32:07 UTC (rev 41869)
@@ -1,3 +1,14 @@
+2005-03-16 Manjula GHM <[EMAIL PROTECTED]>
+ Ankit Jain <[EMAIL PROTECTED]>
+
+ * Collection.cs:
+ * DateAndTime.cs:
+ * ErrObject.cs:
+ * FileSyste.cs:
+ * Strings.cs:
+ Added type casting in some places and moved "optional" attribute to
be AFTER that __Default* attribute
+
+
2005-02-14 Rafael Teixeira <[EMAIL PROTECTED]>
* FileSystem.cs, CompilerServices/FlowControl.cs : killed unneeded
local variables (warnings).
* CompilerServices/ObjectType.cs : killed unneeded private method
(diagnosed from warnings on local vars)
Modified:
trunk/mcs/class/Microsoft.VisualBasic/Microsoft.VisualBasic/Collection.cs
===================================================================
--- trunk/mcs/class/Microsoft.VisualBasic/Microsoft.VisualBasic/Collection.cs
2005-03-16 00:26:10 UTC (rev 41868)
+++ trunk/mcs/class/Microsoft.VisualBasic/Microsoft.VisualBasic/Collection.cs
2005-03-16 05:32:07 UTC (rev 41869)
@@ -299,9 +299,9 @@
}
public void Add (System.Object Item,
- [Optional, __DefaultArgumentValue(null)] String Key,
- [Optional, __DefaultArgumentValue(null)] System.Object
Before,
- [Optional, __DefaultArgumentValue(null)] System.Object
After)
+ [Optional, __DefaultArgumentValue((object)null)] String
Key,
+ [Optional, __DefaultArgumentValue((object)null)]
System.Object Before,
+ [Optional, __DefaultArgumentValue((object)null)]
System.Object After)
{
int Position = int.MinValue;
Modified:
trunk/mcs/class/Microsoft.VisualBasic/Microsoft.VisualBasic/DateAndTime.cs
===================================================================
--- trunk/mcs/class/Microsoft.VisualBasic/Microsoft.VisualBasic/DateAndTime.cs
2005-03-16 00:26:10 UTC (rev 41868)
+++ trunk/mcs/class/Microsoft.VisualBasic/Microsoft.VisualBasic/DateAndTime.cs
2005-03-16 05:32:07 UTC (rev 41869)
@@ -213,9 +213,9 @@
public static long DateDiff (DateInterval Interval,
System.DateTime Date1, System.DateTime Date2,
- [Optional,
__DefaultArgumentValue(FirstDayOfWeek.Sunday)]
+ [Optional,
__DefaultArgumentValue((int)FirstDayOfWeek.Sunday)]
FirstDayOfWeek StartOfWeek,
- [Optional,
__DefaultArgumentValue(FirstWeekOfYear.Jan1)]
+ [Optional,
__DefaultArgumentValue((int)FirstWeekOfYear.Jan1)]
FirstWeekOfYear StartOfYear)
{
@@ -305,9 +305,9 @@
(
Microsoft.VisualBasic.DateInterval Interval,
System.DateTime DateValue,
- [Optional,
__DefaultArgumentValue(FirstDayOfWeek.Sunday)]
+ [Optional,
__DefaultArgumentValue((int)FirstDayOfWeek.Sunday)]
FirstDayOfWeek StartOfWeek,
- [Optional,
__DefaultArgumentValue(FirstWeekOfYear.Jan1)]
+ [Optional,
__DefaultArgumentValue((int)FirstWeekOfYear.Jan1)]
FirstWeekOfYear StartOfYear) {
CalendarWeekRule WeekRule = CalendarWeekRule.FirstDay;
@@ -385,9 +385,9 @@
public static System.Int64 DateDiff (string Interval,
System.Object Date1, System.Object Date2,
- [Optional,
__DefaultArgumentValue(FirstDayOfWeek.Sunday)]
+ [Optional,
__DefaultArgumentValue((int)FirstDayOfWeek.Sunday)]
FirstDayOfWeek StartOfWeek,
- [Optional,
__DefaultArgumentValue(FirstWeekOfYear.Jan1)]
+ [Optional,
__DefaultArgumentValue((int)FirstWeekOfYear.Jan1)]
FirstWeekOfYear StartOfYear)
{
if (Date1 == null) {
@@ -410,9 +410,9 @@
public static System.Int32 DatePart (string Interval,
System.Object DateValue,
- [Optional,
__DefaultArgumentValue(FirstDayOfWeek.Sunday)]
+ [Optional,
__DefaultArgumentValue((int)FirstDayOfWeek.Sunday)]
FirstDayOfWeek StartOfWeek,
- [Optional,
__DefaultArgumentValue(FirstWeekOfYear.Jan1)]
+ [Optional,
__DefaultArgumentValue((int)FirstWeekOfYear.Jan1)]
FirstWeekOfYear StartOfYear)
{
if (DateValue == null) {
@@ -548,7 +548,7 @@
}
public static int Weekday (System.DateTime DateValue,
- [Optional,
__DefaultArgumentValue(FirstDayOfWeek.Sunday)]
+ [Optional,
__DefaultArgumentValue((int)FirstDayOfWeek.Sunday)]
FirstDayOfWeek StartOfWeek)
{
return DatePart(DateInterval.Weekday, DateValue,
StartOfWeek, FirstWeekOfYear.System);
@@ -570,7 +570,7 @@
public static System.String WeekdayName (int Weekday,
[Optional, __DefaultArgumentValue(false)]
System.Boolean Abbreviate,
- [Optional,
__DefaultArgumentValue(FirstDayOfWeek.System)]
+ [Optional,
__DefaultArgumentValue((int)FirstDayOfWeek.System)]
FirstDayOfWeek FirstDayOfWeekValue)
{
if (Weekday < 1 || Weekday > 7) {
Modified:
trunk/mcs/class/Microsoft.VisualBasic/Microsoft.VisualBasic/ErrObject.cs
===================================================================
--- trunk/mcs/class/Microsoft.VisualBasic/Microsoft.VisualBasic/ErrObject.cs
2005-03-16 00:26:10 UTC (rev 41868)
+++ trunk/mcs/class/Microsoft.VisualBasic/Microsoft.VisualBasic/ErrObject.cs
2005-03-16 05:32:07 UTC (rev 41869)
@@ -241,10 +241,10 @@
[MonoTODO]
public void Raise (System.Int32 Number,
- [Optional, __DefaultArgumentValue(null)]
System.Object Source,
- [Optional, __DefaultArgumentValue(null)]
System.Object Description,
- [Optional, __DefaultArgumentValue(null)]
System.Object HelpFile,
- [Optional, __DefaultArgumentValue(null)]
System.Object HelpContext)
+ [Optional,
__DefaultArgumentValue((object)null)] System.Object Source,
+ [Optional,
__DefaultArgumentValue((object)null)] System.Object Description,
+ [Optional,
__DefaultArgumentValue((object)null)] System.Object HelpFile,
+ [Optional,
__DefaultArgumentValue((object)null)] System.Object HelpContext)
{
Exception e;
Modified:
trunk/mcs/class/Microsoft.VisualBasic/Microsoft.VisualBasic/FileSystem.cs
===================================================================
--- trunk/mcs/class/Microsoft.VisualBasic/Microsoft.VisualBasic/FileSystem.cs
2005-03-16 00:26:10 UTC (rev 41868)
+++ trunk/mcs/class/Microsoft.VisualBasic/Microsoft.VisualBasic/FileSystem.cs
2005-03-16 05:32:07 UTC (rev 41869)
@@ -121,8 +121,8 @@
int fileNumber,
String fileName,
OpenMode mode,
- [Optional,
__DefaultArgumentValue((OpenAccess)(-1))] OpenAccess access,
- [Optional,
__DefaultArgumentValue((OpenShare)(-1))] OpenShare share,
+ [Optional,
__DefaultArgumentValue((int)(-1))] OpenAccess access,
+ [Optional,
__DefaultArgumentValue((int)(-1))] OpenShare share,
[Optional,
__DefaultArgumentValue(-1)] int recordLength)
{
@@ -159,7 +159,7 @@
public static void FilePut(int fileNumber,
bool value,
- [Optional,
__DefaultArgumentValue(-1)] long recordNumber)
+ [Optional,
__DefaultArgumentValue((long)-1)] long recordNumber)
{
checkRecordNumber(recordNumber,false);
VBFile vbFile = getVBFile(fileNumber);
@@ -719,7 +719,7 @@
}
public static /*synchronized*/ String Dir(String pathName,
- [Optional,
__DefaultArgumentValue((FileAttribute)0)]
+ [Optional,
__DefaultArgumentValue((int)0)]
FileAttribute
fileAttribute)
{
_fileIndex = 0;
Modified: trunk/mcs/class/Microsoft.VisualBasic/Microsoft.VisualBasic/Strings.cs
===================================================================
--- trunk/mcs/class/Microsoft.VisualBasic/Microsoft.VisualBasic/Strings.cs
2005-03-16 00:26:10 UTC (rev 41868)
+++ trunk/mcs/class/Microsoft.VisualBasic/Microsoft.VisualBasic/Strings.cs
2005-03-16 05:32:07 UTC (rev 41869)
@@ -142,7 +142,7 @@
string Match,
[Optional,
__DefaultArgumentValue(true)]
bool Include,
- [OptionCompare, Optional,
__DefaultArgumentValue(CompareMethod.Binary)]
+ [Optional,
__DefaultArgumentValue((int)CompareMethod.Binary), OptionCompare]
CompareMethod Compare)
{
if (Source == null)
@@ -162,7 +162,7 @@
string Match,
[Optional,
__DefaultArgumentValue(true)]
bool Include,
- [Optional,
__DefaultArgumentValue(CompareMethod.Binary)]
+ [Optional,
__DefaultArgumentValue((int)CompareMethod.Binary)]
CompareMethod Compare)
{
if (Source == null)
@@ -237,7 +237,7 @@
[Optional,
__DefaultArgumentValue("")]string style)
{
string returnstr=null;
- string expstring=expression.GetType().ToString();;
+ string expstring=expression.GetType().ToString();
switch(expstring)
{
case "System.Char":
@@ -373,11 +373,11 @@
public static string FormatCurrency(object Expression,
[Optional,
__DefaultArgumentValue(-1)]
int NumDigitsAfterDecimal,
- [Optional,
__DefaultArgumentValue(TriState.UseDefault)]
+ [Optional,
__DefaultArgumentValue((int)TriState.UseDefault)]
TriState
IncludeLeadingDigit,
- [Optional,
__DefaultArgumentValue(TriState.UseDefault)]
+ [Optional,
__DefaultArgumentValue((int)TriState.UseDefault)]
TriState
UseParensForNegativeNumbers,
- [Optional,
__DefaultArgumentValue(TriState.UseDefault)]
+ [Optional,
__DefaultArgumentValue((int)TriState.UseDefault)]
TriState GroupDigits)
{
if (NumDigitsAfterDecimal > 99 || NumDigitsAfterDecimal
< -1 )
@@ -434,7 +434,7 @@
}
public static string FormatDateTime(DateTime Expression,
- [Optional,
__DefaultArgumentValue(DateFormat.GeneralDate)]
+ [Optional,
__DefaultArgumentValue((int)DateFormat.GeneralDate)]
DateFormat NamedFormat)
{
switch(NamedFormat) {
@@ -456,11 +456,11 @@
public static string FormatNumber(object Expression,
[Optional,
__DefaultArgumentValue(-1)]
int NumDigitsAfterDecimal,
- [Optional,
__DefaultArgumentValue(TriState.UseDefault)]
+ [Optional,
__DefaultArgumentValue((int)TriState.UseDefault)]
TriState IncludeLeadingDigit,
- [Optional,
__DefaultArgumentValue(TriState.UseDefault)]
+ [Optional,
__DefaultArgumentValue((int)TriState.UseDefault)]
TriState
UseParensForNegativeNumbers,
- [Optional,
__DefaultArgumentValue(TriState.UseDefault)]
+ [Optional,
__DefaultArgumentValue((int)TriState.UseDefault)]
TriState GroupDigits)
{
if (NumDigitsAfterDecimal > 99 || NumDigitsAfterDecimal
< -1 )
@@ -517,11 +517,11 @@
public static string FormatPercent(object Expression,
[Optional,
__DefaultArgumentValue(-1)]
int NumDigitsAfterDecimal,
- [Optional,
__DefaultArgumentValue(TriState.UseDefault)]
+ [Optional,
__DefaultArgumentValue((int)TriState.UseDefault)]
TriState
IncludeLeadingDigit,
- [Optional,
__DefaultArgumentValue(TriState.UseDefault)]
+ [Optional,
__DefaultArgumentValue((int)TriState.UseDefault)]
TriState
UseParensForNegativeNumbers,
- [Optional,
__DefaultArgumentValue(TriState.UseDefault)]
+ [Optional,
__DefaultArgumentValue((int)TriState.UseDefault)]
TriState GroupDigits)
{
if (NumDigitsAfterDecimal > 99 || NumDigitsAfterDecimal
< -1 )
@@ -591,7 +591,7 @@
public static int InStr(string String1,
string String2,
- [OptionCompare, Optional,
__DefaultArgumentValue(CompareMethod.Binary)]
+ [Optional,
__DefaultArgumentValue((int)CompareMethod.Binary), OptionCompare]
CompareMethod Compare)
{
return InStr(1, String1, String2, Compare);
@@ -600,7 +600,7 @@
public static int InStr(int Start,
string String1,
string String2,
- [OptionCompare, Optional,
__DefaultArgumentValue(CompareMethod.Binary)]
+ [Optional,
__DefaultArgumentValue((int)CompareMethod.Binary), OptionCompare]
CompareMethod Compare)
{
if (Start < 1)
@@ -634,7 +634,7 @@
string StringMatch,
[Optional,
__DefaultArgumentValue(-1)]
int Start,
- [OptionCompare, Optional,
__DefaultArgumentValue(CompareMethod.Binary)]
+ [Optional,
__DefaultArgumentValue((int)CompareMethod.Binary), OptionCompare]
CompareMethod Compare)
{
if ((Start == 0) || (Start < -1))
@@ -927,7 +927,7 @@
int Start,
[Optional,
__DefaultArgumentValue(-1)]
int Count,
- [OptionCompare, Optional,
__DefaultArgumentValue(CompareMethod.Binary)]
+ [Optional,
__DefaultArgumentValue((int)CompareMethod.Binary), OptionCompare]
CompareMethod Compare)
{
@@ -984,11 +984,11 @@
}
public static string[] Split(string Expression,
- [Optional,
__DefaultArgumentValue("")]
+ [Optional,
__DefaultArgumentValue(" ")]
string Delimiter,
[Optional,
__DefaultArgumentValue(-1)]
int Limit,
- [OptionCompare, Optional,
__DefaultArgumentValue(CompareMethod.Binary)]
+ [Optional,
__DefaultArgumentValue((int)CompareMethod.Binary), OptionCompare]
CompareMethod Compare)
{
if (Expression == null)
@@ -1027,7 +1027,7 @@
public static int StrComp(string String1,
string String2,
- [OptionCompare, Optional,
__DefaultArgumentValue(CompareMethod.Binary)]
+ [Optional,
__DefaultArgumentValue((int)CompareMethod.Binary), OptionCompare]
CompareMethod Compare)
{
if (String1 == null)
_______________________________________________
Mono-patches maillist - [email protected]
http://lists.ximian.com/mailman/listinfo/mono-patches
