* ILParser.jay: Fix typo in field inits. Methods attached to

	modified types should be type spec method refs.

svn path=/trunk/mcs/; revision=18057

diff --git a/mcs/ilasm/parser/ChangeLog b/mcs/ilasm/parser/ChangeLog
index fcd8b6c01b761227c83de52d702dcb0fef74d12a..8e6014dbd691455268c0fbbdc677de0455ddf907 100644 (file)
--- a/mcs/ilasm/parser/ChangeLog
+++ b/mcs/ilasm/parser/ChangeLog
@@ -1,3 +1,8 @@
+2003-09-12 Jackson Harper <jackson@latitudegeo.com>
+
+       * ILParser.jay: Fix typo in field inits. Methods attached to
+       modified types should be type spec method refs.
+       
 2003-08-19 Jackson Harper <jackson@latitudegeo.com>
 
        * ILParser.jay: Implement address constants and string

diff --git a/mcs/ilasm/parser/ILParser.jay b/mcs/ilasm/parser/ILParser.jay
index 736c072487bc8067691104583fe4a32587846c07..11975d11be8359a8f8f58d316bdabf0fee053494 100644 (file)
--- a/mcs/ilasm/parser/ILParser.jay
+++ b/mcs/ilasm/parser/ILParser.jay
@@ -1207,11 +1207,11 @@ field_init              : K_FLOAT32 OPEN_PARENS float64 CLOSE_PARENS
                           }\r
                        | K_INT32 OPEN_PARENS int64 CLOSE_PARENS\r
                           {\r
-                                $$ = new IntConst (Convert.ToUInt32 ($3));\r
+                                $$ = new IntConst (Convert.ToInt32 ($3));\r
                           }\r
                        | K_INT16 OPEN_PARENS int64 CLOSE_PARENS\r
                           {\r
-                                $$ = new IntConst (Convert.ToUInt16 ($3));\r
+                                $$ = new IntConst (Convert.ToInt16 ($3));\r
                           }\r
                        | K_CHAR OPEN_PARENS int64 CLOSE_PARENS\r
                           {\r
@@ -1954,8 +1954,13 @@ method_ref               : call_conv type type_spec DOUBLE_COLON method_name
                                 else\r
                                         param_list = new ITypeRef[0];\r
 \r
-                                $$ = owner.GetMethodRef ((ITypeRef) $2,\r
-                                        (CallConv) $1, (string) $5, param_list);\r
+                                if (owner.UseTypeSpec) {\r
+                                        $$ = new TypeSpecMethodRef (owner, (ITypeRef) $2,\r
+                                                (CallConv) $1, (string) $5, param_list);\r
+                                } else {\r
+                                        $$ = owner.GetMethodRef ((ITypeRef) $2,\r
+                                                (CallConv) $1, (string) $5, param_list);\r
+                                }\r
                           }\r
                        | call_conv type method_name \r
                          OPEN_PARENS type_list CLOSE_PARENS\r