[Git][java-team/jruby-joni][debian/sid] 10 commits: [maven-release-plugin] prepare for next development iteration
Hideki Yamane
gitlab at salsa.debian.org
Mon Oct 8 19:02:50 BST 2018
Hideki Yamane pushed to branch debian/sid at Debian Java Maintainers / jruby-joni
Commits:
4aa1cbd9 by Marcin Mielzynski at 2018-09-25T11:19:15Z
[maven-release-plugin] prepare for next development iteration
- - - - -
11d8253b by Marcin Mielzynski at 2018-09-25T18:48:40Z
sync nested repeat operator warning
- - - - -
495de017 by Marcin Mielzynski at 2018-09-29T14:24:52Z
disable int skip map if opt exact max length threshold < 256
- - - - -
d3beb97f by Marcin Mielzynski at 2018-09-29T14:26:51Z
rename to setOptimizeExactInfo
- - - - -
5f85e064 by Hideki Yamane at 2018-10-02T21:36:40Z
use https
- - - - -
ee56ccb0 by Hideki Yamane at 2018-10-02T21:36:51Z
upload to unstable
- - - - -
118dbdee by Marcin Mielzynski at 2018-10-03T16:25:16Z
back off Search.BM_IC and Search.BM_NOT_REV_IC until we find a solution for #25
- - - - -
3856aadd by Marcin Mielzynski at 2018-10-03T16:39:15Z
[maven-release-plugin] prepare release joni-2.1.24
- - - - -
37bb903a by Hideki Yamane at 2018-10-08T17:56:07Z
Merge tag 'joni-2.1.24' into debian/sid
[maven-release-plugin] copy for tag joni-2.1.24
- - - - -
f01a1d00 by Hideki Yamane at 2018-10-08T17:59:55Z
new upstream release
- - - - -
9 changed files:
- debian/changelog
- debian/copyright
- pom.xml
- src/org/joni/Analyser.java
- src/org/joni/Config.java
- src/org/joni/Regex.java
- src/org/joni/Search.java
- src/org/joni/ast/QuantifierNode.java
- test/org/joni/test/TestU8.java
Changes:
=====================================
debian/changelog
=====================================
@@ -1,8 +1,16 @@
-jruby-joni (2.1.23-1) UNRELEASED; urgency=medium
+jruby-joni (2.1.24-1) unstable; urgency=medium
* New upstream release
- -- Hideki Yamane <henrich at debian.org> Tue, 02 Oct 2018 19:59:01 +0900
+ -- Hideki Yamane <henrich at debian.org> Tue, 09 Oct 2018 02:59:49 +0900
+
+jruby-joni (2.1.23-1) unstable; urgency=medium
+
+ * New upstream release
+ * debian/copyright
+ - use https for upstream contact and source URL
+
+ -- Hideki Yamane <henrich at debian.org> Wed, 03 Oct 2018 06:36:47 +0900
jruby-joni (2.1.21-1) unstable; urgency=medium
=====================================
debian/copyright
=====================================
@@ -1,7 +1,7 @@
Format: https://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
Upstream-Name: joni
-Upstream-Contact: JRuby Team (http://jruby.org)
-Source: http://github.com/jruby/joni/
+Upstream-Contact: JRuby Team (https://jruby.org)
+Source: https://github.com/jruby/joni/
Files: *
Copyright: 2008-2018 Marcin Mielżyński
=====================================
pom.xml
=====================================
@@ -4,7 +4,7 @@
<groupId>org.jruby.joni</groupId>
<artifactId>joni</artifactId>
<packaging>jar</packaging>
- <version>2.1.23</version>
+ <version>2.1.24</version>
<name>Joni</name>
<description>
Java port of Oniguruma: http://www.geocities.jp/kosako3/oniguruma
=====================================
src/org/joni/Analyser.java
=====================================
@@ -2369,7 +2369,7 @@ final class Analyser extends Parser {
regex.setOptimizeMapInfo(opt.map);
regex.setSubAnchor(opt.map.anchor);
} else {
- regex.setExactInfo(opt.exb);
+ regex.setOptimizeExactInfo(opt.exb);
regex.setSubAnchor(opt.exb.anchor);
}
} else if (opt.map.value > 0) {
=====================================
src/org/joni/Config.java
=====================================
@@ -45,6 +45,7 @@ public interface Config extends org.jcodings.Config {
final boolean USE_SUNDAY_QUICK_SEARCH = true;
final boolean USE_CEC = false;
final boolean USE_DYNAMIC_OPTION = false;
+ final boolean USE_BYTE_MAP = OptExactInfo.OPT_EXACT_MAXLEN <= CHAR_TABLE_SIZE;
final boolean USE_INT_MAP_BACKWARD = false;
final int NREGION = 10;
=====================================
src/org/joni/Regex.java
=====================================
@@ -292,7 +292,7 @@ public final class Regex {
byte[]buf = new byte[Config.ENC_GET_CASE_FOLD_CODES_MAX_NUM * Config.ENC_MBC_CASE_FOLD_MAXLEN];
final int ilen = USE_SUNDAY_QUICK_SEARCH ? len : len - 1;
- if (len < Config.CHAR_TABLE_SIZE) {
+ if (Config.USE_BYTE_MAP || len < Config.CHAR_TABLE_SIZE) {
if (map == null) map = new byte[Config.CHAR_TABLE_SIZE]; // map/skip
for (int i = 0; i < Config.CHAR_TABLE_SIZE; i++) map[i] = (byte)(USE_SUNDAY_QUICK_SEARCH ? len + 1 : len);
@@ -339,7 +339,7 @@ public final class Regex {
return clen;
}
- void setExactInfo(OptExactInfo e) {
+ void setOptimizeExactInfo(OptExactInfo e) {
if (e.length == 0) return;
// shall we copy that ?
@@ -350,11 +350,12 @@ public final class Regex {
if (e.ignoreCase > 0) {
if (e.length >= 3 || (e.length >= 2 && allowReverse)) {
- if (!setupBMSkipMap(true)) {
- forward = allowReverse ? Search.BM_IC_FORWARD : Search.BM_NOT_REV_IC_FORWARD;
- } else {
- forward = enc.toLowerCaseTable() != null ? Search.SLOW_IC_SB_FORWARD : Search.SLOW_IC_FORWARD;
- }
+ forward = enc.toLowerCaseTable() != null ? Search.SLOW_IC_SB_FORWARD : Search.SLOW_IC_FORWARD;
+// if (!setupBMSkipMap(true)) {
+// forward = allowReverse ? Search.BM_IC_FORWARD : Search.BM_NOT_REV_IC_FORWARD;
+// } else {
+// forward = enc.toLowerCaseTable() != null ? Search.SLOW_IC_SB_FORWARD : Search.SLOW_IC_FORWARD;
+// }
} else {
forward = enc.toLowerCaseTable() != null ? Search.SLOW_IC_SB_FORWARD : Search.SLOW_IC_FORWARD;
}
=====================================
src/org/joni/Search.java
=====================================
@@ -324,7 +324,7 @@ final class Search {
}
if (end > textEnd) end = textEnd;
- if (regex.intMap == null) {
+ if (Config.USE_BYTE_MAP || regex.intMap == null) {
while (s < end) {
int p = s;
int t = tail;
@@ -433,7 +433,7 @@ final class Search {
}
if (end > textEnd) end = textEnd;
- if (regex.intMap == null) {
+ if (Config.USE_BYTE_MAP || regex.intMap == null) {
while (s < end) {
int p = USE_SUNDAY_QUICK_SEARCH ? s - tlen1 : s - (targetEnd - targetP) + 1;
if (lowerCaseMatch(target, targetP, targetEnd, text, p, s + 1, enc, buf, regex.caseFoldFlag)) return p;
@@ -474,7 +474,7 @@ final class Search {
if (end + tlen1 > textEnd) end = textEnd - tlen1;
int s = textP, p, se;
- if (regex.intMap == null) {
+ if (Config.USE_BYTE_MAP || regex.intMap == null) {
while (s < end) {
p = se = s + tlen1;
int t = tail;
@@ -531,7 +531,7 @@ final class Search {
if (end + tlen1 > textEnd) end = textEnd - tlen1;
int s = textP;
- if (regex.intMap == null) {
+ if (Config.USE_BYTE_MAP || regex.intMap == null) {
while (s < end) {
int se = s + tlen1;
if (lowerCaseMatch(target, targetP, targetEnd, text, s, se + 1, enc, buf, regex.caseFoldFlag)) return s;
=====================================
src/org/joni/ast/QuantifierNode.java
=====================================
@@ -245,7 +245,7 @@ public final class QuantifierNode extends StateNode {
int targetQNum = qnt.popularNum();
if (Config.USE_WARNING_REDUNDANT_NESTED_REPEAT_OPERATOR) {
- if (!isByNumber() && !qnt.isByNumber() && env.syntax.warnReduntantNestedRepeat()) {
+ if (nestQNum >= 0 && targetQNum >= 0 && env.syntax.warnReduntantNestedRepeat()) {
switch(REDUCE_TABLE[targetQNum][nestQNum]) {
case ASIS:
break;
=====================================
test/org/joni/test/TestU8.java
=====================================
@@ -346,5 +346,7 @@ public class TestU8 extends Test {
x2s("^.+$", "a\n", 0, 1);
x2s("^.+$", "\na\n", 1, 2);
ns("^.+$", "\n");
+
+ ns("💌", "aa");
}
}
View it on GitLab: https://salsa.debian.org/java-team/jruby-joni/compare/35984f23307604fc581cfcf09428518381115cba...f01a1d00172c25b2a39c5c33e9be09ed421a74ba
--
View it on GitLab: https://salsa.debian.org/java-team/jruby-joni/compare/35984f23307604fc581cfcf09428518381115cba...f01a1d00172c25b2a39c5c33e9be09ed421a74ba
You're receiving this email because of your account on salsa.debian.org.
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://alioth-lists.debian.net/pipermail/pkg-java-commits/attachments/20181008/a9936062/attachment.html>
More information about the pkg-java-commits
mailing list