Author: ankit
Date: 2006-01-16 05:48:43 -0500 (Mon, 16 Jan 2006)
New Revision: 55628
Modified:
trunk/mcs/class/PEAPI/ChangeLog
trunk/mcs/class/PEAPI/Metadata.cs
trunk/mcs/ilasm/parser/ChangeLog
trunk/mcs/ilasm/parser/ILParser.jay
trunk/mcs/ilasm/scanner/ChangeLog
trunk/mcs/ilasm/scanner/ILTables.cs
Log:
In ilasm/scanner:
* ILTables.cs (keywords): Add 'bestfit', 'charmaperror', 'on' & 'off'.
In ilasm/parser:
* ILParser.jay (K_BESTFIT):
(K_CHARMAPERROR):
(K_ON):
(K_OFF): New tokens.
(pinv_attr | ..): Add rules for the new tokens.
In class/PEAPI:
* Metadata.cs (PInvokeAttr): Add 'bestfit_on', 'bestfit_off',
'bestfit_mask',
'charmaperror_on' & 'charmaperror_off'.
Modified: trunk/mcs/class/PEAPI/ChangeLog
===================================================================
--- trunk/mcs/class/PEAPI/ChangeLog 2006-01-16 10:24:12 UTC (rev 55627)
+++ trunk/mcs/class/PEAPI/ChangeLog 2006-01-16 10:48:43 UTC (rev 55628)
@@ -1,3 +1,8 @@
+2006-01-16 Ankit Jain <[EMAIL PROTECTED]>
+
+ * Metadata.cs (PInvokeAttr): Add 'bestfit_on', 'bestfit_off',
'bestfit_mask',
+ 'charmaperror_on' & 'charmaperror_off'.
+
2006-01-13 Ankit Jain <[EMAIL PROTECTED]>
* Metadata.cs (GenericMethodSig): Ensure sig is added to the blob only
once.
Modified: trunk/mcs/class/PEAPI/Metadata.cs
===================================================================
--- trunk/mcs/class/PEAPI/Metadata.cs 2006-01-16 10:24:12 UTC (rev 55627)
+++ trunk/mcs/class/PEAPI/Metadata.cs 2006-01-16 10:48:43 UTC (rev 55628)
@@ -78,8 +78,11 @@
/// Attributes for .pinvokeimpl method declarations
/// </summary>
public enum PInvokeAttr { nomangle = 1, ansi = 2, unicode = 4, autochar
= 6,
+ bestfit_on = 0x0010, bestfit_off = 0x0020, bestfit_mask =
0x0030,
lasterr = 0x0040, winapi = 0x0100, cdecl = 0x0200,
- stdcall = 0x0300, thiscall = 0x0400, fastcall = 0x0500 }
+ stdcall = 0x0300, thiscall = 0x0400, fastcall = 0x0500,
+ charmaperror_on = 0x1000, charmaperror_off = 0x2000
+ }
/// <summary>
/// Implementation attributes for a method
Modified: trunk/mcs/ilasm/parser/ChangeLog
===================================================================
--- trunk/mcs/ilasm/parser/ChangeLog 2006-01-16 10:24:12 UTC (rev 55627)
+++ trunk/mcs/ilasm/parser/ChangeLog 2006-01-16 10:48:43 UTC (rev 55628)
@@ -1,5 +1,13 @@
2006-01-16 Ankit Jain <[EMAIL PROTECTED]>
+ * ILParser.jay (K_BESTFIT):
+ (K_CHARMAPERROR):
+ (K_ON):
+ (K_OFF): New tokens.
+ (pinv_attr | ..): Add rules for the new tokens.
+
+2006-01-16 Ankit Jain <[EMAIL PROTECTED]>
+
* ILParser.jay (K_UINT): New token.
(type | K_NATIVE K_UINT): New.
Modified: trunk/mcs/ilasm/parser/ILParser.jay
===================================================================
--- trunk/mcs/ilasm/parser/ILParser.jay 2006-01-16 10:24:12 UTC (rev 55627)
+++ trunk/mcs/ilasm/parser/ILParser.jay 2006-01-16 10:48:43 UTC (rev 55628)
@@ -312,6 +312,7 @@
%token K_ANSI
%token K_UNICODE
%token K_AUTOCHAR
+%token K_BESTFIT
%token K_IMPORT
%token K_SERIALIZABLE
%token K_NESTED
@@ -452,6 +453,9 @@
%token K_TRUE
%token K_FALSE
%token K_IS
+%token K_ON
+%token K_OFF
+%token K_CHARMAPERROR
/* end generated */
@@ -1872,6 +1876,10 @@
| pinv_attr K_STDCALL { $$ = (PInvokeAttr) $1 |
PInvokeAttr.stdcall; }
| pinv_attr K_THISCALL { $$ = (PInvokeAttr) $1 |
PInvokeAttr.thiscall; }
| pinv_attr K_FASTCALL { $$ = (PInvokeAttr) $1 |
PInvokeAttr.fastcall; }
+ | pinv_attr K_BESTFIT COLON K_ON { $$ = (PInvokeAttr)
$1 | PInvokeAttr.bestfit_on; }
+ | pinv_attr K_BESTFIT COLON K_OFF { $$ = (PInvokeAttr)
$1 | PInvokeAttr.bestfit_off; }
+ | pinv_attr K_CHARMAPERR COLON K_ON { $$ =
(PInvokeAttr) $1 | PInvokeAttr.charmaperror_on; }
+ | pinv_attr K_CHARMAPERR COLON K_OFF { $$ =
(PInvokeAttr) $1 | PInvokeAttr.charmaperror_off; }
;
method_name : D_CTOR
Modified: trunk/mcs/ilasm/scanner/ChangeLog
===================================================================
--- trunk/mcs/ilasm/scanner/ChangeLog 2006-01-16 10:24:12 UTC (rev 55627)
+++ trunk/mcs/ilasm/scanner/ChangeLog 2006-01-16 10:48:43 UTC (rev 55628)
@@ -1,5 +1,9 @@
2006-01-16 Ankit Jain <[EMAIL PROTECTED]>
+ * ILTables.cs (keywords): Add 'bestfit', 'charmaperror', 'on' & 'off'.
+
+2006-01-16 Ankit Jain <[EMAIL PROTECTED]>
+
* ILTables.cs (keywords): Add 'uint', this is a native UIntPtr type.
2006-01-03 Ankit Jain <[EMAIL PROTECTED]>
Modified: trunk/mcs/ilasm/scanner/ILTables.cs
===================================================================
--- trunk/mcs/ilasm/scanner/ILTables.cs 2006-01-16 10:24:12 UTC (rev 55627)
+++ trunk/mcs/ilasm/scanner/ILTables.cs 2006-01-16 10:48:43 UTC (rev 55628)
@@ -168,6 +168,8 @@
keywords ["ansi"] = new ILToken (Token.K_ANSI,
"ansi");
keywords ["unicode"] = new ILToken
(Token.K_UNICODE, "unicode");
keywords ["autochar"] = new ILToken
(Token.K_AUTOCHAR, "autochar");
+ keywords ["bestfit"] = new ILToken
(Token.K_BESTFIT, "bestfit");
+ keywords ["charmaperror"] = new ILToken
(Token.K_BESTFIT, "bestfit");
keywords ["import"] = new ILToken
(Token.K_IMPORT, "import");
keywords ["serializable"] = new ILToken
(Token.K_SERIALIZABLE, "serializable");
keywords ["nested"] = new ILToken
(Token.K_NESTED, "nested");
@@ -309,6 +311,8 @@
keywords ["true"] = new ILToken (Token.K_TRUE,
"true");
keywords ["false"] = new ILToken
(Token.K_FALSE, "false");
keywords ["is"] = new ILToken (Token.K_IS,
"is");
+ keywords ["on"] = new ILToken (Token.K_ON,
"on");
+ keywords ["off"] = new ILToken (Token.K_OFF,
"off");
return keywords;
}
_______________________________________________
Mono-patches maillist - [email protected]
http://lists.ximian.com/mailman/listinfo/mono-patches
