hiifong/pmd
1
0 Fork 0
forked from phoedos/pmd
Code Pull Requests Activity

javacc updated to official 4.1 version

Browse Source 
git-svn-id: https://pmd.svn.sourceforge.net/svnroot/pmd/trunk@6433 51baf565-9d33-0410-a72c-fc3788e3496d
This commit is contained in:
Xavier Le Vourch committed 2008-09-02 16:14:53 +00:00
1 parent 02ae7de255
commit e382173749
18 files changed
+3610 -3610
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

pmd/lib/javacc.jar
BIN
View File
Binary file not shown.
pmd/src/net/sourceforge/pmd/lang/ast/CharStream.java
+112 -112
View File
@@ -1,112 +1,112 @@
/* Generated By:JavaCC: Do not edit this line. CharStream.java Version 4.1 */
/* JavaCCOptions:STATIC=true */
package net.sourceforge.pmd.lang.ast;
/**
* This interface describes a character stream that maintains line and
* column number positions of the characters. It also has the capability
* to backup the stream to some extent. An implementation of this
* interface is used in the TokenManager implementation generated by
* JavaCCParser.
*
* All the methods except backup can be implemented in any fashion. backup
* needs to be implemented correctly for the correct operation of the lexer.
* Rest of the methods are all used to get information like line number,
* column number and the String that constitutes a token and are not used
* by the lexer. Hence their implementation won't affect the generated lexer's
* operation.
*/
public interface CharStream {
/**
* Returns the next character from the selected input. The method
* of selecting the input is the responsibility of the class
* implementing this interface. Can throw any java.io.IOException.
*/
char readChar() throws java.io.IOException;
/**
* Returns the column position of the character last read.
* @deprecated
* @see #getEndColumn
*/
int getColumn();
/**
* Returns the line number of the character last read.
* @deprecated
* @see #getEndLine
*/
int getLine();
/**
* Returns the column number of the last character for current token (being
* matched after the last call to BeginTOken).
*/
int getEndColumn();
/**
* Returns the line number of the last character for current token (being
* matched after the last call to BeginTOken).
*/
int getEndLine();
/**
* Returns the column number of the first character for current token (being
* matched after the last call to BeginTOken).
*/
int getBeginColumn();
/**
* Returns the line number of the first character for current token (being
* matched after the last call to BeginTOken).
*/
int getBeginLine();
/**
* Backs up the input stream by amount steps. Lexer calls this method if it
* had already read some characters, but could not use them to match a
* (longer) token. So, they will be used again as the prefix of the next
* token and it is the implemetation's responsibility to do this right.
*/
void backup(int amount);
/**
* Returns the next character that marks the beginning of the next token.
* All characters must remain in the buffer between two successive calls
* to this method to implement backup correctly.
*/
char BeginToken() throws java.io.IOException;
/**
* Returns a string made up of characters from the marked token beginning
* to the current buffer position. Implementations have the choice of returning
* anything that they want to. For example, for efficiency, one might decide
* to just return null, which is a valid implementation.
*/
String GetImage();
/**
* Returns an array of characters that make up the suffix of length 'len' for
* the currently matched token. This is used to build up the matched string
* for use in actions in the case of MORE. A simple and inefficient
* implementation of this is as follows :
*
* {
* String t = GetImage();
* return t.substring(t.length() - len, t.length()).toCharArray();
* }
*/
char[] GetSuffix(int len);
/**
* The lexer calls this function to indicate that it is done with the stream
* and hence implementations can free any resources held by this class.
* Again, the body of this function can be just empty and it will not
* affect the lexer's operation.
*/
void Done();
}
/* JavaCC - OriginalChecksum=bbcf81522eee3b197df316efeab7fabd (do not edit this line) */
/* Generated By:JavaCC: Do not edit this line. CharStream.java Version 4.1 */
/* JavaCCOptions:STATIC=true */
package net.sourceforge.pmd.lang.ast;
/**
* This interface describes a character stream that maintains line and
* column number positions of the characters. It also has the capability
* to backup the stream to some extent. An implementation of this
* interface is used in the TokenManager implementation generated by
* JavaCCParser.
*
* All the methods except backup can be implemented in any fashion. backup
* needs to be implemented correctly for the correct operation of the lexer.
* Rest of the methods are all used to get information like line number,
* column number and the String that constitutes a token and are not used
* by the lexer. Hence their implementation won't affect the generated lexer's
* operation.
*/
public interface CharStream {
/**
* Returns the next character from the selected input. The method
* of selecting the input is the responsibility of the class
* implementing this interface. Can throw any java.io.IOException.
*/
char readChar() throws java.io.IOException;
/**
* Returns the column position of the character last read.
* @deprecated
* @see #getEndColumn
*/
int getColumn();
/**
* Returns the line number of the character last read.
* @deprecated
* @see #getEndLine
*/
int getLine();
/**
* Returns the column number of the last character for current token (being
* matched after the last call to BeginTOken).
*/
int getEndColumn();
/**
* Returns the line number of the last character for current token (being
* matched after the last call to BeginTOken).
*/
int getEndLine();
/**
* Returns the column number of the first character for current token (being
* matched after the last call to BeginTOken).
*/
int getBeginColumn();
/**
* Returns the line number of the first character for current token (being
* matched after the last call to BeginTOken).
*/
int getBeginLine();
/**
* Backs up the input stream by amount steps. Lexer calls this method if it
* had already read some characters, but could not use them to match a
* (longer) token. So, they will be used again as the prefix of the next
* token and it is the implemetation's responsibility to do this right.
*/
void backup(int amount);
/**
* Returns the next character that marks the beginning of the next token.
* All characters must remain in the buffer between two successive calls
* to this method to implement backup correctly.
*/
char BeginToken() throws java.io.IOException;
/**
* Returns a string made up of characters from the marked token beginning
* to the current buffer position. Implementations have the choice of returning
* anything that they want to. For example, for efficiency, one might decide
* to just return null, which is a valid implementation.
*/
String GetImage();
/**
* Returns an array of characters that make up the suffix of length 'len' for
* the currently matched token. This is used to build up the matched string
* for use in actions in the case of MORE. A simple and inefficient
* implementation of this is as follows :
*
* {
* String t = GetImage();
* return t.substring(t.length() - len, t.length()).toCharArray();
* }
*/
char[] GetSuffix(int len);
/**
* The lexer calls this function to indicate that it is done with the stream
* and hence implementations can free any resources held by this class.
* Again, the body of this function can be just empty and it will not
* affect the lexer's operation.
*/
void Done();
}
/* JavaCC - OriginalChecksum=0c387fa4d138cb757cb48b36d8bfec55 (do not edit this line) */
pmd/src/net/sourceforge/pmd/lang/ast/JavaCharStream.java
+614 -614
View File
File diff suppressed because it is too large. Load diff
pmd/src/net/sourceforge/pmd/lang/ast/SimpleCharStream.java
+472 -472
View File
File diff suppressed because it is too large. Load diff
pmd/src/net/sourceforge/pmd/lang/ast/TokenMgrError.java
+140 -140
View File
@@ -1,140 +1,140 @@
/* Generated By:JavaCC: Do not edit this line. TokenMgrError.java Version 4.1 */
/* JavaCCOptions: */
package net.sourceforge.pmd.lang.ast;
/** Token Manager Error. */
public class TokenMgrError extends RuntimeException
{
/*
* Ordinals for various reasons why an Error of this type can be thrown.
*/
/**
* Lexical error occurred.
*/
public static final int LEXICAL_ERROR = 0;
/**
* An attempt was made to create a second instance of a static token manager.
*/
public static final int STATIC_LEXER_ERROR = 1;
/**
* Tried to change to an invalid lexical state.
*/
public static final int INVALID_LEXICAL_STATE = 2;
/**
* Detected (and bailed out of) an infinite loop in the token manager.
*/
public static final int LOOP_DETECTED = 3;
/**
* Indicates the reason why the exception is thrown. It will have
* one of the above 4 values.
*/
int errorCode;
/**
* Replaces unprintable characters by their escaped (or unicode escaped)
* equivalents in the given string
*/
protected static final String addEscapes(String str) {
StringBuffer retval = new StringBuffer();
char ch;
for (int i = 0; i < str.length(); i++) {
switch (str.charAt(i))
{
case 0 :
continue;
case '\b':
retval.append("\\b");
continue;
case '\t':
retval.append("\\t");
continue;
case '\n':
retval.append("\\n");
continue;
case '\f':
retval.append("\\f");
continue;
case '\r':
retval.append("\\r");
continue;
case '\"':
retval.append("\\\"");
continue;
case '\'':
retval.append("\\\'");
continue;
case '\\':
retval.append("\\\\");
continue;
default:
if ((ch = str.charAt(i)) < 0x20 || ch > 0x7e) {
String s = "0000" + Integer.toString(ch, 16);
retval.append("\\u" + s.substring(s.length() - 4, s.length()));
} else {
retval.append(ch);
}
continue;
}
}
return retval.toString();
}
/**
* Returns a detailed message for the Error when it is thrown by the
* token manager to indicate a lexical error.
* Parameters :
* EOFSeen : indicates if EOF caused the lexical error
* curLexState : lexical state in which this error occurred
* errorLine : line number when the error occurred
* errorColumn : column number when the error occurred
* errorAfter : prefix that was seen before this error occurred
* curchar : the offending character
* Note: You can customize the lexical error message by modifying this method.
*/
protected static String LexicalError(boolean EOFSeen, int lexState, int errorLine, int errorColumn, String errorAfter, char curChar) {
return("Lexical error in file " + AbstractTokenManager.getFileName() + " at line " +
errorLine + ", column " +
errorColumn + ". Encountered: " +
(EOFSeen ? "<EOF> " : ("\"" + addEscapes(String.valueOf(curChar)) + "\"") + " (" + (int)curChar + "), ") +
"after : \"" + addEscapes(errorAfter) + "\"");
}
/**
* You can also modify the body of this method to customize your error messages.
* For example, cases like LOOP_DETECTED and INVALID_LEXICAL_STATE are not
* of end-users concern, so you can return something like :
*
* "Internal Error : Please file a bug report .... "
*
* from this method for such cases in the release version of your parser.
*/
public String getMessage() {
return super.getMessage();
}
/*
* Constructors of various flavors follow.
*/
/** No arg constructor. */
public TokenMgrError() {
}
/** Constructor with message and reason. */
public TokenMgrError(String message, int reason) {
super(message);
errorCode = reason;
}
/** Full Constructor. */
public TokenMgrError(boolean EOFSeen, int lexState, int errorLine, int errorColumn, String errorAfter, char curChar, int reason) {
this(LexicalError(EOFSeen, lexState, errorLine, errorColumn, errorAfter, curChar), reason);
}
}
/* JavaCC - OriginalChecksum=011612e408dcb1be5f5ce2e2f31344d0 (do not edit this line) */
/* Generated By:JavaCC: Do not edit this line. TokenMgrError.java Version 4.1 */
/* JavaCCOptions: */
package net.sourceforge.pmd.lang.ast;
/** Token Manager Error. */
public class TokenMgrError extends RuntimeException
{
/*
* Ordinals for various reasons why an Error of this type can be thrown.
*/
/**
* Lexical error occurred.
*/
public static final int LEXICAL_ERROR = 0;
/**
* An attempt was made to create a second instance of a static token manager.
*/
public static final int STATIC_LEXER_ERROR = 1;
/**
* Tried to change to an invalid lexical state.
*/
public static final int INVALID_LEXICAL_STATE = 2;
/**
* Detected (and bailed out of) an infinite loop in the token manager.
*/
public static final int LOOP_DETECTED = 3;
/**
* Indicates the reason why the exception is thrown. It will have
* one of the above 4 values.
*/
int errorCode;
/**
* Replaces unprintable characters by their escaped (or unicode escaped)
* equivalents in the given string
*/
protected static final String addEscapes(String str) {
StringBuffer retval = new StringBuffer();
char ch;
for (int i = 0; i < str.length(); i++) {
switch (str.charAt(i))
{
case 0 :
continue;
case '\b':
retval.append("\\b");
continue;
case '\t':
retval.append("\\t");
continue;
case '\n':
retval.append("\\n");
continue;
case '\f':
retval.append("\\f");
continue;
case '\r':
retval.append("\\r");
continue;
case '\"':
retval.append("\\\"");
continue;
case '\'':
retval.append("\\\'");
continue;
case '\\':
retval.append("\\\\");
continue;
default:
if ((ch = str.charAt(i)) < 0x20 || ch > 0x7e) {
String s = "0000" + Integer.toString(ch, 16);
retval.append("\\u" + s.substring(s.length() - 4, s.length()));
} else {
retval.append(ch);
}
continue;
}
}
return retval.toString();
}
/**
* Returns a detailed message for the Error when it is thrown by the
* token manager to indicate a lexical error.
* Parameters :
* EOFSeen : indicates if EOF caused the lexical error
* curLexState : lexical state in which this error occurred
* errorLine : line number when the error occurred
* errorColumn : column number when the error occurred
* errorAfter : prefix that was seen before this error occurred
* curchar : the offending character
* Note: You can customize the lexical error message by modifying this method.
*/
protected static String LexicalError(boolean EOFSeen, int lexState, int errorLine, int errorColumn, String errorAfter, char curChar) {
return("Lexical error in file " + AbstractTokenManager.getFileName() + " at line " +
errorLine + ", column " +
errorColumn + ". Encountered: " +
(EOFSeen ? "<EOF> " : ("\"" + addEscapes(String.valueOf(curChar)) + "\"") + " (" + (int)curChar + "), ") +
"after : \"" + addEscapes(errorAfter) + "\"");
}
/**
* You can also modify the body of this method to customize your error messages.
* For example, cases like LOOP_DETECTED and INVALID_LEXICAL_STATE are not
* of end-users concern, so you can return something like :
*
* "Internal Error : Please file a bug report .... "
*
* from this method for such cases in the release version of your parser.
*/
public String getMessage() {
return super.getMessage();
}
/*
* Constructors of various flavors follow.
*/
/** No arg constructor. */
public TokenMgrError() {
}
/** Constructor with message and reason. */
public TokenMgrError(String message, int reason) {
super(message);
errorCode = reason;
}
/** Full Constructor. */
public TokenMgrError(boolean EOFSeen, int lexState, int errorLine, int errorColumn, String errorAfter, char curChar, int reason) {
this(LexicalError(EOFSeen, lexState, errorLine, errorColumn, errorAfter, curChar), reason);
}
}
/* JavaCC - OriginalChecksum=887ef629387efaf1cf31f0dc7c077049 (do not edit this line) */
pmd/src/net/sourceforge/pmd/lang/cpp/ast/CppParserConstants.java
+397 -397
View File
File diff suppressed because it is too large. Load diff
pmd/src/net/sourceforge/pmd/lang/cpp/ast/CppParserTokenManager.java
+1680 -1680
View File
File diff suppressed because it is too large. Load diff
pmd/src/net/sourceforge/pmd/lang/cpp/ast/Token.java
+124 -124
View File
@@ -1,124 +1,124 @@
/* Generated By:JavaCC: Do not edit this line. Token.java Version 4.1 */
/* JavaCCOptions:TOKEN_EXTENDS=,KEEP_LINE_COL=null */
package net.sourceforge.pmd.lang.cpp.ast;
/**
* Describes the input token stream.
*/
public class Token {
/**
* An integer that describes the kind of this token. This numbering
* system is determined by JavaCCParser, and a table of these numbers is
* stored in the file ...Constants.java.
*/
public int kind;
/** The line number of the first character of this Token. */
public int beginLine;
/** The column number of the first character of this Token. */
public int beginColumn;
/** The line number of the last character of this Token. */
public int endLine;
/** The column number of the last character of this Token. */
public int endColumn;
/**
* The string image of the token.
*/
public String image;
/**
* A reference to the next regular (non-special) token from the input
* stream. If this is the last token from the input stream, or if the
* token manager has not read tokens beyond this one, this field is
* set to null. This is true only if this token is also a regular
* token. Otherwise, see below for a description of the contents of
* this field.
*/
public Token next;
/**
* This field is used to access special tokens that occur prior to this
* token, but after the immediately preceding regular (non-special) token.
* If there are no such special tokens, this field is set to null.
* When there are more than one such special token, this field refers
* to the last of these special tokens, which in turn refers to the next
* previous special token through its specialToken field, and so on
* until the first special token (whose specialToken field is null).
* The next fields of special tokens refer to other special tokens that
* immediately follow it (without an intervening regular token). If there
* is no such token, this field is null.
*/
public Token specialToken;
/**
* An optional attribute value of the Token.
* Tokens which are not used as syntactic sugar will often contain
* meaningful values that will be used later on by the compiler or
* interpreter. This attribute value is often different from the image.
* Any subclass of Token that actually wants to return a non-null value can
* override this method as appropriate.
*/
public Object getValue() {
return null;
}
/**
* No-argument constructor
*/
public Token() {}
/**
* Constructs a new token for the specified Image.
*/
public Token(int kind)
{
this(kind, null);
}
/**
* Constructs a new token for the specified Image and Kind.
*/
public Token(int kind, String image)
{
this.kind = kind;
this.image = image;
}
/**
* Returns the image.
*/
public String toString()
{
return image;
}
/**
* Returns a new Token object, by default. However, if you want, you
* can create and return subclass objects based on the value of ofKind.
* Simply add the cases to the switch for all those special cases.
* For example, if you have a subclass of Token called IDToken that
* you want to create if ofKind is ID, simply add something like :
*
* case MyParserConstants.ID : return new IDToken(ofKind, image);
*
* to the following switch statement. Then you can cast matchedToken
* variable to the appropriate type and use sit in your lexical actions.
*/
public static Token newToken(int ofKind, String image)
{
switch(ofKind)
{
default : return new Token(ofKind, image);
}
}
public static Token newToken(int ofKind)
{
return newToken(ofKind, null);
}
}
/* JavaCC - OriginalChecksum=a48eff30fff78ae5da63653beea2021f (do not edit this line) */
/* Generated By:JavaCC: Do not edit this line. Token.java Version 4.1 */
/* JavaCCOptions:TOKEN_EXTENDS=,KEEP_LINE_COL=null */
package net.sourceforge.pmd.lang.cpp.ast;
/**
* Describes the input token stream.
*/
public class Token {
/**
* An integer that describes the kind of this token. This numbering
* system is determined by JavaCCParser, and a table of these numbers is
* stored in the file ...Constants.java.
*/
public int kind;
/** The line number of the first character of this Token. */
public int beginLine;
/** The column number of the first character of this Token. */
public int beginColumn;
/** The line number of the last character of this Token. */
public int endLine;
/** The column number of the last character of this Token. */
public int endColumn;
/**
* The string image of the token.
*/
public String image;
/**
* A reference to the next regular (non-special) token from the input
* stream. If this is the last token from the input stream, or if the
* token manager has not read tokens beyond this one, this field is
* set to null. This is true only if this token is also a regular
* token. Otherwise, see below for a description of the contents of
* this field.
*/
public Token next;
/**
* This field is used to access special tokens that occur prior to this
* token, but after the immediately preceding regular (non-special) token.
* If there are no such special tokens, this field is set to null.
* When there are more than one such special token, this field refers
* to the last of these special tokens, which in turn refers to the next
* previous special token through its specialToken field, and so on
* until the first special token (whose specialToken field is null).
* The next fields of special tokens refer to other special tokens that
* immediately follow it (without an intervening regular token). If there
* is no such token, this field is null.
*/
public Token specialToken;
/**
* An optional attribute value of the Token.
* Tokens which are not used as syntactic sugar will often contain
* meaningful values that will be used later on by the compiler or
* interpreter. This attribute value is often different from the image.
* Any subclass of Token that actually wants to return a non-null value can
* override this method as appropriate.
*/
public Object getValue() {
return null;
}
/**
* No-argument constructor
*/
public Token() {}
/**
* Constructs a new token for the specified Image.
*/
public Token(int kind)
{
this(kind, null);
}
/**
* Constructs a new token for the specified Image and Kind.
*/
public Token(int kind, String image)
{
this.kind = kind;
this.image = image;
}
/**
* Returns the image.
*/
public String toString()
{
return image;
}
/**
* Returns a new Token object, by default. However, if you want, you
* can create and return subclass objects based on the value of ofKind.
* Simply add the cases to the switch for all those special cases.
* For example, if you have a subclass of Token called IDToken that
* you want to create if ofKind is ID, simply add something like :
*
* case MyParserConstants.ID : return new IDToken(ofKind, image);
*
* to the following switch statement. Then you can cast matchedToken
* variable to the appropriate type and use sit in your lexical actions.
*/
public static Token newToken(int ofKind, String image)
{
switch(ofKind)
{
default : return new Token(ofKind, image);
}
}
public static Token newToken(int ofKind)
{
return newToken(ofKind, null);
}
}
/* JavaCC - OriginalChecksum=2fb0085f94258a33bfd304b374a2793f (do not edit this line) */
pmd/src/net/sourceforge/pmd/lang/java/ast/JavaParserConstants.java
+1 -1
View File
@@ -2,7 +2,7 @@
package net.sourceforge.pmd.lang.java.ast;
/**
/**
* Token literal values and constants.
* Generated by org.javacc.parser.OtherFilesGen#start()
*/
pmd/src/net/sourceforge/pmd/lang/java/ast/JavaParserTokenManager.java
+17 -17
View File
@@ -388,7 +388,7 @@ private int jjMoveStringLiteralDfa1_0(long active0, long active1)
private int jjMoveStringLiteralDfa2_0(long old0, long active0, long old1, long active1)
{
if (((active0 &= old0) | (active1 &= old1)) == 0L)
return jjStartNfa_0(0, old0, old1);
return jjStartNfa_0(0, old0, old1);
try { curChar = input_stream.readChar(); }
catch(java.io.IOException e) {
jjStopStringLiteralDfa_0(1, active0, active1);
@@ -468,7 +468,7 @@ private int jjMoveStringLiteralDfa2_0(long old0, long active0, long old1, long a
private int jjMoveStringLiteralDfa3_0(long old0, long active0, long old1, long active1)
{
if (((active0 &= old0) | (active1 &= old1)) == 0L)
return jjStartNfa_0(1, old0, old1);
return jjStartNfa_0(1, old0, old1);
try { curChar = input_stream.readChar(); }
catch(java.io.IOException e) {
jjStopStringLiteralDfa_0(2, active0, active1);
@@ -540,7 +540,7 @@ private int jjMoveStringLiteralDfa3_0(long old0, long active0, long old1, long a
private int jjMoveStringLiteralDfa4_0(long old0, long active0, long old1, long active1)
{
if (((active0 &= old0) | (active1 &= old1)) == 0L)
return jjStartNfa_0(2, old0, old1);
return jjStartNfa_0(2, old0, old1);
try { curChar = input_stream.readChar(); }
catch(java.io.IOException e) {
jjStopStringLiteralDfa_0(3, active0, 0L);
@@ -1604,7 +1604,7 @@ private static final boolean jjCanMove_0(int hiByte, int i1, int i2, long l1, lo
{
case 0:
return ((jjbitVec2[i2] & l2) != 0L);
default :
default :
if ((jjbitVec0[i1] & l1) != 0L)
return true;
return false;
@@ -1688,7 +1688,7 @@ private static final boolean jjCanMove_1(int hiByte, int i1, int i2, long l1, lo
return ((jjbitVec38[i2] & l2) != 0L);
case 255:
return ((jjbitVec39[i2] & l2) != 0L);
default :
default :
if ((jjbitVec3[i1] & l1) != 0L)
return true;
return false;
@@ -1772,7 +1772,7 @@ private static final boolean jjCanMove_2(int hiByte, int i1, int i2, long l1, lo
return ((jjbitVec60[i2] & l2) != 0L);
case 255:
return ((jjbitVec61[i2] & l2) != 0L);
default :
default :
if ((jjbitVec3[i1] & l1) != 0L)
return true;
return false;
@@ -1806,9 +1806,9 @@ null, null, null, null, null, "\50", "\51", "\173", "\175", "\133", "\135", "\73
/** Lexer state names. */
public static final String[] lexStateNames = {
"DEFAULT",
"IN_FORMAL_COMMENT",
"IN_MULTI_LINE_COMMENT",
"DEFAULT",
"IN_FORMAL_COMMENT",
"IN_MULTI_LINE_COMMENT",
};
/** Lex State array. */
@@ -1922,13 +1922,13 @@ public Token getNextToken()
EOFLoop :
for (;;)
{
try
{
{
try
{
curChar = input_stream.BeginToken();
}
}
catch(java.io.IOException e)
{
{
jjmatchedKind = 0;
matchedToken = jjFillToken();
matchedToken.specialToken = specialToken;
@@ -1993,7 +1993,7 @@ public Token getNextToken()
}
SkipLexicalActions(matchedToken);
}
else
else
SkipLexicalActions(null);
if (jjnewLexState[jjmatchedKind] != -1)
curLexState = jjnewLexState[jjmatchedKind];
@@ -2068,7 +2068,7 @@ void MoreLexicalActions()
jjimageLen = 0;
input_stream.backup(1);
break;
default :
default :
break;
}
}
@@ -2092,7 +2092,7 @@ void TokenLexicalActions(Token matchedToken)
input_stream.backup(1);
matchedToken.image = ">";
break;
default :
default :
break;
}
}
pmd/src/net/sourceforge/pmd/lang/java/ast/ParseException.java
+3 -3
View File
@@ -126,7 +126,7 @@ public class ParseException extends net.sourceforge.pmd.lang.ast.ParseException
retval += " \"";
retval += add_escapes(tok.image);
retval += " \"";
tok = tok.next;
tok = tok.next;
}
retval += "\" at line " + currentToken.next.beginLine + ", column " + currentToken.next.beginColumn;
retval += "." + eol;
@@ -143,7 +143,7 @@ public class ParseException extends net.sourceforge.pmd.lang.ast.ParseException
* The end of line string for this machine.
*/
protected String eol = System.getProperty("line.separator", "\n");
/**
* Used to convert raw characters to their escaped version
* when these raw version cannot be used as part of an ASCII
@@ -195,4 +195,4 @@ public class ParseException extends net.sourceforge.pmd.lang.ast.ParseException
}
}
/* JavaCC - OriginalChecksum=29236f8f6c91a233e4875e6687062604 (do not edit this line) */
/* JavaCC - OriginalChecksum=a63a6feef75bb2f43f87818b3b26b2af (do not edit this line) */
pmd/src/net/sourceforge/pmd/lang/jsp/ast/JJTJspParserState.java
+1 -1
View File
@@ -122,4 +122,4 @@ public class JJTJspParserState {
}
}
}
/* JavaCC - OriginalChecksum=976ca1e331dba4277c943b828fdb0955 (do not edit this line) */
/* JavaCC - OriginalChecksum=d16c33f88464be769fa14a7d8f0b5d07 (do not edit this line) */
pmd/src/net/sourceforge/pmd/lang/jsp/ast/JspParserConstants.java
+1 -1
View File
@@ -2,7 +2,7 @@
package net.sourceforge.pmd.lang.jsp.ast;
/**
/**
* Token literal values and constants.
* Generated by org.javacc.parser.OtherFilesGen#start()
*/
pmd/src/net/sourceforge/pmd/lang/jsp/ast/JspParserTokenManager.java
+42 -42
View File
@@ -871,7 +871,7 @@ private int jjMoveStringLiteralDfa1_7(long active0)
private int jjMoveStringLiteralDfa2_7(long old0, long active0)
{
if (((active0 &= old0)) == 0L)
return jjStartNfa_7(0, old0);
return jjStartNfa_7(0, old0);
try { curChar = input_stream.readChar(); }
catch(java.io.IOException e) {
jjStopStringLiteralDfa_7(1, active0);
@@ -889,7 +889,7 @@ private int jjMoveStringLiteralDfa2_7(long old0, long active0)
private int jjMoveStringLiteralDfa3_7(long old0, long active0)
{
if (((active0 &= old0)) == 0L)
return jjStartNfa_7(1, old0);
return jjStartNfa_7(1, old0);
try { curChar = input_stream.readChar(); }
catch(java.io.IOException e) {
jjStopStringLiteralDfa_7(2, active0);
@@ -1213,7 +1213,7 @@ private int jjMoveStringLiteralDfa1_16(long active0)
private int jjMoveStringLiteralDfa2_16(long old0, long active0)
{
if (((active0 &= old0)) == 0L)
return jjStartNfa_16(0, old0);
return jjStartNfa_16(0, old0);
try { curChar = input_stream.readChar(); }
catch(java.io.IOException e) {
jjStopStringLiteralDfa_16(1, active0);
@@ -1248,7 +1248,7 @@ private int jjMoveStringLiteralDfa2_16(long old0, long active0)
private int jjMoveStringLiteralDfa3_16(long old0, long active0)
{
if (((active0 &= old0)) == 0L)
return jjStartNfa_16(1, old0);
return jjStartNfa_16(1, old0);
try { curChar = input_stream.readChar(); }
catch(java.io.IOException e) {
jjStopStringLiteralDfa_16(2, active0);
@@ -1276,7 +1276,7 @@ private int jjMoveStringLiteralDfa3_16(long old0, long active0)
private int jjMoveStringLiteralDfa4_16(long old0, long active0)
{
if (((active0 &= old0)) == 0L)
return jjStartNfa_16(2, old0);
return jjStartNfa_16(2, old0);
try { curChar = input_stream.readChar(); }
catch(java.io.IOException e) {
jjStopStringLiteralDfa_16(3, active0);
@@ -1298,7 +1298,7 @@ private int jjMoveStringLiteralDfa4_16(long old0, long active0)
private int jjMoveStringLiteralDfa5_16(long old0, long active0)
{
if (((active0 &= old0)) == 0L)
return jjStartNfa_16(3, old0);
return jjStartNfa_16(3, old0);
try { curChar = input_stream.readChar(); }
catch(java.io.IOException e) {
jjStopStringLiteralDfa_16(4, active0);
@@ -1320,7 +1320,7 @@ private int jjMoveStringLiteralDfa5_16(long old0, long active0)
private int jjMoveStringLiteralDfa6_16(long old0, long active0)
{
if (((active0 &= old0)) == 0L)
return jjStartNfa_16(4, old0);
return jjStartNfa_16(4, old0);
try { curChar = input_stream.readChar(); }
catch(java.io.IOException e) {
jjStopStringLiteralDfa_16(5, active0);
@@ -1342,7 +1342,7 @@ private int jjMoveStringLiteralDfa6_16(long old0, long active0)
private int jjMoveStringLiteralDfa7_16(long old0, long active0)
{
if (((active0 &= old0)) == 0L)
return jjStartNfa_16(5, old0);
return jjStartNfa_16(5, old0);
try { curChar = input_stream.readChar(); }
catch(java.io.IOException e) {
jjStopStringLiteralDfa_16(6, active0);
@@ -1364,7 +1364,7 @@ private int jjMoveStringLiteralDfa7_16(long old0, long active0)
private int jjMoveStringLiteralDfa8_16(long old0, long active0)
{
if (((active0 &= old0)) == 0L)
return jjStartNfa_16(6, old0);
return jjStartNfa_16(6, old0);
try { curChar = input_stream.readChar(); }
catch(java.io.IOException e) {
jjStopStringLiteralDfa_16(7, active0);
@@ -1507,7 +1507,7 @@ private int jjMoveStringLiteralDfa1_12(long active0)
private int jjMoveStringLiteralDfa2_12(long old0, long active0)
{
if (((active0 &= old0)) == 0L)
return jjStartNfa_12(0, old0);
return jjStartNfa_12(0, old0);
try { curChar = input_stream.readChar(); }
catch(java.io.IOException e) {
jjStopStringLiteralDfa_12(1, active0);
@@ -1542,7 +1542,7 @@ private int jjMoveStringLiteralDfa2_12(long old0, long active0)
private int jjMoveStringLiteralDfa3_12(long old0, long active0)
{
if (((active0 &= old0)) == 0L)
return jjStartNfa_12(1, old0);
return jjStartNfa_12(1, old0);
try { curChar = input_stream.readChar(); }
catch(java.io.IOException e) {
jjStopStringLiteralDfa_12(2, active0);
@@ -1570,7 +1570,7 @@ private int jjMoveStringLiteralDfa3_12(long old0, long active0)
private int jjMoveStringLiteralDfa4_12(long old0, long active0)
{
if (((active0 &= old0)) == 0L)
return jjStartNfa_12(2, old0);
return jjStartNfa_12(2, old0);
try { curChar = input_stream.readChar(); }
catch(java.io.IOException e) {
jjStopStringLiteralDfa_12(3, active0);
@@ -1592,7 +1592,7 @@ private int jjMoveStringLiteralDfa4_12(long old0, long active0)
private int jjMoveStringLiteralDfa5_12(long old0, long active0)
{
if (((active0 &= old0)) == 0L)
return jjStartNfa_12(3, old0);
return jjStartNfa_12(3, old0);
try { curChar = input_stream.readChar(); }
catch(java.io.IOException e) {
jjStopStringLiteralDfa_12(4, active0);
@@ -1614,7 +1614,7 @@ private int jjMoveStringLiteralDfa5_12(long old0, long active0)
private int jjMoveStringLiteralDfa6_12(long old0, long active0)
{
if (((active0 &= old0)) == 0L)
return jjStartNfa_12(4, old0);
return jjStartNfa_12(4, old0);
try { curChar = input_stream.readChar(); }
catch(java.io.IOException e) {
jjStopStringLiteralDfa_12(5, active0);
@@ -1636,7 +1636,7 @@ private int jjMoveStringLiteralDfa6_12(long old0, long active0)
private int jjMoveStringLiteralDfa7_12(long old0, long active0)
{
if (((active0 &= old0)) == 0L)
return jjStartNfa_12(5, old0);
return jjStartNfa_12(5, old0);
try { curChar = input_stream.readChar(); }
catch(java.io.IOException e) {
jjStopStringLiteralDfa_12(6, active0);
@@ -1658,7 +1658,7 @@ private int jjMoveStringLiteralDfa7_12(long old0, long active0)
private int jjMoveStringLiteralDfa8_12(long old0, long active0)
{
if (((active0 &= old0)) == 0L)
return jjStartNfa_12(6, old0);
return jjStartNfa_12(6, old0);
try { curChar = input_stream.readChar(); }
catch(java.io.IOException e) {
jjStopStringLiteralDfa_12(7, active0);
@@ -2679,7 +2679,7 @@ private int jjMoveStringLiteralDfa1_5(long active0)
private int jjMoveStringLiteralDfa2_5(long old0, long active0)
{
if (((active0 &= old0)) == 0L)
return jjStartNfa_5(0, old0);
return jjStartNfa_5(0, old0);
try { curChar = input_stream.readChar(); }
catch(java.io.IOException e) {
jjStopStringLiteralDfa_5(1, active0);
@@ -2701,7 +2701,7 @@ private int jjMoveStringLiteralDfa2_5(long old0, long active0)
private int jjMoveStringLiteralDfa3_5(long old0, long active0)
{
if (((active0 &= old0)) == 0L)
return jjStartNfa_5(1, old0);
return jjStartNfa_5(1, old0);
try { curChar = input_stream.readChar(); }
catch(java.io.IOException e) {
jjStopStringLiteralDfa_5(2, active0);
@@ -2723,7 +2723,7 @@ private int jjMoveStringLiteralDfa3_5(long old0, long active0)
private int jjMoveStringLiteralDfa4_5(long old0, long active0)
{
if (((active0 &= old0)) == 0L)
return jjStartNfa_5(2, old0);
return jjStartNfa_5(2, old0);
try { curChar = input_stream.readChar(); }
catch(java.io.IOException e) {
jjStopStringLiteralDfa_5(3, active0);
@@ -2745,7 +2745,7 @@ private int jjMoveStringLiteralDfa4_5(long old0, long active0)
private int jjMoveStringLiteralDfa5_5(long old0, long active0)
{
if (((active0 &= old0)) == 0L)
return jjStartNfa_5(3, old0);
return jjStartNfa_5(3, old0);
try { curChar = input_stream.readChar(); }
catch(java.io.IOException e) {
jjStopStringLiteralDfa_5(4, active0);
@@ -3229,23 +3229,23 @@ null, "\47", null, null, "\42", null, null, null, null, };
/** Lexer state names. */
public static final String[] lexStateNames = {
"CommentState",
"AttrValueBetweenDoubleQuotesState",
"AttrValueBetweenSingleQuotesState",
"StartTagState",
"CDataState",
"DocTypeExternalIdState",
"DocTypeState",
"JspCommentState",
"JspDeclarationState",
"JspExpressionState",
"JspScriptletState",
"InTagState",
"AfterTagState",
"AttrValueState",
"JspDirectiveAttributesState",
"JspDirectiveState",
"DEFAULT",
"CommentState",
"AttrValueBetweenDoubleQuotesState",
"AttrValueBetweenSingleQuotesState",
"StartTagState",
"CDataState",
"DocTypeExternalIdState",
"DocTypeState",
"JspCommentState",
"JspDeclarationState",
"JspExpressionState",
"JspScriptletState",
"InTagState",
"AfterTagState",
"AttrValueState",
"JspDirectiveAttributesState",
"JspDirectiveState",
"DEFAULT",
};
/** Lex State array. */
@@ -3351,13 +3351,13 @@ public Token getNextToken()
EOFLoop :
for (;;)
{
try
{
{
try
{
curChar = input_stream.BeginToken();
}
}
catch(java.io.IOException e)
{
{
jjmatchedKind = 0;
matchedToken = jjFillToken();
matchedToken.specialToken = specialToken;
pmd/src/net/sourceforge/pmd/lang/jsp/ast/JspParserTreeConstants.java
+1 -1
View File
@@ -52,4 +52,4 @@ public interface JspParserTreeConstants
"DoctypeExternalId",
};
}
/* JavaCC - OriginalChecksum=538b584b412e9a3389185d768af28183 (do not edit this line) */
/* JavaCC - OriginalChecksum=71c6213c71bf42a9b188039b011ef3fa (do not edit this line) */
pmd/src/net/sourceforge/pmd/lang/jsp/ast/JspParserVisitor.java
+1 -1
View File
@@ -26,4 +26,4 @@ public interface JspParserVisitor
public Object visit(ASTDoctypeDeclaration node, Object data);
public Object visit(ASTDoctypeExternalId node, Object data);
}
/* JavaCC - OriginalChecksum=ca2b21d15ecbbc104a0ac9792fa736b6 (do not edit this line) */
/* JavaCC - OriginalChecksum=34036f9be051dd3397ac21f8e8b1d0ca (do not edit this line) */
pmd/src/net/sourceforge/pmd/lang/jsp/ast/ParseException.java
+3 -3
View File
@@ -126,7 +126,7 @@ public class ParseException extends net.sourceforge.pmd.lang.ast.ParseException
retval += " \"";
retval += add_escapes(tok.image);
retval += " \"";
tok = tok.next;
tok = tok.next;
}
retval += "\" at line " + currentToken.next.beginLine + ", column " + currentToken.next.beginColumn;
retval += "." + eol;
@@ -143,7 +143,7 @@ public class ParseException extends net.sourceforge.pmd.lang.ast.ParseException
* The end of line string for this machine.
*/
protected String eol = System.getProperty("line.separator", "\n");
/**
* Used to convert raw characters to their escaped version
* when these raw version cannot be used as part of an ASCII
@@ -195,4 +195,4 @@ public class ParseException extends net.sourceforge.pmd.lang.ast.ParseException
}
}
/* JavaCC - OriginalChecksum=cd4307ac2d4989d25bb500d2c43a83fe (do not edit this line) */
/* JavaCC - OriginalChecksum=3eaeda8e5224d230494da79e6989b339 (do not edit this line) */
pmd/src/net/sourceforge/pmd/lang/jsp/ast/Token.java
+1 -1
View File
@@ -121,4 +121,4 @@ public class Token {
}
}
/* JavaCC - OriginalChecksum=eb53772888f3c45b4e16655eb67fdfd3 (do not edit this line) */
/* JavaCC - OriginalChecksum=37d2b2975506f4acde6f7611ffab4e7d (do not edit this line) */