diff options
| author | Alexander Köplinger <alex.koeplinger@outlook.com> | 2015-08-16 18:58:53 +0300 |
|---|---|---|
| committer | Alexander Köplinger <alex.koeplinger@outlook.com> | 2015-08-16 18:59:37 +0300 |
| commit | c7ff3b0829decb8c4e3ee0300fa3f781c77c91a8 (patch) | |
| tree | ff2c157700743178e8991ba33983b1f04e38ca63 /mcs/ilasm | |
| parent | c8d474bef3dddd73e87e8a4144134bd6fbbaaa68 (diff) | |
[ilasm] Add stubs for the "auto" keyword in .assembly
Example IL: ".assembly extern mscorlib {auto}"
Diffstat (limited to 'mcs/ilasm')
| -rw-r--r-- | mcs/ilasm/parser/ILParser.jay | 2 | ||||
| -rw-r--r-- | mcs/ilasm/scanner/ILTables.cs | 1 |
2 files changed, 3 insertions, 0 deletions
diff --git a/mcs/ilasm/parser/ILParser.jay b/mcs/ilasm/parser/ILParser.jay index 7001b0cca0b..63ddee82bfa 100644 --- a/mcs/ilasm/parser/ILParser.jay +++ b/mcs/ilasm/parser/ILParser.jay @@ -482,6 +482,7 @@ namespace Mono.ILASM { %token K_CHARMAPERROR
%token K_LEGACY
%token K_LIBRARY
+%token K_AUTO
/* end generated */
@@ -3260,6 +3261,7 @@ assemblyref_decl : D_VER int32 COLON int32 COLON int32 COLON int32 if (codegen.CurrentCustomAttrTarget != null)
codegen.CurrentCustomAttrTarget.AddCustomAttribute ((CustomAttr) $1);
}
+ | K_AUTO /* MS ilasm uses this keyword to lookup the specified assembly in the GAC and embeds its attributes, we just ignore it */
;
exptype_all : exptype_head OPEN_BRACE exptype_decls CLOSE_BRACE
diff --git a/mcs/ilasm/scanner/ILTables.cs b/mcs/ilasm/scanner/ILTables.cs index bc9c7dc9ab8..62ab383b6b4 100644 --- a/mcs/ilasm/scanner/ILTables.cs +++ b/mcs/ilasm/scanner/ILTables.cs @@ -319,6 +319,7 @@ namespace Mono.ILASM { keywords ["forwarder"] = new ILToken (Token.K_FORWARDER, "forwarder");
keywords ["legacy"] = new ILToken (Token.K_LEGACY, "legacy");
keywords ["library"] = new ILToken (Token.K_LIBRARY, "library");
+ keywords ["auto"] = new ILToken (Token.K_AUTO, "auto");
return keywords;
}
|