* ILParser.jay: Seperate generic constraints from generic parameters.

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

diff --git a/mcs/ilasm/parser/ChangeLog b/mcs/ilasm/parser/ChangeLog
index 2e80cd7e5109b6ab5b7751d94946b92c3548d648..681e991f23ede290edba9c761bb271d03cbf59e4 100644 (file)
--- a/mcs/ilasm/parser/ChangeLog
+++ b/mcs/ilasm/parser/ChangeLog
@@ -1,3 +1,7 @@
+2003-07-14 Jackson Harper <jackson@latitudegeo.com>
+
+       * ILParser.jay: Seperate generic constraints from generic parameters.
+               
 2003-06-14 Jackson Harper <jackson@latitudegeo.com>
 
        * ILParser.jay: Add set imagebase, subsystem, and corflags.

diff --git a/mcs/ilasm/parser/ILParser.jay b/mcs/ilasm/parser/ILParser.jay
index 82064391058fd5f2cf8b3c501a1a0bb8cca62f41..c6c83143a25d071525bad64e984ed66dfc67c248 100644 (file)
--- a/mcs/ilasm/parser/ILParser.jay
+++ b/mcs/ilasm/parser/ILParser.jay
@@ -446,16 +446,12 @@ class_head                : D_CLASS class_attr id typars_clause extends_clause
                                 codegen.BeginTypeDef ((TypeAttr) $2, (string) $3, \r
                                                $5 as IClassRef, $6 as ArrayList, null);\r
 \r
-                                                /*\r
                                 if ($4 != null) {\r
                                         ArrayList typars_list = (ArrayList) $4;\r
-                                        foreach (DictionaryEntry entry in typars_list) {\r
-                                                ITypeRef constraint = (ITypeRef) entry.Key;\r
-                                                string id = (string) entry.Value;\r
-                                                codegen.CurrentTypeDef.AddGenericParam (constraint, id);\r
-                                        }\r
+                                        foreach (string id in typars_list)\r
+                                                codegen.CurrentTypeDef.AddGenericParam (id);\r
                                 }\r
-                                */\r
+                                \r
                           }\r
                        ;\r
 \r
@@ -509,7 +505,7 @@ typars_clause           : /* EMPTY */
                                 $$ = $2;\r
                           }\r
                         ;\r
-\r
+/*\r
 typars                  : type\r
                           {\r
                                 ArrayList typars_list = new ArrayList ();\r
@@ -523,7 +519,7 @@ typars                  : type
                                 $$ = typars_list;\r
                           }\r
                         ;\r
-\r
+*/\r
 formal_typars           : formal_typar\r
                           {\r
                                 ArrayList formal_list = new ArrayList ();\r
@@ -539,13 +535,9 @@ formal_typars           : formal_typar
                         ;\r
 \r
 \r
-formal_typar            : type\r
-                          {\r
-                                $$ = new DictionaryEntry ($1, null);\r
-                          }\r
-                        | type id\r
+formal_typar            : id\r
                           {\r
-                                $$ = new DictionaryEntry ($1, $2);\r
+                                $$ = $1;\r
                           }\r
                         ;\r
                         \r