Apache
/
lucene
mirror of https://github.com/apache/lucene.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fix a syntax error in javacc result of surround query parser making new clover fail (and its invalid java code that was created)! 

git-svn-id: https://svn.apache.org/repos/asf/lucene/dev/trunk@1457801 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Uwe Schindler 2013-03-18 15:16:09 +00:00
parent d5bcb41586
commit 7f2ea1c098
16 changed files with 14 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
lucene/queryparser/src/java/org/apache/lucene/queryparser/classic/CharStream.java
View File

@ -112,4 +112,4 @@ interface CharStream {
void Done();
}
/* JavaCC - OriginalChecksum=30b94cad7b10d0d81e3a59a1083939d0 (do not edit this line) */
/* JavaCC - OriginalChecksum=c847dd1920bf7901125a7244125682ad (do not edit this line) */

2
lucene/queryparser/src/java/org/apache/lucene/queryparser/classic/ParseException.java
View File

@ -184,4 +184,4 @@ public class ParseException extends Exception {
}
}
/* JavaCC - OriginalChecksum=b187d97d5bb75c3fc63d642c1c26ac6e (do not edit this line) */
/* JavaCC - OriginalChecksum=61602edcb3a15810cbc58f5593eba40d (do not edit this line) */

2
lucene/queryparser/src/java/org/apache/lucene/queryparser/classic/QueryParser.java
View File

@ -165,7 +165,6 @@ public class QueryParser extends QueryParserBase implements QueryParserConstants
}
// This makes sure that there is no garbage after the query string
@Override
final public Query TopLevelQuery(String field) throws ParseException {
Query q;
q = Query(field);
@ -538,7 +537,6 @@ public class QueryParser extends QueryParserBase implements QueryParserConstants
}
/** Reinitialise. */
@Override
public void ReInit(CharStream stream) {
token_source.ReInit(stream);
token = new Token();

3
lucene/queryparser/src/java/org/apache/lucene/queryparser/classic/Token.java
View File

@ -97,7 +97,6 @@ public class Token implements java.io.Serializable {
/**
* Returns the image.
*/
@Override
public String toString()
{
return image;
@ -129,4 +128,4 @@ public class Token implements java.io.Serializable {
}
}
/* JavaCC - OriginalChecksum=405bb5d2fcd84e94ac1c8f0b12c1f914 (do not edit this line) */
/* JavaCC - OriginalChecksum=c1e1418b35aa9e47ef8dc98b87423d70 (do not edit this line) */

3
lucene/queryparser/src/java/org/apache/lucene/queryparser/classic/TokenMgrError.java
View File

@ -121,7 +121,6 @@ public class TokenMgrError extends Error
*
* from this method for such cases in the release version of your parser.
*/
@Override
public String getMessage() {
return super.getMessage();
}
@ -145,4 +144,4 @@ public class TokenMgrError extends Error
this(LexicalError(EOFSeen, lexState, errorLine, errorColumn, errorAfter, curChar), reason);
}
}
/* JavaCC - OriginalChecksum=f433e1a52b8eadbf12f3fbbbf87fd140 (do not edit this line) */
/* JavaCC - OriginalChecksum=0c275864a1972d9a01601ab81426872d (do not edit this line) */

2
lucene/queryparser/src/java/org/apache/lucene/queryparser/flexible/standard/parser/CharStream.java
View File

@ -112,4 +112,4 @@ interface CharStream {
void Done();
}
/* JavaCC - OriginalChecksum=53b2ec7502d50e2290e86187a6c01270 (do not edit this line) */
/* JavaCC - OriginalChecksum=c95f1720d9b38046dc5d294b741c44cb (do not edit this line) */

2
lucene/queryparser/src/java/org/apache/lucene/queryparser/flexible/standard/parser/ParseException.java
View File

@ -187,4 +187,4 @@ public class ParseException extends QueryNodeParseException {
}
}
/* JavaCC - OriginalChecksum=4263a02db9988d7a863aa97ad2f6dc67 (do not edit this line) */
/* JavaCC - OriginalChecksum=81401c29cf6f9909761c636b4778ccc0 (do not edit this line) */

1
lucene/queryparser/src/java/org/apache/lucene/queryparser/flexible/standard/parser/StandardSyntaxParser.java
View File

