From: Miguel de Icaza <miguel@gnome.org>
Date: Sun, 3 Oct 2010 16:30:10 +0000 (-0400)
Subject: Retval is not a reserved keyword, fixes 643345
X-Git-Url: http://wien.tomnetworks.com/gitweb/?a=commitdiff_plain;h=4bf3aa7b3f52c3e7ff63813425c6fe97235e5673;p=mono.git

Retval is not a reserved keyword, fixes 643345
---

diff --git a/mcs/ilasm/parser/ILParser.jay b/mcs/ilasm/parser/ILParser.jay
index 014ae7a3d1d..523c5ffe1a2 100644
--- a/mcs/ilasm/parser/ILParser.jay
+++ b/mcs/ilasm/parser/ILParser.jay
@@ -305,7 +305,7 @@ namespace Mono.ILASM {
 %token K_OUT
 %token K_OPT
 // %token K_LCID
-%token K_RETVAL
+//%token K_RETVAL
 %token K_STATIC
 %token K_PUBLIC
 %token K_PRIVATE
diff --git a/mcs/ilasm/scanner/ILTables.cs b/mcs/ilasm/scanner/ILTables.cs
index 4e7646d020e..42f2d1aa8c7 100644
--- a/mcs/ilasm/scanner/ILTables.cs
+++ b/mcs/ilasm/scanner/ILTables.cs
@@ -143,7 +143,7 @@ namespace Mono.ILASM {
                                 keywords ["opt"] = new ILToken (Token.K_OPT, "opt");
                                 // Not a keyword according to ilasm 1.1
                                 // keywords ["lcid"] = new ILToken (Token.K_LCID, "lcid");
-                                keywords ["retval"] = new ILToken (Token.K_RETVAL, "retval");
+                                //keywords ["retval"] = new ILToken (Token.K_RETVAL, "retval");
                                 keywords ["static"] = new ILToken (Token.K_STATIC, "static");
                                 keywords ["public"] = new ILToken (Token.K_PUBLIC, "public");
                                 keywords ["private"] = new ILToken (Token.K_PRIVATE, "private");