mirror of https://github.com/apache/lucene.git
LUCENE-5207: Update to antlr 3.5 (which produces no warnings while compiling with java 7). Also fix the regen-macro to handle windows file paths while replacing
git-svn-id: https://svn.apache.org/repos/asf/lucene/dev/branches/lucene5207@1523042 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
parent
260853183c
commit
7480e82c21
|
@ -51,7 +51,7 @@
|
||||||
<target name="regenerate" depends="run-antlr"/>
|
<target name="regenerate" depends="run-antlr"/>
|
||||||
|
|
||||||
<target name="resolve-antlr" xmlns:ivy="antlib:org.apache.ivy.ant">
|
<target name="resolve-antlr" xmlns:ivy="antlib:org.apache.ivy.ant">
|
||||||
<ivy:cachepath organisation="org.antlr" module="antlr" revision="3.4"
|
<ivy:cachepath organisation="org.antlr" module="antlr" revision="3.5"
|
||||||
inline="true" conf="default" type="jar" pathid="antlr.classpath"/>
|
inline="true" conf="default" type="jar" pathid="antlr.classpath"/>
|
||||||
</target>
|
</target>
|
||||||
|
|
||||||
|
@ -59,6 +59,24 @@
|
||||||
<regen-grammar package="js" grammar="Javascript"/>
|
<regen-grammar package="js" grammar="Javascript"/>
|
||||||
</target>
|
</target>
|
||||||
|
|
||||||
|
<macrodef name="replace-value">
|
||||||
|
<attribute name="value" />
|
||||||
|
<attribute name="property" />
|
||||||
|
<attribute name="from" />
|
||||||
|
<attribute name="to" />
|
||||||
|
<sequential>
|
||||||
|
<loadresource property="@{property}">
|
||||||
|
<string value="@{value}"/>
|
||||||
|
<filterchain>
|
||||||
|
<tokenfilter>
|
||||||
|
<filetokenizer/>
|
||||||
|
<replacestring from="@{from}" to="@{to}"/>
|
||||||
|
</tokenfilter>
|
||||||
|
</filterchain>
|
||||||
|
</loadresource>
|
||||||
|
</sequential>
|
||||||
|
</macrodef>
|
||||||
|
|
||||||
<macrodef name="regen-grammar">
|
<macrodef name="regen-grammar">
|
||||||
<attribute name="package" />
|
<attribute name="package" />
|
||||||
<attribute name="grammar" />
|
<attribute name="grammar" />
|
||||||
|
@ -71,27 +89,24 @@
|
||||||
</fileset>
|
</fileset>
|
||||||
</delete>
|
</delete>
|
||||||
<local name="grammar.path"/>
|
<local name="grammar.path"/>
|
||||||
|
<local name="grammar.matchpath"/>
|
||||||
|
<local name="-grammar.relative.path"/>
|
||||||
<local name="grammar.relative.path"/>
|
<local name="grammar.relative.path"/>
|
||||||
<property name="grammar.path" location="src/java/org/apache/lucene/expressions/@{package}"/>
|
<property name="grammar.path" location="src/java/org/apache/lucene/expressions/@{package}"/>
|
||||||
<property name="grammar.relative.path" location="${grammar.path}" relative="true"/>
|
<!-- this is a hack for windows, because antlr writes absolute paths with double backslashes (no idea why...): -->
|
||||||
<java classname="org.antlr.Tool" fork="true" failonerror="true" classpathref="antlr.classpath">
|
<replace-value property="grammar.matchpath" value="${grammar.path}${file.separator}" from="\" to="\\"/>
|
||||||
|
<property name="-grammar.relative.path" location="${grammar.path}" relative="true"/>
|
||||||
|
<replace-value property="grammar.relative.path" value="${-grammar.relative.path}${file.separator}" from="${file.separator}" to="/"/>
|
||||||
|
<java classname="org.antlr.Tool" fork="true" failonerror="true" classpathref="antlr.classpath" taskname="antlr">
|
||||||
<arg value="-verbose"/>
|
<arg value="-verbose"/>
|
||||||
<arg value="-make"/>
|
<arg value="-make"/>
|
||||||
<arg value="-o"/>
|
<arg value="-o"/>
|
||||||
<arg path="${grammar.path}"/>
|
<arg path="${grammar.path}"/>
|
||||||
<arg path="${grammar.path}/@{grammar}.g"/>
|
<arg path="${grammar.path}/@{grammar}.g"/>
|
||||||
</java>
|
</java>
|
||||||
<!-- prevent warnings from generated code -->
|
|
||||||
<replaceregexp file="${grammar.path}/@{grammar}Parser.java"
|
|
||||||
encoding="UTF-8"
|
|
||||||
byline="true">
|
|
||||||
|
|
||||||
<regexp pattern="@SuppressWarnings(.*)" />
|
|
||||||
<substitution expression="@SuppressWarnings({"all", "warnings", "unchecked", "cast"})" />
|
|
||||||
</replaceregexp>
|
|
||||||
<!-- replace absolute paths by relative ones -->
|
<!-- replace absolute paths by relative ones -->
|
||||||
<replace file="${grammar.path}/@{grammar}Parser.java" token="${grammar.path}" value="${grammar.relative.path}" encoding="UTF-8"/>
|
<replace file="${grammar.path}/@{grammar}Parser.java" token="${grammar.matchpath}" value="${grammar.relative.path}" encoding="UTF-8"/>
|
||||||
<replace file="${grammar.path}/@{grammar}Lexer.java" token="${grammar.path}" value="${grammar.relative.path}" encoding="UTF-8"/>
|
<replace file="${grammar.path}/@{grammar}Lexer.java" token="${grammar.matchpath}" value="${grammar.relative.path}" encoding="UTF-8"/>
|
||||||
<!-- make the generated classes package private (it's an antlr option with 4.0) -->
|
<!-- make the generated classes package private (it's an antlr option with 4.0) -->
|
||||||
<replace file="${grammar.path}/@{grammar}Parser.java" token="public class @{grammar}Parser" value="class @{grammar}Parser" encoding="UTF-8"/>
|
<replace file="${grammar.path}/@{grammar}Parser.java" token="public class @{grammar}Parser" value="class @{grammar}Parser" encoding="UTF-8"/>
|
||||||
<replace file="${grammar.path}/@{grammar}Lexer.java" token="public class @{grammar}Lexer" value="class @{grammar}Lexer" encoding="UTF-8"/>
|
<replace file="${grammar.path}/@{grammar}Lexer.java" token="public class @{grammar}Lexer" value="class @{grammar}Lexer" encoding="UTF-8"/>
|
||||||
|
@ -101,6 +116,9 @@
|
||||||
<!-- remove tabs in antlr generated files (it does this for comments in finally blocks) -->
|
<!-- remove tabs in antlr generated files (it does this for comments in finally blocks) -->
|
||||||
<replaceregexp file="${grammar.path}/@{grammar}Parser.java" match="\t" flags="g" replace=" " encoding="UTF-8"/>
|
<replaceregexp file="${grammar.path}/@{grammar}Parser.java" match="\t" flags="g" replace=" " encoding="UTF-8"/>
|
||||||
<replaceregexp file="${grammar.path}/@{grammar}Lexer.java" match="\t" flags="g" replace=" " encoding="UTF-8"/>
|
<replaceregexp file="${grammar.path}/@{grammar}Lexer.java" match="\t" flags="g" replace=" " encoding="UTF-8"/>
|
||||||
|
<!-- fix line endings -->
|
||||||
|
<fixcrlf file="${grammar.path}/@{grammar}Parser.java"/>
|
||||||
|
<fixcrlf file="${grammar.path}/@{grammar}Lexer.java"/>
|
||||||
</sequential>
|
</sequential>
|
||||||
</macrodef>
|
</macrodef>
|
||||||
</project>
|
</project>
|
||||||
|
|
|
@ -19,7 +19,7 @@
|
||||||
<ivy-module version="2.0">
|
<ivy-module version="2.0">
|
||||||
<info organisation="org.apache.lucene" module="expressions"/>
|
<info organisation="org.apache.lucene" module="expressions"/>
|
||||||
<dependencies>
|
<dependencies>
|
||||||
<dependency org="org.antlr" name="antlr-runtime" rev="3.4" transitive="false"/>
|
<dependency org="org.antlr" name="antlr-runtime" rev="3.5" transitive="false"/>
|
||||||
<dependency org="org.ow2.asm" name="asm" rev="4.1" transitive="false"/>
|
<dependency org="org.ow2.asm" name="asm" rev="4.1" transitive="false"/>
|
||||||
<exclude org="*" ext="*" matcher="regexp" type="${ivy.exclude.types}"/>
|
<exclude org="*" ext="*" matcher="regexp" type="${ivy.exclude.types}"/>
|
||||||
</dependencies>
|
</dependencies>
|
||||||
|
|
File diff suppressed because it is too large
Load Diff
File diff suppressed because it is too large
Load Diff
Loading…
Reference in New Issue