@ -58,7 +58,6 @@ public class StandardSyntaxParser implements SyntaxParser, StandardSyntaxParserC
* @param query the query string to be parsed.
* @throws ParseException if the parsing fails
*/
@Override
public QueryNode parse(CharSequence query, CharSequence field) throws QueryNodeParseException {
ReInit(new FastCharStream(new StringReader(query.toString())));
try {

3
lucene/queryparser/src/java/org/apache/lucene/queryparser/flexible/standard/parser/Token.java
View File

@ -97,7 +97,6 @@ public class Token implements java.io.Serializable {
/**
* Returns the image.
*/
@Override
public String toString()
{
return image;
@ -129,4 +128,4 @@ public class Token implements java.io.Serializable {
}
}
/* JavaCC - OriginalChecksum=ea8b1e55950603be28e2f63dcd544ab4 (do not edit this line) */
/* JavaCC - OriginalChecksum=30bbd23e0dec26f141130dc62a4f6e9d (do not edit this line) */

3
lucene/queryparser/src/java/org/apache/lucene/queryparser/flexible/standard/parser/TokenMgrError.java
View File

@ -121,7 +121,6 @@ public class TokenMgrError extends Error
*
* from this method for such cases in the release version of your parser.
*/
@Override
public String getMessage() {
return super.getMessage();
}
@ -145,4 +144,4 @@ public class TokenMgrError extends Error
this(LexicalError(EOFSeen, lexState, errorLine, errorColumn, errorAfter, curChar), reason);
}
}
/* JavaCC - OriginalChecksum=be88283d82a985d82a34dda46bcf42d5 (do not edit this line) */
/* JavaCC - OriginalChecksum=3ca7fbf7de9f2424b131a5499b0a78d0 (do not edit this line) */

2
lucene/queryparser/src/java/org/apache/lucene/queryparser/surround/parser/CharStream.java
View File

@ -112,4 +112,4 @@ interface CharStream {
void Done();
}
/* JavaCC - OriginalChecksum=242ae59b965491e225a44534cbc73b42 (do not edit this line) */
/* JavaCC - OriginalChecksum=5ca20c9145f29a0f8909470a7f949fe4 (do not edit this line) */

2
lucene/queryparser/src/java/org/apache/lucene/queryparser/surround/parser/ParseException.java
View File

@ -184,4 +184,4 @@ public class ParseException extends Exception {
}
}
/* JavaCC - OriginalChecksum=bd8163f41bf2fd1bb00f025fce3dcaaf (do not edit this line) */
/* JavaCC - OriginalChecksum=be6f55e3bf157e8c96b4c06cca5ec81b (do not edit this line) */

2
lucene/queryparser/src/java/org/apache/lucene/queryparser/surround/parser/QueryParser.java
View File

@ -52,7 +52,7 @@ public class QueryParser implements QueryParserConstants {
/* CHECKME: These should be the same as for the tokenizer. How? */
final char truncator = '*';
final char anyChar = '?';
final char quote = '\u005c"';
final char quote = '"';
final char fieldOperator = ':';
final char comma = ','; /* prefix list separator */
final char carat = '^'; /* weight operator */

2
lucene/queryparser/src/java/org/apache/lucene/queryparser/surround/parser/QueryParser.jj
View File

@ -81,7 +81,7 @@ public class QueryParser {
/* CHECKME: These should be the same as for the tokenizer. How? */
final char truncator = '*';
final char anyChar = '?';
final char quote = '\"';
final char quote = '"';
final char fieldOperator = ':';
final char comma = ','; /* prefix list separator */
final char carat = '^'; /* weight operator */

3
lucene/queryparser/src/java/org/apache/lucene/queryparser/surround/parser/Token.java
View File

@ -97,7 +97,6 @@ public class Token implements java.io.Serializable {
/**
* Returns the image.
*/
@Override
public String toString()
{
return image;
@ -129,4 +128,4 @@ public class Token implements java.io.Serializable {
}
}
/* JavaCC - OriginalChecksum=f2df701e24da1cf2d025118ce6efdd2f (do not edit this line) */
/* JavaCC - OriginalChecksum=db38f23b3674db52ff034369707a0ac3 (do not edit this line) */

3
lucene/queryparser/src/java/org/apache/lucene/queryparser/surround/parser/TokenMgrError.java
View File

@ -121,7 +121,6 @@ public class TokenMgrError extends Error
*
* from this method for such cases in the release version of your parser.
*/
@Override
public String getMessage() {
return super.getMessage();
}
@ -145,4 +144,4 @@ public class TokenMgrError extends Error
this(LexicalError(EOFSeen, lexState, errorLine, errorColumn, errorAfter, curChar), reason);
}
}
/* JavaCC - OriginalChecksum=8c69a370d9a9893140562c8bb911678c (do not edit this line) */
/* JavaCC - OriginalChecksum=dcdd5ccde13b91bcd8f76a86ca618852 (do not edit this line) */