Author: raja
Date: 2007-05-02 04:34:15 -0400 (Wed, 02 May 2007)
New Revision: 76555
Added:
trunk/mcs/errors/cs1534-2.cs
Modified:
trunk/mcs/errors/ChangeLog
trunk/mcs/gmcs/ChangeLog
trunk/mcs/gmcs/cs-parser.jay
trunk/mcs/mcs/ChangeLog
trunk/mcs/mcs/cs-parser.jay
Log:
In mcs:
Fix regression in cs0631-3.cs
* cs-parser.jay (operator_declarator): Add opt_attributes to error
fallback. Make error fallback catch more cases.
In gmcs:
Fix regression in cs0631-3.cs
* cs-parser.jay (operator_declarator): Add opt_attributes to error
fallback. Make error fallback catch more cases.
In errors:
* cs1534-2.cs: New test. Ensure that the error handling isn't
limited to only erroneous 3-argument operators.
Modified: trunk/mcs/errors/ChangeLog
===================================================================
--- trunk/mcs/errors/ChangeLog 2007-05-02 07:39:08 UTC (rev 76554)
+++ trunk/mcs/errors/ChangeLog 2007-05-02 08:34:15 UTC (rev 76555)
@@ -1,3 +1,8 @@
+2007-05-02 Raja R Harinath <[EMAIL PROTECTED]>
+
+ * cs1534-2.cs: New test. Ensure that the error handling isn't
+ limited to only erroneous 3-argument operators.
+
2007-04-09 Raja R Harinath <[EMAIL PROTECTED]>
* cs0103-5.cs: New test based on #81338.
Added: trunk/mcs/errors/cs1534-2.cs
===================================================================
--- trunk/mcs/errors/cs1534-2.cs 2007-05-02 07:39:08 UTC (rev 76554)
+++ trunk/mcs/errors/cs1534-2.cs 2007-05-02 08:34:15 UTC (rev 76555)
@@ -0,0 +1,10 @@
+// cs1534.cs: Overloaded binary operator `*' takes two parameters
+// Line: 6
+
+class C
+{
+ public static C operator * (C a, C b, C c, C d)
+ {
+ return null;
+ }
+}
Property changes on: trunk/mcs/errors/cs1534-2.cs
___________________________________________________________________
Name: svn:mime-type
+ text/cpp
Name: svn:eol-style
+ native
Modified: trunk/mcs/gmcs/ChangeLog
===================================================================
--- trunk/mcs/gmcs/ChangeLog 2007-05-02 07:39:08 UTC (rev 76554)
+++ trunk/mcs/gmcs/ChangeLog 2007-05-02 08:34:15 UTC (rev 76555)
@@ -1,3 +1,9 @@
+2007-05-02 Raja R Harinath <[EMAIL PROTECTED]>
+
+ Fix regression in cs0631-3.cs
+ * cs-parser.jay (operator_declarator): Add opt_attributes to error
+ fallback. Make error fallback catch more cases.
+
2007-05-01 Miguel de Icaza <[EMAIL PROTECTED]>
* cs-parser.jay: Allow parameters in operator declarations to have
Modified: trunk/mcs/gmcs/cs-parser.jay
===================================================================
--- trunk/mcs/gmcs/cs-parser.jay 2007-05-02 07:39:08 UTC (rev 76554)
+++ trunk/mcs/gmcs/cs-parser.jay 2007-05-02 08:34:15 UTC (rev 76555)
@@ -2155,10 +2155,8 @@
| conversion_operator_declarator
| type OPERATOR overloadable_operator
open_parens
- opt_parameter_modifier type IDENTIFIER COMMA
- opt_parameter_modifier type IDENTIFIER COMMA
- opt_parameter_modifier type IDENTIFIER
- CLOSE_PARENS
+ opt_attributes opt_parameter_modifier type IDENTIFIER COMMA
+ opt_attributes opt_parameter_modifier type IDENTIFIER COMMA
error
{
Report.Error (1534, (Location) $2, "Overloaded binary operator
`{0}' takes two parameters",
Operator.GetName ((Operator.OpType) $3));
Modified: trunk/mcs/mcs/ChangeLog
===================================================================
--- trunk/mcs/mcs/ChangeLog 2007-05-02 07:39:08 UTC (rev 76554)
+++ trunk/mcs/mcs/ChangeLog 2007-05-02 08:34:15 UTC (rev 76555)
@@ -1,3 +1,14 @@
+2007-05-02 Raja R Harinath <[EMAIL PROTECTED]>
+
+ Fix regression in cs0631-3.cs
+ * cs-parser.jay (operator_declarator): Add opt_attributes to error
+ fallback. Make error fallback catch more cases.
+
+2007-05-01 Miguel de Icaza <[EMAIL PROTECTED]>
+
+ * cs-parser.jay: Allow parameters in operator declarations to have
+ attributes.
+
2007-04-27 Miguel de Icaza <[EMAIL PROTECTED]>
* statement.cs (If.CloneTo): Only clone the FalseStatement if it
Modified: trunk/mcs/mcs/cs-parser.jay
===================================================================
--- trunk/mcs/mcs/cs-parser.jay 2007-05-02 07:39:08 UTC (rev 76554)
+++ trunk/mcs/mcs/cs-parser.jay 2007-05-02 08:34:15 UTC (rev 76555)
@@ -1985,10 +1985,8 @@
| conversion_operator_declarator
| type OPERATOR overloadable_operator
open_parens
- opt_parameter_modifier type IDENTIFIER COMMA
- opt_parameter_modifier type IDENTIFIER COMMA
- opt_parameter_modifier type IDENTIFIER
- CLOSE_PARENS
+ opt_attributes opt_parameter_modifier type IDENTIFIER COMMA
+ opt_attributes opt_parameter_modifier type IDENTIFIER COMMA
error
{
Report.Error (1534, (Location) $2, "Overloaded binary operator
`{0}' takes two parameters",
Operator.GetName ((Operator.OpType) $3));
_______________________________________________
Mono-patches maillist - [email protected]
http://lists.ximian.com/mailman/listinfo/mono-patches
