Author: marek
Date: 2007-12-03 13:04:31 -0500 (Mon, 03 Dec 2007)
New Revision: 90570
Modified:
trunk/mcs/mcs/ChangeLog
trunk/mcs/mcs/cs-parser.jay
Log:
2007-12-03 Marek Safar <[EMAIL PROTECTED]>
* cs-parser.jay: Set delegate constraint parsing region correctly.
Modified: trunk/mcs/mcs/ChangeLog
===================================================================
--- trunk/mcs/mcs/ChangeLog 2007-12-03 18:02:03 UTC (rev 90569)
+++ trunk/mcs/mcs/ChangeLog 2007-12-03 18:04:31 UTC (rev 90570)
@@ -1,5 +1,9 @@
2007-12-03 Marek Safar <[EMAIL PROTECTED]>
+ * cs-parser.jay: Set delegate constraint parsing region correctly.
+
+2007-12-03 Marek Safar <[EMAIL PROTECTED]>
+
A fix for bug #345467
* typemanager.cs (IsEqual): Compare generic parameters position only.
Modified: trunk/mcs/mcs/cs-parser.jay
===================================================================
--- trunk/mcs/mcs/cs-parser.jay 2007-12-03 18:02:03 UTC (rev 90569)
+++ trunk/mcs/mcs/cs-parser.jay 2007-12-03 18:04:31 UTC (rev 90570)
@@ -2848,16 +2848,13 @@
: opt_attributes
opt_modifiers
DELEGATE
- {
- lexer.ConstraintsParsing = true;
- }
type type_name
open_parens opt_formal_parameter_list CLOSE_PARENS
{
- MemberName name = MakeName ((MemberName) $6);
- Parameters p = (Parameters) $8;
+ MemberName name = MakeName ((MemberName) $5);
+ Parameters p = (Parameters) $7;
- Delegate del = new Delegate (current_namespace, current_class,
(Expression) $5,
+ Delegate del = new Delegate (current_namespace, current_class,
(Expression) $4,
(int) $2, name, p, (Attributes)
$1);
if (RootContext.Documentation != null) {
@@ -2867,6 +2864,7 @@
current_container.AddDelegate (del);
current_delegate = del;
+ lexer.ConstraintsParsing = true;
}
opt_type_parameter_constraints_clauses
{
@@ -2874,7 +2872,7 @@
}
SEMICOLON
{
- current_delegate.SetParameterInfo ((ArrayList) $11);
+ current_delegate.SetParameterInfo ((ArrayList) $10);
$$ = current_delegate;
current_delegate = null;
_______________________________________________
Mono-patches maillist - [email protected]
http://lists.ximian.com/mailman/listinfo/mono-patches