Retval is not a reserved keyword, fixes 643345

[mono.git] / mcs / ilasm / parser / ILParser.jay

diff --git a/mcs/ilasm/parser/ILParser.jay b/mcs/ilasm/parser/ILParser.jay
index 32247371fefc22465ed8c5e60be600366e836ae9..523c5ffe1a236bcd21cfa40e6ab7fa0d7f998cb4 100644 (file)
--- a/mcs/ilasm/parser/ILParser.jay
+++ b/mcs/ilasm/parser/ILParser.jay
@@ -305,7 +305,7 @@ namespace Mono.ILASM {
 %token K_OUT\r
 %token K_OPT\r
 // %token K_LCID\r
-%token K_RETVAL\r
+//%token K_RETVAL\r
 %token K_STATIC\r
 %token K_PUBLIC\r
 %token K_PRIVATE\r
@@ -2158,9 +2158,7 @@ method_decl               : D_EMITBYTE int32
 \r
                                 if (param == null) {\r
                                         Report.Warning (tokenizer.Location, String.Format ("invalid param index ({0}) with .param", index));\r
-                                        break;\r
-                                }\r
-                                if ($5 != null)\r
+                                } else if ($5 != null)\r
                                         param.AddDefaultValue ((Constant) $5);\r
                           }\r
                        | param_type_decl\r
@@ -3274,7 +3272,7 @@ float64                   : FLOAT64
                           {\r
                                 int i = (int) $3;\r
                                 byte[] intb = BitConverter.GetBytes (i);\r
-                                $$ = (double) BitConverter.ToSingle (intb, BitConverter.IsLittleEndian ? 0 : 4);\r
+                                $$ = (double) BitConverter.ToSingle (intb, 0);\r
                           }\r
                         | K_FLOAT32 OPEN_PARENS INT64 CLOSE_PARENS\r
                           {\r
@@ -3285,12 +3283,12 @@ float64                 : FLOAT64
                        | K_FLOAT64 OPEN_PARENS INT64 CLOSE_PARENS\r
                           {\r
                                 byte[] intb = BitConverter.GetBytes ((long) $3);\r
-                               $$ = BitConverter.ToDouble (intb, BitConverter.IsLittleEndian ? 0 : 4);\r
+                               $$ = BitConverter.ToDouble (intb, 0);\r
                           }\r
                         | K_FLOAT64 OPEN_PARENS INT32 CLOSE_PARENS\r
                           {\r
                                 byte[] intb = BitConverter.GetBytes ((int) $3);\r
-                                $$ = (double) BitConverter.ToSingle (intb, BitConverter.IsLittleEndian ? 0 : 4);\r
+                                $$ = (double) BitConverter.ToSingle (intb, 0);\r
                           }\r
                        ;\r
 \r