from Valentin David <valentin@lrde.epita.fr>

	* src/strcxxgen/strcxxgen.str: Fix variable name productions.

cxx-grammar/ChangeLog

+2004-04-05  Valentin David  <valentin@lrde.epita.fr>
+
+	* src/strcxxgen/strcxxgen.str: Fix variable name productions.
+
 2004-04-02  Clement Vasseur  <clement.vasseur@lrde.epita.fr>
 
 	* test/disambiguate/Makefile.am (XFAIL_TESTS): Disable failing tests.

cxx-grammar/src/strcxxgen/strcxxgen.str

 /*
- * Copyright (C) 2003  EPITA Research and Development Laboratory
+ * Copyright (C) 2003, 2004  EPITA Research and Development Laboratory
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -85,13 +85,13 @@ strategies
                         attrs([prefer])),
                    prod([lit(<!["\"", <id>, "\""]; concat-strings>),
                          iter-star(char-class(simple-charclass(range("0","9")))),
-                         iter-star(lit("\"-opt\"")),
+                         lit("\"-opt\""),
                          iter-star(char-class(simple-charclass("\\'")))],
                         opt(sort(<id>)),
                         attrs([prefer])),
                    prod([lit(<!["\"", <id>, "\""]; concat-strings>),
                          iter-star(char-class(simple-charclass(range("0","9")))),
-                         iter-star(lit("\"-iter\"")),
+                         lit("\"-iter\""),
                          iter-star(char-class(simple-charclass("\\'")))],
                         iter(sort(<id>)),
                         attrs([prefer]))])])