cvs commit: cocoon-2.1/src/blocks/chaperon/samples/grammars wiki.grm

[stephan]

stephan     2004/02/28 06:32:32

  Modified:    src/blocks/chaperon/samples/grammars wiki.grm
  Log:
  Resolve shift/reduce conflict by rearranging the priorities.
  
  Revision  Changes    Path
  1.7       +6 -6      cocoon-2.1/src/blocks/chaperon/samples/grammars/wiki.grm
  
  Index: wiki.grm
  ===================================================================
  RCS file: /home/cvs/cocoon-2.1/src/blocks/chaperon/samples/grammars/wiki.grm,v
  retrieving revision 1.6
  retrieving revision 1.7
  diff -u -r1.6 -r1.7
  --- wiki.grm  23 Jan 2004 16:19:09 -0000      1.6
  +++ wiki.grm  28 Feb 2004 14:32:32 -0000      1.7
  @@ -1,12 +1,6 @@
   
   %token line "\-\-\-\- (\-*)";
   
  -%token bulleteditem "\*+";
  -
  -%token numbered1item "#";
  -%token numbered2item "##";
  -%token numbered3item "###";
  -
   %token tabletitleitem  "\|\|";
   %token tablecolumnitem "\|";
   
  @@ -37,6 +31,12 @@
   %right break "\\\\";
   
   %right hardbreak "(\r(\n?) | \n) (\r(\n?) | \n)+";
  +
  +%token bulleteditem "\*+";
  +                                                                             
                                                                                
  +%token numbered1item "#";
  +%token numbered2item "##";
  +%token numbered3item "###";
   
   %ignore "[\ \t]+";