2002-11-02 Gonzalo Paniagua Javier <gonzalo@gnome-db.org>

	* cs-parser.jay: simplified a rule and 5 SR conflicts dissapeared.

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

diff --git a/mcs/mcs/ChangeLog b/mcs/mcs/ChangeLog
index 663aae772fca05ae2dd0006a0962de9601c80675..8c34fac31fd0d6256c5b26c1baaa9532d2b126ee 100755 (executable)
--- a/mcs/mcs/ChangeLog
+++ b/mcs/mcs/ChangeLog
@@ -1,3 +1,7 @@
+2002-11-02  Gonzalo Paniagua Javier <gonzalo@gnome-db.org>
+
+       * cs-parser.jay: simplified a rule and 5 SR conflicts dissapeared.
+
 2002-11-01  Miguel de Icaza  <miguel@ximian.com>
 
        * cs-parser.jay (switch_section): A beautiful patch from Martin

diff --git a/mcs/mcs/cs-parser.jay b/mcs/mcs/cs-parser.jay
index 0f551f94fa79bcad88ea54c164639af00ff3642d..d8410d27773c925733b53572991f22c7b0799274 100755 (executable)
--- a/mcs/mcs/cs-parser.jay
+++ b/mcs/mcs/cs-parser.jay
@@ -2141,14 +2141,10 @@ opt_rank_specifier
        ;
 
 rank_specifiers
-       : rank_specifier
+       : rank_specifier opt_rank_specifier
          {
-                 $$ = $1;
+                 $$ = (string) $1 + (string) $2;
          }
-       | rank_specifiers rank_specifier
-         {
-                 $$ = (string) $2 + (string) $1;
-         }             
         ;
 
 rank_specifier