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

LUCENE-9080: this jflex file got corrupted somehow during previous commit. I regenerated it with ant, along with the final java file. I also added a crlf normalization, encoding and forced-regeneration to ant because it didn't work before.

This commit is contained in:
Dawid Weiss 2020-01-30 12:50:50 +01:00
parent 13e2094804
commit 043dd207b6
4 changed files with 29359 additions and 29359 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
lucene/analysis/common/build.xml
View File

@ -41,6 +41,7 @@
<target name="-jflex-HTMLStripCharFilter" depends="-install-jflex,generate-jflex-html-char-entities"> <target name="-jflex-HTMLStripCharFilter" depends="-install-jflex,generate-jflex-html-char-entities">
<run-jflex dir="src/java/org/apache/lucene/analysis/charfilter" name="HTMLStripCharFilter"/> <run-jflex dir="src/java/org/apache/lucene/analysis/charfilter" name="HTMLStripCharFilter"/>
<fixcrlf file="src/java/org/apache/lucene/analysis/charfilter/HTMLStripCharFilter.java" encoding="UTF-8" eol="lf"/>
</target> </target>
<target name="generate-jflex-html-char-entities"> <target name="generate-jflex-html-char-entities">
@ -51,7 +52,7 @@
<arg value="-B"/> <arg value="-B"/>
<arg value="htmlentity.py"/> <arg value="htmlentity.py"/>
</exec> </exec>
<fixcrlf file="src/java/org/apache/lucene/analysis/charfilter/HTMLCharacterEntities.jflex" encoding="UTF-8"/> <fixcrlf file="src/java/org/apache/lucene/analysis/charfilter/HTMLCharacterEntities.jflex" encoding="UTF-8" eol="lf"/>
</target> </target>
<target name="-jflex-wiki-tokenizer" depends="-install-jflex"> <target name="-jflex-wiki-tokenizer" depends="-install-jflex">

2
lucene/analysis/common/src/java/org/apache/lucene/analysis/charfilter/HTMLCharacterEntities.jflex
View File

@ -60,7 +60,7 @@ CharacterEntities = ( "AElig" | "Aacute" | "Acirc" | "Agrave" | "Alpha"
| "times" | "trade" | "uArr" | "uacute" | "uarr" | "ucirc" | "times" | "trade" | "uArr" | "uacute" | "uarr" | "ucirc"
| "ugrave" | "uml" | "upsih" | "upsilon" | "uuml" | "ugrave" | "uml" | "upsih" | "upsilon" | "uuml"
| "weierp" | "xi" | "yacute" | "yen" | "yuml" | "zeta" | "weierp" | "xi" | "yacute" | "yen" | "yuml" | "zeta"
(' | "zwj" | "zwnj"', ')') | "zwj" | "zwnj" )
%{ %{
private static final Map<String,String> upperCaseVariantsAccepted private static final Map<String,String> upperCaseVariantsAccepted
= new HashMap<>(); = new HashMap<>();

58710
lucene/analysis/common/src/java/org/apache/lucene/analysis/charfilter/HTMLStripCharFilter.java
View File

File diff suppressed because it is too large Load Diff

3
lucene/common-build.xml
View File

@ -2584,7 +2584,9 @@ The following arguments can be provided to ant to alter its behaviour and target
<!-- The default skeleton is specified here to work around a JFlex ant task bug: --> <!-- The default skeleton is specified here to work around a JFlex ant task bug: -->
<!-- invocations with a non-default skeleton will cause following invocations to --> <!-- invocations with a non-default skeleton will cause following invocations to -->
<!-- use the same skeleton, though not specified, unless the default is configured. --> <!-- use the same skeleton, though not specified, unless the default is configured. -->
<delete file="@{dir}/@{name}.java" />
<jflex file="@{dir}/@{name}.jflex" outdir="@{dir}" nobak="on" <jflex file="@{dir}/@{name}.jflex" outdir="@{dir}" nobak="on"
encoding="UTF-8"
skeleton="${common.dir}/core/src/data/jflex/skeleton.default"/> skeleton="${common.dir}/core/src/data/jflex/skeleton.default"/>
</sequential> </sequential>
</macrodef> </macrodef>
@ -2595,6 +2597,7 @@ The following arguments can be provided to ant to alter its behaviour and target
<sequential> <sequential>
<!-- LUCENE-5897: Disallow scanner buffer expansion --> <!-- LUCENE-5897: Disallow scanner buffer expansion -->
<jflex file="@{dir}/@{name}.jflex" outdir="@{dir}" nobak="on" <jflex file="@{dir}/@{name}.jflex" outdir="@{dir}" nobak="on"
encoding="UTF-8"
skeleton="${common.dir}/core/src/data/jflex/skeleton.disable.buffer.expansion.txt"/> skeleton="${common.dir}/core/src/data/jflex/skeleton.disable.buffer.expansion.txt"/>
<!-- Since the ZZ_BUFFERSIZE declaration is generated rather than in the skeleton, we have to transform it here. --> <!-- Since the ZZ_BUFFERSIZE declaration is generated rather than in the skeleton, we have to transform it here. -->
<replaceregexp file="@{dir}/@{name}.java" <replaceregexp file="@{dir}/@{name}.java"