2006-05-26 Miguel de Icaza <miguel@novell.com>

	* cs-parser.jay: Catch another parsing form for arglist being
	followed by other arguments.  Fixes #78313.

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

diff --git a/mcs/gmcs/ChangeLog b/mcs/gmcs/ChangeLog
index 1a73bcee099550b4d978bf44f945e7ace035a4f2..3450861b9ccab0c224c4f4f5d0264e5a0b0f3d57 100644 (file)
--- a/mcs/gmcs/ChangeLog
+++ b/mcs/gmcs/ChangeLog
@@ -1,3 +1,8 @@
+2006-05-26  Miguel de Icaza  <miguel@novell.com>
+
+       * cs-parser.jay: Catch another parsing form for arglist being
+       followed by other arguments.  Fixes #78313.
+
 2006-05-25  Raja R Harinath  <rharinath@novell.com>
 
        Fix #78324

diff --git a/mcs/gmcs/cs-parser.jay b/mcs/gmcs/cs-parser.jay
index 63cdb7e81d3b8734eced132d7f8e96b68cfcec25..c0e08b978bacadb2f082410ebe66d8005a202f54 100644 (file)
--- a/mcs/gmcs/cs-parser.jay
+++ b/mcs/gmcs/cs-parser.jay
@@ -1247,6 +1247,11 @@ formal_parameter_list
                Report.Error (257, (Location) $1, "An __arglist parameter must be the last parameter in a formal parameter list");
                $$ = null;
          }
+       | fixed_parameters COMMA ARGLIST COMMA error 
+         {
+               Report.Error (257, (Location) $3, "An __arglist parameter must be the last parameter in a formal parameter list");
+               $$ = null;
+         }
        | parameter_array 
          {
                $$ = new Parameters (new Parameter[] { (Parameter) $1 } );

diff --git a/mcs/mcs/ChangeLog b/mcs/mcs/ChangeLog
index 5701fc3b30542e1912ce8c5aa3b66fcf5364430b..367085d270003bee94bafc53fe4bde855235d6f9 100644 (file)
--- a/mcs/mcs/ChangeLog
+++ b/mcs/mcs/ChangeLog
@@ -1,3 +1,8 @@
+2006-05-26  Miguel de Icaza  <miguel@novell.com>
+
+       * cs-parser.jay: Catch another parsing form for arglist being
+       followed by other arguments.  Fixes #78313.
+
 2006-05-24  Raja R Harinath  <rharinath@novell.com>
 
        * flowanalysis.cs (FlowBranchingToplevel.AddReturnOrigin): Move

diff --git a/mcs/mcs/cs-parser.jay b/mcs/mcs/cs-parser.jay
index af0cc3f20b67af31ba781fb9fefddf466ce9f319..badd68048453e38db8d374b4ccd571a9e40f818a 100644 (file)
--- a/mcs/mcs/cs-parser.jay
+++ b/mcs/mcs/cs-parser.jay
@@ -1179,6 +1179,11 @@ formal_parameter_list
                Report.Error (257, (Location) $1, "An __arglist parameter must be the last parameter in a formal parameter list");
                $$ = null;
          }
+       | fixed_parameters COMMA ARGLIST COMMA error 
+         {
+               Report.Error (257, (Location) $3, "An __arglist parameter must be the last parameter in a formal parameter list");
+               $$ = null;
+         }
        | parameter_array 
          {
                $$ = new Parameters (new Parameter[] { (Parameter) $1 } );