Merge pull request #498 from Unroll-Me/master

[mono.git] / mcs / ilasm / scanner / ILTables.cs

diff --git a/mcs/ilasm/scanner/ILTables.cs b/mcs/ilasm/scanner/ILTables.cs
index 01c3d1df3f2c4cb666f39442f11e699f7a46a16f..deb2f3a7ba3aead60ad4e3f253d91ef52a707d35 100644 (file)
--- a/mcs/ilasm/scanner/ILTables.cs
+++ b/mcs/ilasm/scanner/ILTables.cs
@@ -54,7 +54,6 @@ namespace Mono.ILASM {
                                 directives [".class"] = new ILToken (Token.D_CLASS, ".class");\r
                                 directives [".comtype"] = new ILToken (Token.D_COMTYPE, ".comtype");\r
                                 directives [".config"] = new ILToken (Token.D_CONFIG, ".config");\r
-                                directives [".constraint"] = new ILToken (Token.D_CONSTRAINT, ".constraint");\r
                                 directives [".imagebase"] = new ILToken (Token.D_IMAGEBASE, ".imagebase");\r
                                 directives [".corflags"] = new ILToken (Token.D_CORFLAGS, ".corflags");\r
                                 directives [".ctor"] = new ILToken (Token.D_CTOR, ".ctor");\r
@@ -142,8 +141,9 @@ namespace Mono.ILASM {
                                 keywords ["in"] = new ILToken (Token.K_IN, "in");\r
                                 keywords ["out"] = new ILToken (Token.K_OUT, "out");\r
                                 keywords ["opt"] = new ILToken (Token.K_OPT, "opt");\r
-                                keywords ["lcid"] = new ILToken (Token.K_LCID, "lcid");\r
-                                keywords ["retval"] = new ILToken (Token.K_RETVAL, "retval");\r
+                                // Not a keyword according to ilasm 1.1\r
+                                // keywords ["lcid"] = new ILToken (Token.K_LCID, "lcid");\r
+                                //keywords ["retval"] = new ILToken (Token.K_RETVAL, "retval");\r
                                 keywords ["static"] = new ILToken (Token.K_STATIC, "static");\r
                                 keywords ["public"] = new ILToken (Token.K_PUBLIC, "public");\r
                                 keywords ["private"] = new ILToken (Token.K_PRIVATE, "private");\r
@@ -167,6 +167,8 @@ namespace Mono.ILASM {
                                 keywords ["ansi"] = new ILToken (Token.K_ANSI, "ansi");\r
                                 keywords ["unicode"] = new ILToken (Token.K_UNICODE, "unicode");\r
                                 keywords ["autochar"] = new ILToken (Token.K_AUTOCHAR, "autochar");\r
+                                keywords ["bestfit"] = new ILToken (Token.K_BESTFIT, "bestfit");\r
+                                keywords ["charmaperror"] = new ILToken (Token.K_CHARMAPERROR, "charmaperror");\r
                                 keywords ["import"] = new ILToken (Token.K_IMPORT, "import");\r
                                 keywords ["serializable"] = new ILToken (Token.K_SERIALIZABLE, "serializable");\r
                                 keywords ["nested"] = new ILToken (Token.K_NESTED, "nested");\r
@@ -210,6 +212,11 @@ namespace Mono.ILASM {
                                 keywords ["float64"] = new ILToken (Token.K_FLOAT64, "float64");\r
                                 keywords ["error"] = new ILToken (Token.K_ERROR, "error");\r
                                 keywords ["unsigned"] = new ILToken (Token.K_UNSIGNED, "unsigned");\r
+                                keywords ["uint"] = new ILToken (Token.K_UINT, "uint");\r
+                                keywords ["uint8"] = new ILToken (Token.K_UINT8, "uint8");\r
+                                keywords ["uint16"] = new ILToken (Token.K_UINT16, "uint16");\r
+                                keywords ["uint32"] = new ILToken (Token.K_UINT32, "uint32");\r
+                                keywords ["uint64"] = new ILToken (Token.K_UINT64, "uint64");\r
                                 keywords ["decimal"] = new ILToken (Token.K_DECIMAL, "decimal");\r
                                 keywords ["date"] = new ILToken (Token.K_DATE, "date");\r
                                 keywords ["bstr"] = new ILToken (Token.K_BSTR, "bstr");\r
@@ -250,6 +257,10 @@ namespace Mono.ILASM {
                                 keywords ["modreq"] = new ILToken (Token.K_MODREQ, "modreq");\r
                                 keywords ["modopt"] = new ILToken (Token.K_MODOPT, "modopt");\r
                                 keywords ["typedref"] = new ILToken (Token.K_TYPEDREF, "typedref");\r
+                                keywords ["property"] = new ILToken (Token.K_PROPERTY, "property");\r
+#if NET_2_0 || BOOTSTRAP_NET_2_0\r
+                                keywords ["type"] = new ILToken (Token.K_TYPE, "type");\r
+#endif\r
                                 keywords ["refany"] = new ILToken (Token.K_TYPEDREF, "typedref");\r
                                 keywords ["wchar"] = new ILToken (Token.K_WCHAR, "wchar");\r
                                 keywords ["char"] = new ILToken (Token.K_CHAR, "char");\r
@@ -287,9 +298,10 @@ namespace Mono.ILASM {
                                 keywords ["fullorigin"] = new ILToken (Token.K_FULLORIGIN, "fullorigin");\r
                                 // keywords ["nan"] = new ILToken (Token.K_NAN, "nan");\r
                                 // keywords ["inf"] = new ILToken (Token.K_INF, "inf");\r
-                                keywords ["publickey"] = new ILToken (Token.K_PUBLICKEY, "publickey");\r
+                                // keywords ["publickey"] = new ILToken (Token.K_PUBLICKEY, "publickey");\r
                                 keywords ["enablejittracking"] = new ILToken (Token.K_ENABLEJITTRACKING, "enablejittracking");\r
                                 keywords ["disablejitoptimizer"] = new ILToken (Token.K_DISABLEJITOPTIMIZER, "disablejitoptimizer");\r
+                                keywords ["retargetable"] = new ILToken (Token.K_RETARGETABLE, "retargetable");\r
                                 keywords ["preservesig"] = new ILToken (Token.K_PRESERVESIG, "preservesig");\r
                                 keywords ["beforefieldinit"] = new ILToken (Token.K_BEFOREFIELDINIT, "beforefieldinit");\r
                                 keywords ["alignment"] = new ILToken (Token.K_ALIGNMENT, "alignment");\r
@@ -303,6 +315,10 @@ namespace Mono.ILASM {
                                 keywords ["true"] = new ILToken (Token.K_TRUE, "true");\r
                                 keywords ["false"] = new ILToken (Token.K_FALSE, "false");\r
                                 keywords ["is"] = new ILToken (Token.K_IS, "is");\r
+                                keywords ["on"] = new ILToken (Token.K_ON, "on");\r
+                                keywords ["off"] = new ILToken (Token.K_OFF, "off");\r
+                               keywords ["strict"] = new ILToken (Token.K_STRICT, "strict");\r
+                               keywords ["forwarder"] = new ILToken (Token.K_FORWARDER, "forwarder");\r
 \r
                                 return keywords;\r
                         }\r