mirror of https://github.com/apache/lucene.git
LUCENE-3285: Moved analyzing, complexphrase, etx and surround queryparsers to qp module
git-svn-id: https://svn.apache.org/repos/asf/lucene/dev/trunk@1145430 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
parent
44fc93e031
commit
b3671752f2
|
@ -416,9 +416,6 @@
|
|||
<!-- ================================================================== -->
|
||||
<target name="clean-javacc">
|
||||
<delete>
|
||||
<fileset dir="contrib/queryparser/src/java/org/apache/lucene/queryParser/surround/parser" includes="*.java">
|
||||
<containsregexp expression="Generated.*By.*JavaCC"/>
|
||||
</fileset>
|
||||
<fileset dir="contrib/queryparser/src/java/org/apache/lucene/queryParser/standard/parser" includes="*.java">
|
||||
<containsregexp expression="Generated.*By.*JavaCC"/>
|
||||
</fileset>
|
||||
|
|
|
@ -37,7 +37,7 @@
|
|||
<!--
|
||||
NOTE: see the README.javacc for details on how to fully regenerate the parser
|
||||
-->
|
||||
<target name="javacc" depends="javacc-flexible,javacc-surround"/>
|
||||
<target name="javacc" depends="javacc-flexible"/>
|
||||
|
||||
<target name="javacc-flexible" depends="javacc-check">
|
||||
<delete>
|
||||
|
@ -102,12 +102,6 @@ import org.apache.lucene.queryParser.core.messages.*;"
|
|||
byline="true"/>
|
||||
</target>
|
||||
|
||||
<target name="javacc-surround" depends="javacc-check" description="generate surround query parser from jj (requires javacc 4.1">
|
||||
<invoke-javacc target="src/java/org/apache/lucene/queryParser/surround/parser/QueryParser.jj"
|
||||
outputDir="src/java/org/apache/lucene/queryParser/surround/parser"
|
||||
/>
|
||||
</target>
|
||||
|
||||
<target name="build-queryparser" unless="queryparser.uptodate">
|
||||
<echo>QueryParser Contrib building dependency modules/queryparser</echo>
|
||||
<subant target="default">
|
||||
|
|
|
@ -33,10 +33,13 @@
|
|||
<fileset dir="src/java/org/apache/lucene/queryparser/classic" includes="*.java">
|
||||
<containsregexp expression="Generated.*By.*JavaCC"/>
|
||||
</fileset>
|
||||
<fileset dir="src/java/org/apache/lucene/queryparser/surround/parser" includes="*.java">
|
||||
<containsregexp expression="Generated.*By.*JavaCC"/>
|
||||
</fileset>
|
||||
</delete>
|
||||
</target>
|
||||
|
||||
<target name="javacc" depends="init,javacc-check,clean-javacc,javacc-QueryParser"/>
|
||||
<target name="javacc" depends="init,javacc-check,clean-javacc,javacc-QueryParser,javacc-surround"/>
|
||||
|
||||
<target name="javacc-QueryParser" depends="init,javacc-check" if="javacc.present">
|
||||
<sequential>
|
||||
|
@ -56,4 +59,10 @@
|
|||
</sequential>
|
||||
</target>
|
||||
|
||||
<target name="javacc-surround" depends="javacc-check" description="generate surround query parser from jj (requires javacc 4.1">
|
||||
<invoke-javacc target="src/java/org/apache/lucene/queryparser/surround/parser/QueryParser.jj"
|
||||
outputDir="src/java/org/apache/lucene/queryparser/surround/parser"
|
||||
/>
|
||||
</target>
|
||||
|
||||
</project>
|
||||
|
|
|
@ -1,4 +1,4 @@
|
|||
package org.apache.lucene.queryParser.analyzing;
|
||||
package org.apache.lucene.queryparser.analyzing;
|
||||
|
||||
/**
|
||||
* Licensed to the Apache Software Foundation (ASF) under one or more
|
|
@ -1,4 +1,4 @@
|
|||
package org.apache.lucene.queryParser.complexPhrase;
|
||||
package org.apache.lucene.queryparser.complexPhrase;
|
||||
|
||||
/**
|
||||
* Licensed to the Apache Software Foundation (ASF) under one or more
|
|
@ -1,4 +1,4 @@
|
|||
package org.apache.lucene.queryParser.ext;
|
||||
package org.apache.lucene.queryparser.ext;
|
||||
|
||||
/**
|
||||
* Licensed to the Apache Software Foundation (ASF) under one or more
|
||||
|
@ -18,7 +18,7 @@ package org.apache.lucene.queryParser.ext;
|
|||
*/
|
||||
|
||||
import org.apache.lucene.analysis.Analyzer;
|
||||
import org.apache.lucene.queryParser.ext.Extensions.Pair;
|
||||
import org.apache.lucene.queryparser.ext.Extensions.Pair;
|
||||
import org.apache.lucene.queryparser.classic.ParseException;
|
||||
import org.apache.lucene.queryparser.classic.QueryParser;
|
||||
import org.apache.lucene.search.Query;
|
|
@ -1,4 +1,4 @@
|
|||
package org.apache.lucene.queryParser.ext;
|
||||
package org.apache.lucene.queryparser.ext;
|
||||
|
||||
import org.apache.lucene.queryparser.classic.QueryParser;
|
||||
|
|
@ -1,4 +1,4 @@
|
|||
package org.apache.lucene.queryParser.ext;
|
||||
package org.apache.lucene.queryparser.ext;
|
||||
|
||||
/**
|
||||
* Licensed to the Apache Software Foundation (ASF) under one or more
|
|
@ -1,4 +1,4 @@
|
|||
package org.apache.lucene.queryParser.ext;
|
||||
package org.apache.lucene.queryparser.ext;
|
||||
|
||||
/**
|
||||
* Licensed to the Apache Software Foundation (ASF) under one or more
|
|
@ -1,6 +1,6 @@
|
|||
/* Generated By:JavaCC: Do not edit this line. CharStream.java Version 4.1 */
|
||||
/* JavaCCOptions:STATIC=false */
|
||||
package org.apache.lucene.queryParser.surround.parser;
|
||||
package org.apache.lucene.queryparser.surround.parser;
|
||||
|
||||
/**
|
||||
* This interface describes a character stream that maintains line and
|
|
@ -1,5 +1,5 @@
|
|||
// FastCharStream.java
|
||||
package org.apache.lucene.queryParser.surround.parser;
|
||||
package org.apache.lucene.queryparser.surround.parser;
|
||||
/**
|
||||
* Licensed to the Apache Software Foundation (ASF) under one or more
|
||||
* contributor license agreements. See the NOTICE file distributed with
|
|
@ -1,6 +1,6 @@
|
|||
/* Generated By:JavaCC: Do not edit this line. ParseException.java Version 4.1 */
|
||||
/* JavaCCOptions:KEEP_LINE_COL=null */
|
||||
package org.apache.lucene.queryParser.surround.parser;
|
||||
package org.apache.lucene.queryparser.surround.parser;
|
||||
|
||||
/**
|
||||
* This exception is thrown when parse errors are encountered.
|
|
@ -1,5 +1,5 @@
|
|||
/* Generated By:JavaCC: Do not edit this line. QueryParser.java */
|
||||
package org.apache.lucene.queryParser.surround.parser;
|
||||
package org.apache.lucene.queryparser.surround.parser;
|
||||
|
||||
import java.util.ArrayList;
|
||||
import java.util.List;
|
||||
|
@ -8,15 +8,15 @@ import java.io.StringReader;
|
|||
|
||||
import org.apache.lucene.analysis.TokenStream;
|
||||
|
||||
import org.apache.lucene.queryParser.surround.query.SrndQuery;
|
||||
import org.apache.lucene.queryParser.surround.query.FieldsQuery;
|
||||
import org.apache.lucene.queryParser.surround.query.OrQuery;
|
||||
import org.apache.lucene.queryParser.surround.query.AndQuery;
|
||||
import org.apache.lucene.queryParser.surround.query.NotQuery;
|
||||
import org.apache.lucene.queryParser.surround.query.DistanceQuery;
|
||||
import org.apache.lucene.queryParser.surround.query.SrndTermQuery;
|
||||
import org.apache.lucene.queryParser.surround.query.SrndPrefixQuery;
|
||||
import org.apache.lucene.queryParser.surround.query.SrndTruncQuery;
|
||||
import org.apache.lucene.queryparser.surround.query.SrndQuery;
|
||||
import org.apache.lucene.queryparser.surround.query.FieldsQuery;
|
||||
import org.apache.lucene.queryparser.surround.query.OrQuery;
|
||||
import org.apache.lucene.queryparser.surround.query.AndQuery;
|
||||
import org.apache.lucene.queryparser.surround.query.NotQuery;
|
||||
import org.apache.lucene.queryparser.surround.query.DistanceQuery;
|
||||
import org.apache.lucene.queryparser.surround.query.SrndTermQuery;
|
||||
import org.apache.lucene.queryparser.surround.query.SrndPrefixQuery;
|
||||
import org.apache.lucene.queryparser.surround.query.SrndTruncQuery;
|
||||
|
||||
/**
|
||||
* This class is generated by JavaCC. The only method that clients should need
|
|
@ -28,7 +28,7 @@ options {
|
|||
|
||||
PARSER_BEGIN(QueryParser)
|
||||
|
||||
package org.apache.lucene.queryParser.surround.parser;
|
||||
package org.apache.lucene.queryparser.surround.parser;
|
||||
|
||||
import java.util.ArrayList;
|
||||
import java.util.List;
|
||||
|
@ -37,15 +37,15 @@ import java.io.StringReader;
|
|||
|
||||
import org.apache.lucene.analysis.TokenStream;
|
||||
|
||||
import org.apache.lucene.queryParser.surround.query.SrndQuery;
|
||||
import org.apache.lucene.queryParser.surround.query.FieldsQuery;
|
||||
import org.apache.lucene.queryParser.surround.query.OrQuery;
|
||||
import org.apache.lucene.queryParser.surround.query.AndQuery;
|
||||
import org.apache.lucene.queryParser.surround.query.NotQuery;
|
||||
import org.apache.lucene.queryParser.surround.query.DistanceQuery;
|
||||
import org.apache.lucene.queryParser.surround.query.SrndTermQuery;
|
||||
import org.apache.lucene.queryParser.surround.query.SrndPrefixQuery;
|
||||
import org.apache.lucene.queryParser.surround.query.SrndTruncQuery;
|
||||
import org.apache.lucene.queryparser.surround.query.SrndQuery;
|
||||
import org.apache.lucene.queryparser.surround.query.FieldsQuery;
|
||||
import org.apache.lucene.queryparser.surround.query.OrQuery;
|
||||
import org.apache.lucene.queryparser.surround.query.AndQuery;
|
||||
import org.apache.lucene.queryparser.surround.query.NotQuery;
|
||||
import org.apache.lucene.queryparser.surround.query.DistanceQuery;
|
||||
import org.apache.lucene.queryparser.surround.query.SrndTermQuery;
|
||||
import org.apache.lucene.queryparser.surround.query.SrndPrefixQuery;
|
||||
import org.apache.lucene.queryparser.surround.query.SrndTruncQuery;
|
||||
|
||||
/**
|
||||
* This class is generated by JavaCC. The only method that clients should need
|
|
@ -1,5 +1,5 @@
|
|||
/* Generated By:JavaCC: Do not edit this line. QueryParserConstants.java */
|
||||
package org.apache.lucene.queryParser.surround.parser;
|
||||
package org.apache.lucene.queryparser.surround.parser;
|
||||
|
||||
|
||||
/**
|
|
@ -1,18 +1,18 @@
|
|||
/* Generated By:JavaCC: Do not edit this line. QueryParserTokenManager.java */
|
||||
package org.apache.lucene.queryParser.surround.parser;
|
||||
package org.apache.lucene.queryparser.surround.parser;
|
||||
import java.util.ArrayList;
|
||||
import java.util.List;
|
||||
import java.io.StringReader;
|
||||
import org.apache.lucene.analysis.TokenStream;
|
||||
import org.apache.lucene.queryParser.surround.query.SrndQuery;
|
||||
import org.apache.lucene.queryParser.surround.query.FieldsQuery;
|
||||
import org.apache.lucene.queryParser.surround.query.OrQuery;
|
||||
import org.apache.lucene.queryParser.surround.query.AndQuery;
|
||||
import org.apache.lucene.queryParser.surround.query.NotQuery;
|
||||
import org.apache.lucene.queryParser.surround.query.DistanceQuery;
|
||||
import org.apache.lucene.queryParser.surround.query.SrndTermQuery;
|
||||
import org.apache.lucene.queryParser.surround.query.SrndPrefixQuery;
|
||||
import org.apache.lucene.queryParser.surround.query.SrndTruncQuery;
|
||||
import org.apache.lucene.queryparser.surround.query.SrndQuery;
|
||||
import org.apache.lucene.queryparser.surround.query.FieldsQuery;
|
||||
import org.apache.lucene.queryparser.surround.query.OrQuery;
|
||||
import org.apache.lucene.queryparser.surround.query.AndQuery;
|
||||
import org.apache.lucene.queryparser.surround.query.NotQuery;
|
||||
import org.apache.lucene.queryparser.surround.query.DistanceQuery;
|
||||
import org.apache.lucene.queryparser.surround.query.SrndTermQuery;
|
||||
import org.apache.lucene.queryparser.surround.query.SrndPrefixQuery;
|
||||
import org.apache.lucene.queryparser.surround.query.SrndTruncQuery;
|
||||
|
||||
/** Token Manager. */
|
||||
public class QueryParserTokenManager implements QueryParserConstants
|
|
@ -1,6 +1,6 @@
|
|||
/* Generated By:JavaCC: Do not edit this line. Token.java Version 4.1 */
|
||||
/* JavaCCOptions:TOKEN_EXTENDS=,KEEP_LINE_COL=null */
|
||||
package org.apache.lucene.queryParser.surround.parser;
|
||||
package org.apache.lucene.queryparser.surround.parser;
|
||||
|
||||
/**
|
||||
* Describes the input token stream.
|
|
@ -1,6 +1,6 @@
|
|||
/* Generated By:JavaCC: Do not edit this line. TokenMgrError.java Version 4.1 */
|
||||
/* JavaCCOptions: */
|
||||
package org.apache.lucene.queryParser.surround.parser;
|
||||
package org.apache.lucene.queryparser.surround.parser;
|
||||
|
||||
/** Token Manager Error. */
|
||||
@SuppressWarnings("serial")
|
|
@ -23,6 +23,6 @@
|
|||
This package contains the QueryParser.jj source file for the Surround parser.
|
||||
<p/>
|
||||
Parsing the text of a query results in a SrndQuery in the
|
||||
org.apache.lucene.queryParser.surround.query package.
|
||||
org.apache.lucene.queryparser.surround.query package.
|
||||
</body>
|
||||
</html>
|
|
@ -1,4 +1,4 @@
|
|||
package org.apache.lucene.queryParser.surround.query;
|
||||
package org.apache.lucene.queryparser.surround.query;
|
||||
/**
|
||||
* Licensed to the Apache Software Foundation (ASF) under one or more
|
||||
* contributor license agreements. See the NOTICE file distributed with
|
|
@ -1,4 +1,4 @@
|
|||
package org.apache.lucene.queryParser.surround.query;
|
||||
package org.apache.lucene.queryparser.surround.query;
|
||||
/**
|
||||
* Licensed to the Apache Software Foundation (ASF) under one or more
|
||||
* contributor license agreements. See the NOTICE file distributed with
|
|
@ -1,4 +1,4 @@
|
|||
package org.apache.lucene.queryParser.surround.query;
|
||||
package org.apache.lucene.queryparser.surround.query;
|
||||
/**
|
||||
* Licensed to the Apache Software Foundation (ASF) under one or more
|
||||
* contributor license agreements. See the NOTICE file distributed with
|
|
@ -1,4 +1,4 @@
|
|||
package org.apache.lucene.queryParser.surround.query;
|
||||
package org.apache.lucene.queryparser.surround.query;
|
||||
/**
|
||||
* Licensed to the Apache Software Foundation (ASF) under one or more
|
||||
* contributor license agreements. See the NOTICE file distributed with
|
|
@ -1,4 +1,4 @@
|
|||
package org.apache.lucene.queryParser.surround.query;
|
||||
package org.apache.lucene.queryparser.surround.query;
|
||||
/**
|
||||
* Licensed to the Apache Software Foundation (ASF) under one or more
|
||||
* contributor license agreements. See the NOTICE file distributed with
|
|
@ -1,4 +1,4 @@
|
|||
package org.apache.lucene.queryParser.surround.query;
|
||||
package org.apache.lucene.queryparser.surround.query;
|
||||
/**
|
||||
* Licensed to the Apache Software Foundation (ASF) under one or more
|
||||
* contributor license agreements. See the NOTICE file distributed with
|
|
@ -1,4 +1,4 @@
|
|||
package org.apache.lucene.queryParser.surround.query;
|
||||
package org.apache.lucene.queryparser.surround.query;
|
||||
/**
|
||||
* Licensed to the Apache Software Foundation (ASF) under one or more
|
||||
* contributor license agreements. See the NOTICE file distributed with
|
|
@ -1,4 +1,4 @@
|
|||
package org.apache.lucene.queryParser.surround.query;
|
||||
package org.apache.lucene.queryparser.surround.query;
|
||||
/**
|
||||
* Licensed to the Apache Software Foundation (ASF) under one or more
|
||||
* contributor license agreements. See the NOTICE file distributed with
|
|
@ -1,4 +1,4 @@
|
|||
package org.apache.lucene.queryParser.surround.query;
|
||||
package org.apache.lucene.queryparser.surround.query;
|
||||
/**
|
||||
* Licensed to the Apache Software Foundation (ASF) under one or more
|
||||
* contributor license agreements. See the NOTICE file distributed with
|
|
@ -1,4 +1,4 @@
|
|||
package org.apache.lucene.queryParser.surround.query;
|
||||
package org.apache.lucene.queryparser.surround.query;
|
||||
/**
|
||||
* Licensed to the Apache Software Foundation (ASF) under one or more
|
||||
* contributor license agreements. See the NOTICE file distributed with
|
|
@ -1,4 +1,4 @@
|
|||
package org.apache.lucene.queryParser.surround.query;
|
||||
package org.apache.lucene.queryparser.surround.query;
|
||||
/**
|
||||
* Licensed to the Apache Software Foundation (ASF) under one or more
|
||||
* contributor license agreements. See the NOTICE file distributed with
|
|
@ -1,4 +1,4 @@
|
|||
package org.apache.lucene.queryParser.surround.query;
|
||||
package org.apache.lucene.queryparser.surround.query;
|
||||
/**
|
||||
* Licensed to the Apache Software Foundation (ASF) under one or more
|
||||
* contributor license agreements. See the NOTICE file distributed with
|
|
@ -1,4 +1,4 @@
|
|||
package org.apache.lucene.queryParser.surround.query;
|
||||
package org.apache.lucene.queryparser.surround.query;
|
||||
/**
|
||||
* Licensed to the Apache Software Foundation (ASF) under one or more
|
||||
* contributor license agreements. See the NOTICE file distributed with
|
|
@ -1,4 +1,4 @@
|
|||
package org.apache.lucene.queryParser.surround.query;
|
||||
package org.apache.lucene.queryparser.surround.query;
|
||||
/**
|
||||
* Licensed to the Apache Software Foundation (ASF) under one or more
|
||||
* contributor license agreements. See the NOTICE file distributed with
|
|
@ -1,4 +1,4 @@
|
|||
package org.apache.lucene.queryParser.surround.query;
|
||||
package org.apache.lucene.queryparser.surround.query;
|
||||
/**
|
||||
* Licensed to the Apache Software Foundation (ASF) under one or more
|
||||
* contributor license agreements. See the NOTICE file distributed with
|
|
@ -1,4 +1,4 @@
|
|||
package org.apache.lucene.queryParser.surround.query;
|
||||
package org.apache.lucene.queryparser.surround.query;
|
||||
/**
|
||||
* Licensed to the Apache Software Foundation (ASF) under one or more
|
||||
* contributor license agreements. See the NOTICE file distributed with
|
|
@ -22,7 +22,7 @@
|
|||
<body>
|
||||
This package contains SrndQuery and its subclasses.
|
||||
<p/>
|
||||
The parser in the org.apache.lucene.queryParser.surround.parser package
|
||||
The parser in the org.apache.lucene.queryparser.surround.parser package
|
||||
normally generates a SrndQuery.
|
||||
<p/>
|
||||
For searching an org.apache.lucene.search.Query is provided by
|
|
@ -1,4 +1,4 @@
|
|||
package org.apache.lucene.queryParser.analyzing;
|
||||
package org.apache.lucene.queryparser.analyzing;
|
||||
|
||||
/**
|
||||
* Licensed to the Apache Software Foundation (ASF) under one or more
|
|
@ -1,4 +1,4 @@
|
|||
package org.apache.lucene.queryParser.complexPhrase;
|
||||
package org.apache.lucene.queryparser.complexPhrase;
|
||||
|
||||
/**
|
||||
* Licensed to the Apache Software Foundation (ASF) under one or more
|
|
@ -1,4 +1,4 @@
|
|||
package org.apache.lucene.queryParser.ext;
|
||||
package org.apache.lucene.queryparser.ext;
|
||||
|
||||
import org.apache.lucene.index.Term;
|
||||
import org.apache.lucene.queryparser.classic.ParseException;
|
|
@ -1,4 +1,4 @@
|
|||
package org.apache.lucene.queryParser.ext;
|
||||
package org.apache.lucene.queryparser.ext;
|
||||
|
||||
/**
|
||||
* Licensed to the Apache Software Foundation (ASF) under one or more
|
|
@ -1,4 +1,4 @@
|
|||
package org.apache.lucene.queryParser.ext;
|
||||
package org.apache.lucene.queryparser.ext;
|
||||
|
||||
/**
|
||||
* Licensed to the Apache Software Foundation (ASF) under one or more
|
|
@ -1,4 +1,4 @@
|
|||
package org.apache.lucene.queryParser.surround.query;
|
||||
package org.apache.lucene.queryparser.surround.query;
|
||||
|
||||
/**
|
||||
* Licensed to the Apache Software Foundation (ASF) under one or more
|
||||
|
@ -25,7 +25,7 @@ import org.apache.lucene.search.Collector;
|
|||
import org.apache.lucene.search.Scorer;
|
||||
import org.apache.lucene.search.Query;
|
||||
|
||||
import org.apache.lucene.queryParser.surround.parser.QueryParser;
|
||||
import org.apache.lucene.queryparser.surround.parser.QueryParser;
|
||||
|
||||
import org.junit.Assert;
|
||||
|
|
@ -1,4 +1,4 @@
|
|||
package org.apache.lucene.queryParser.surround.query;
|
||||
package org.apache.lucene.queryparser.surround.query;
|
||||
|
||||
/**
|
||||
* Licensed to the Apache Software Foundation (ASF) under one or more
|
||||
|
@ -17,8 +17,8 @@ package org.apache.lucene.queryParser.surround.query;
|
|||
* limitations under the License.
|
||||
*/
|
||||
|
||||
import org.apache.lucene.queryParser.surround.parser.ParseException;
|
||||
import org.apache.lucene.queryParser.surround.parser.QueryParser;
|
||||
import org.apache.lucene.queryparser.surround.parser.ParseException;
|
||||
import org.apache.lucene.queryparser.surround.parser.QueryParser;
|
||||
|
||||
|
||||
public class ExceptionQueryTst {
|
|
@ -1,4 +1,4 @@
|
|||
package org.apache.lucene.queryParser.surround.query;
|
||||
package org.apache.lucene.queryparser.surround.query;
|
||||
|
||||
/**
|
||||
* Licensed to the Apache Software Foundation (ASF) under one or more
|
|
@ -1,4 +1,4 @@
|
|||
package org.apache.lucene.queryParser.surround.query;
|
||||
package org.apache.lucene.queryparser.surround.query;
|
||||
|
||||
/**
|
||||
* Licensed to the Apache Software Foundation (ASF) under one or more
|
|
@ -1,4 +1,4 @@
|
|||
package org.apache.lucene.queryParser.surround.query;
|
||||
package org.apache.lucene.queryparser.surround.query;
|
||||
|
||||
/**
|
||||
* Licensed to the Apache Software Foundation (ASF) under one or more
|
|
@ -1,4 +1,4 @@
|
|||
package org.apache.lucene.queryParser.surround.query;
|
||||
package org.apache.lucene.queryparser.surround.query;
|
||||
|
||||
/**
|
||||
* Licensed to the Apache Software Foundation (ASF) under one or more
|
Loading…
Reference in New Issue