* ILParser.jay: vtable fixups use the int32 or int64 keyword, not

	actual int values. When adding modules for pinvoke info use the
	ExternTable so we dont get duplicate modules.

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

diff --git a/mcs/ilasm/parser/ChangeLog b/mcs/ilasm/parser/ChangeLog
index 550f8fc3184404125f3dd02672380c21ba6252a4..3544e55b8adb072725e0fae44efe73e0de60e622 100644 (file)
--- a/mcs/ilasm/parser/ChangeLog
+++ b/mcs/ilasm/parser/ChangeLog
@@ -1,3 +1,9 @@
+2004-06-26  Jackson Harper  <jackson@ximian.com>
+
+       * ILParser.jay: vtable fixups use the int32 or int64 keyword, not
+       actual int values. When adding modules for pinvoke info use the
+       ExternTable so we dont get duplicate modules.
+       
 2004-06-19  Jackson Harper  <jackson@ximian.com>
 
        * ILParser.jay: Resolve method pointers that are being treated as

diff --git a/mcs/ilasm/parser/ILParser.jay b/mcs/ilasm/parser/ILParser.jay
index b3370f0699456b2cd403dd3031bb2660a3dba9eb..7a37b844af19579f27c34a848d5dc17607b1930d 100644 (file)
--- a/mcs/ilasm/parser/ILParser.jay
+++ b/mcs/ilasm/parser/ILParser.jay
@@ -438,8 +438,8 @@ vtfixup_decl                : D_VTFIXUP OPEN_BRACKET int32 CLOSE_BRACKET
                        ;\r
 \r
 vtfixup_attr           : /* EMPTY */\r
-                       | vtfixup_attr int32\r
-                       | vtfixup_attr int64\r
+                       | vtfixup_attr K_INT32\r
+                       | vtfixup_attr K_INT64\r
                        | vtfixup_attr K_FROMUNMANAGED\r
                        | vtfixup_attr K_CALLMOSTDERIVED\r
                        ;\r
@@ -1499,7 +1499,8 @@ method_head               : D_METHOD meth_attr call_conv param_attr type method_name
                                 codegen.BeginMethodDef (methdef);\r
 \r
                                 if (pinvoke_info) {\r
-                                        methdef.AddPInvokeInfo (pinvoke_attr, pinvoke_mod, pinvoke_meth);\r
+                                        ExternModule mod = codegen.ExternTable.AddModule (pinvoke_mod);\r
+                                        methdef.AddPInvokeInfo (pinvoke_attr, mod, pinvoke_meth);\r
                                         pinvoke_info = false;\r
                                 }\r
 \r