[jboss-cvs] jboss-seam ...

[Gavin King]

  User: gavin   
  Date: 07/01/09 22:09:16

  Modified:    jboss-seam  seam-text.g
  Log:
  minor
  
  Revision  Changes    Path
  1.3       +6 -10     jboss-seam/seam-text.g
  
  (In the diff below, changes in quantity of whitespace are not shown.)
  
  Index: seam-text.g
  ===================================================================
  RCS file: /cvsroot/jboss/jboss-seam/seam-text.g,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -b -r1.2 -r1.3
  --- seam-text.g	10 Jan 2007 03:04:26 -0000	1.2
  +++ seam-text.g	10 Jan 2007 03:09:16 -0000	1.3
  @@ -37,14 +37,10 @@
   punctuation: p:PUNCTUATION { append( p.getText() ); }
       ;
       
  -escape: ESCAPE ( seam | html )
  +escape: ESCAPE ( q:QUOTE { append( q.getText() ); } | specialChars | htmlSpecialChars )
       ;
       
  -seam: q:QUOTE { append( q.getText() ); } 
  -    | seamNoQuote
  -    ;
  -
  -seamNoQuote: 
  +specialChars:
             st:STAR { append( st.getText() ); } 
           | sl:SLASH { append( sl.getText() ); } 
           | b:BAR { append( b.getText() ); } 
  @@ -56,8 +52,8 @@
           | u:UNDERSCORE { append( u.getText() ); }
       ;
   
  -
  -html: GT { append(">"); } 
  +htmlSpecialChars: 
  +      GT { append(">"); } 
       | LT { append("<"); } 
       | DOUBLEQUOTE { append("""); } 
       | AMPERSAND { append("&"); }
  @@ -94,7 +90,7 @@
       ;
       
   preformatted: QUOTE { append("<pre>"); }
  -              (word|punctuation|seamNoQuote|html|ws)*
  +              (word|punctuation|specialChars|htmlSpecialChars|ws)*
                 QUOTE { append("</pre>"); }
       ;
       
  @@ -128,7 +124,7 @@
         )
       ;
       
  -attributeValue: ( AMPERSAND { append("&amp;"); } | word | punctuation | ws | seam )*
  +attributeValue: ( AMPERSAND { append("&amp;"); } | word | punctuation | ws | specialChars )*
       ;
   
   class L extends Lexer;