niallp 2004/08/19 10:37:53
Modified: src/share/org/apache/struts/validator/validwhen
ValidWhenLexer.java
Added: src/share/org/apache/struts/validator/validwhen readme.txt
Log:
Re-generated ValidWhenLexer.java for Bug 29429
Revision Changes Path
1.9 +42 -24
jakarta-struts/src/share/org/apache/struts/validator/validwhen/ValidWhenLexer.java
Index: ValidWhenLexer.java
===================================================================
RCS file:
/home/cvs/jakarta-struts/src/share/org/apache/struts/validator/validwhen/ValidWhenLexer.java,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- ValidWhenLexer.java 14 Mar 2004 06:23:53 -0000 1.8
+++ ValidWhenLexer.java 19 Aug 2004 17:37:53 -0000 1.9
@@ -5,7 +5,7 @@
* $Revision$
* $Date$
*
- * Copyright 2003,2004 The Apache Software Foundation.
+ * Copyright 2003-2004 The Apache Software Foundation.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@ -22,25 +22,33 @@
package org.apache.struts.validator.validwhen;
+import java.util.Stack;
+import org.apache.commons.validator.util.ValidatorUtils;
+
+
import java.io.InputStream;
+import antlr.TokenStreamException;
+import antlr.TokenStreamIOException;
+import antlr.TokenStreamRecognitionException;
+import antlr.CharStreamException;
+import antlr.CharStreamIOException;
+import antlr.ANTLRException;
import java.io.Reader;
import java.util.Hashtable;
-
-import antlr.ANTLRHashString;
+import antlr.CharScanner;
+import antlr.InputBuffer;
import antlr.ByteBuffer;
import antlr.CharBuffer;
-import antlr.CharStreamException;
-import antlr.CharStreamIOException;
-import antlr.InputBuffer;
-import antlr.LexerSharedInputState;
-import antlr.NoViableAltForCharException;
-import antlr.RecognitionException;
import antlr.Token;
+import antlr.CommonToken;
+import antlr.RecognitionException;
+import antlr.NoViableAltForCharException;
+import antlr.MismatchedCharException;
import antlr.TokenStream;
-import antlr.TokenStreamException;
-import antlr.TokenStreamIOException;
-import antlr.TokenStreamRecognitionException;
+import antlr.ANTLRHashString;
+import antlr.LexerSharedInputState;
import antlr.collections.impl.BitSet;
+import antlr.SemanticException;
public class ValidWhenLexer extends antlr.CharScanner implements
ValidWhenParserTokenTypes, TokenStream
{
@@ -123,13 +131,13 @@
theRetToken=_returnToken;
break;
}
- case '.': case 'a': case 'b': case 'c':
- case 'd': case 'e': case 'f': case 'g':
- case 'h': case 'i': case 'j': case 'k':
- case 'l': case 'm': case 'n': case 'o':
- case 'p': case 'q': case 'r': case 's':
- case 't': case 'u': case 'v': case 'w':
- case 'x': case 'y': case 'z':
+ case '.': case '_': case 'a': case 'b':
+ case 'c': case 'd': case 'e': case 'f':
+ case 'g': case 'h': case 'i': case 'j':
+ case 'k': case 'l': case 'm': case 'n':
+ case 'o': case 'p': case 'q': case 'r':
+ case 's': case 't': case 'u': case 'v':
+ case 'w': case 'x': case 'y': case 'z':
{
mIDENTIFIER(true);
theRetToken=_returnToken;
@@ -488,6 +496,11 @@
match('.');
break;
}
+ case '_':
+ {
+ match('_');
+ break;
+ }
default:
{
throw new NoViableAltForCharException((char)LA(1),
getFilename(), getLine(), getColumn());
@@ -522,6 +535,11 @@
match('.');
break;
}
+ case '_':
+ {
+ match('_');
+ break;
+ }
default:
{
if ( _cnt41>=1 ) { break _loop41; } else {throw new
NoViableAltForCharException((char)LA(1), getFilename(), getLine(), getColumn());}
@@ -621,12 +639,12 @@
private static final long[] mk_tokenSet_0() {
- long[] data = { 8358477528813282816L, 576460744384577536L, 0L, 0L};
+ long[] data = { 8358477528813282816L, 576460746532061184L, 0L, 0L};
return data;
}
public static final BitSet _tokenSet_0 = new BitSet(mk_tokenSet_0());
private static final long[] mk_tokenSet_1() {
- long[] data = { 8358478061389227520L, 576460744384577536L, 0L, 0L};
+ long[] data = { 8358478061389227520L, 576460746532061184L, 0L, 0L};
return data;
}
public static final BitSet _tokenSet_1 = new BitSet(mk_tokenSet_1());
1.1
jakarta-struts/src/share/org/apache/struts/validator/validwhen/readme.txt
Index: readme.txt
===================================================================
The following files are generated by antlr from the ValidWhenParser.g file
ValidWhenLexer.java
ValidWhenParser.java
ValidWhenParserTokenTypes.java
ValidWhenParserTokenTypes.txt
If you change ValidWhenParser.g then re-generate the above files using antlr
java antlr.Tool ValidWhenParser.g
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
