Hideki Yamane pushed to branch master at Debian Java Maintainers / jruby-joni
Commits:
2f859a47 by Thomas E. Enebo at 2023-01-20T13:46:45-06:00
re-enable sunday search logic
- - - - -
f199bb3d by Thomas E. Enebo at 2023-01-23T10:07:40-06:00
[maven-release-plugin] prepare release joni-2.1.45
- - - - -
425dd275 by Thomas E. Enebo at 2023-01-23T10:07:43-06:00
[maven-release-plugin] prepare for next development iteration
- - - - -
ccd20556 by Thomas E. Enebo at 2023-01-26T13:02:45-06:00
Revert "synchronize another label"
This reverts commit 39d8c21144de747bb9e2ba0753818dbe2cf136eb.
- - - - -
f5b330d4 by Thomas E. Enebo at 2023-01-26T17:12:51-06:00
Minor porting error noticed with onigmo
- - - - -
3 changed files:
- pom.xml
- src/org/joni/Matcher.java
- src/org/joni/Regex.java
Changes:
=====================================
pom.xml
=====================================
@@ -4,7 +4,7 @@
<groupId>org.jruby.joni</groupId>
<artifactId>joni</artifactId>
<packaging>jar</packaging>
- <version>2.1.45-SNAPSHOT</version>
+ <version>2.1.46-SNAPSHOT</version>
<name>Joni</name>
<description>
Java port of Oniguruma: http://www.geocities.jp/kosako3/oniguruma
=====================================
src/org/joni/Matcher.java
=====================================
@@ -340,11 +340,9 @@ public abstract class Matcher extends IntHolder {
// !begin_position:!
if (range > start) {
if (gpos > start) {
- if (gpos < range) {
- range = gpos + 1;
- } else {
- range = start + 1;
- }
+ if (gpos < range) range = gpos + 1;
+ } else {
+ range = start + 1;
}
} else {
range = start;
@@ -390,11 +388,9 @@ public abstract class Matcher extends IntHolder {
// goto !begin_position;!
if (range > start) {
if (gpos > start) {
- if (gpos < range) {
- range = gpos + 1;
- } else {
- range = start + 1;
- }
+ if (gpos < range) range = gpos + 1;
+ } else {
+ range = start + 1;
}
} else {
range = start;
=====================================
src/org/joni/Regex.java
=====================================
@@ -351,11 +351,11 @@ public final class Regex {
if (e.ignoreCase > 0) {
if (e.length >= 3 || (e.length >= 2 && allowReverse)) {
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;
-// }
+ 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;
}
View it on GitLab:
https://salsa.debian.org/java-team/jruby-joni/-/compare/6d35fcab24332f131449b5eee04c15158214b910...f5b330d456da08b949b3e3556a5723fd4176735c
--
View it on GitLab:
https://salsa.debian.org/java-team/jruby-joni/-/compare/6d35fcab24332f131449b5eee04c15158214b910...f5b330d456da08b949b3e3556a5723fd4176735c
You're receiving this email because of your account on salsa.debian.org.
_______________________________________________
pkg-java-commits mailing list
pkg-java-comm...@alioth-lists.debian.net
https://alioth-lists.debian.net/cgi-bin/mailman/listinfo/pkg-java-commits
