Use full names for calling instructions

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

diff --git a/mcs/ilasm/parser/ChangeLog b/mcs/ilasm/parser/ChangeLog
index 357b552e832c0d8999325d88527f8ba149279d3f..11e0ef57bb67e74e5b77074310a8da1cc2e66fec 100644 (file)
--- a/mcs/ilasm/parser/ChangeLog
+++ b/mcs/ilasm/parser/ChangeLog
@@ -1,3 +1,7 @@
+2003-02-09 Jackson Harper <jackson@latitudegeo.com>
+
+       * ILParser.jay: Use full names for calling instructions
+
 2003-02-08 Jackson Harper <jackson@latitudegeo.com>
 
        * ILParser.jay: Create type names properly

diff --git a/mcs/ilasm/parser/ILParser.jay b/mcs/ilasm/parser/ILParser.jay
index 39ca7378621195b45528541849bba16abfb5627d..095d864592fa329fa2b061c23b7474b054dfea52 100644 (file)
--- a/mcs/ilasm/parser/ILParser.jay
+++ b/mcs/ilasm/parser/ILParser.jay
@@ -888,14 +888,14 @@ instr                   : INSTR_NONE              {currentInstr = new InstrNone ((OpCode) $1
                        | instr_r_head bytes CLOSE_PARENS \r
                        | INSTR_BRTARGET int32  \r
                        | INSTR_BRTARGET id \r
-                       | INSTR_METHOD binding_flags type assembly_name name1 DOUBLE_COLON call_name OPEN_PARENS arg_list CLOSE_PARENS \r
+                       | INSTR_METHOD binding_flags type full_type DOUBLE_COLON call_name OPEN_PARENS arg_list CLOSE_PARENS \r
                          {\r
                                if (OpCodes.Call.Equals ((OpCode)$1) || OpCodes.Callvirt.Equals ((OpCode)$1)) {\r
-                                       currentInstr = new InstrCall ((OpCode) $1, (string)$2, (string)$3, (string)$4,  \r
-                                               (string)$5, (string)$7, $9 as ArrayList);\r
+                                       currentInstr = new InstrCall ((OpCode) $1, (string)$2, (string)$3, \r
+                                               (string)$4, (string)$6, $8 as ArrayList);\r
                                } else if (OpCodes.Newobj.Equals ((OpCode)$1)) {\r
-                                       currentInstr = new InstrNewobj ((OpCode) $1, (string)$2, (string)$3, (string)$4, \r
-                                               (string)$5, (string)$7, $9 as ArrayList);\r
+                                       currentInstr = new InstrNewobj ((OpCode) $1, (string)$2, (string)$3, \r
+                                               (string)$4, (string)$6, $8 as ArrayList);\r
                                }\r
                                                                \r
                          }\r