date:20180224

shimdandy 1.2.0-2 MIGRATED to testing

2018-02-24 Thread Debian testing watch

FYI: The status of the shimdandy source package
in Debian's testing distribution has changed.

  Previous version: (not in testing)
  Current version:  1.2.0-2

-- 
This email is automatically generated once a day.  As the installation of
new packages into testing happens multiple times a day you will receive
later changes on the next day.
See https://release.debian.org/testing-watch/ for more information.

__
This is the maintainer address of Debian's Java team
. 
Please use
debian-j...@lists.debian.org for discussions and questions.

Processed: user debian...@lists.debian.org, affects 889581, found 859811 in 3.8.1-11 ..., affects 887574 ...

2018-02-24 Thread Debian Bug Tracking System

Processing commands for cont...@bugs.debian.org:

> user debian...@lists.debian.org
Setting user to debian...@lists.debian.org (was a...@debian.org).
> affects 889581 + syslog-ng-mod-zmq
Bug #889581 [src:syslog-ng-incubator] syslog-ng-incubator: FTBFS with syslog-ng 
3.13.2
Added indication that 889581 affects syslog-ng-mod-zmq
> found 859811 3.8.1-11
Bug #859811 [eclipse-platform-data] eclipse-platform-data: broken symlinks: 
/usr/lib/eclipse/plugins/org.apache.ant_1.8.3.v20120321-1730/{bin, lib}/*
Marked as found in versions eclipse/3.8.1-11.
> found 884900 0.9.6-1~exp2
Bug #884900 [src:gnome-keysign] gnome-keysign: FTBFS on i386: Segmentation 
fault during tests
Marked as found in versions gnome-keysign/0.9.6-1~exp2.
> affects 887574 + texlive-lang-cjk latex-cjk-korean
Bug #887574 [texlive-lang-other] texlive-lang-other: broken symlinks: 
/usr/share/texlive/texmf-dist/fonts/truetype/public/padauk/PadaukBook*.ttf
Added indication that 887574 affects texlive-lang-cjk and latex-cjk-korean
> found 857954 libdevmapper-dev/2:1.02.145-4.1
Bug #857954 [libdevmapper-dev] libdevmapper-dev: broken symlink: 
/usr/lib//libdevmapper-event-lvm2.so -> 
/lib//libdevmapper-event-lvm2.so.2.02
The source libdevmapper-dev and version 2:1.02.145-4.1 do not appear to match 
any binary packages
Marked as found in versions libdevmapper-dev/2:1.02.145-4.1.
> found 696277 1:3.16-2
Bug #696277 [pyro] All manpages are dangling symlinks
Marked as found in versions pyro/1:3.16-2.
> affects 863670 + node-uglifyjs-webpack-plugin
Bug #863670 [node-timers-browserify] node-timers-browserify: broken symlink: 
/usr/share/doc/node-timers-browserify/example/enroll/node_modules/timers-browserify
 -> ../../../../../nodejs/timers-browserify
Added indication that 863670 affects node-uglifyjs-webpack-plugin
> thanks
Stopping processing here.

Please contact me if you need assistance.
-- 
696277: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=696277
857954: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=857954
859811: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=859811
863670: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=863670
884900: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=884900
887574: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=887574
889581: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=889581
Debian Bug Tracking System
Contact ow...@bugs.debian.org with problems

__
This is the maintainer address of Debian's Java team
. 
Please use
debian-j...@lists.debian.org for discussions and questions.

Bug#891314: Updating the jackson-annotations Uploaders list

2018-02-24 Thread Tobias Frost

Source: jackson-annotations
Version: 2.4.2-2 2.9.4-1
Severity: minor
User: m...@qa.debian.org
Usertags: mia-teammaint

Wolodja Wentland  has not been working on
the jackson-annotations package for quite some time.

We are tracking their status in the MIA team and would like to ask you
to remove them from the Uploaders list of the package so we can close
that part of the file.

(If the person is listed as Maintainer, what we are asking is to please
step in as a new maintainer.)

Thanks.

__
This is the maintainer address of Debian's Java team
. 
Please use
debian-j...@lists.debian.org for discussions and questions.

Bug#891312: Updating the jackson-core Uploaders list

2018-02-24 Thread Tobias Frost

Source: jackson-core
Version: 2.4.2-2 2.7.3-1 2.9.4-1
Severity: minor
User: m...@qa.debian.org
Usertags: mia-teammaint

Wolodja Wentland  has not been working on
the jackson-core package for quite some time.

We are tracking their status in the MIA team and would like to ask you
to remove them from the Uploaders list of the package so we can close
that part of the file.

(If the person is listed as Maintainer, what we are asking is to please
step in as a new maintainer.)

Thanks.

__
This is the maintainer address of Debian's Java team
. 
Please use
debian-j...@lists.debian.org for discussions and questions.

Bug#891313: Updating the maven-debian-helper Uploaders list

2018-02-24 Thread Tobias Frost

Source: maven-debian-helper
Version: 1.6.9 2.2.8
Severity: minor
User: m...@qa.debian.org
Usertags: mia-teammaint

Wolodja Wentland  has not been working on
the maven-debian-helper package for quite some time.

We are tracking their status in the MIA team and would like to ask you
to remove them from the Uploaders list of the package so we can close
that part of the file.

(If the person is listed as Maintainer, what we are asking is to please
step in as a new maintainer.)

Thanks.

__
This is the maintainer address of Debian's Java team
. 
Please use
debian-j...@lists.debian.org for discussions and questions.

Bug#891310: Updating the robert-hooke Uploaders list

2018-02-24 Thread Tobias Frost

Source: robert-hooke
Version: 1.3.0-2 1.3.0-3
Severity: minor
User: m...@qa.debian.org
Usertags: mia-teammaint

Wolodja Wentland  has not been working on
the robert-hooke package for quite some time.

We are tracking their status in the MIA team and would like to ask you
to remove them from the Uploaders list of the package so we can close
that part of the file.

(If the person is listed as Maintainer, what we are asking is to please
step in as a new maintainer.)

Thanks.

__
This is the maintainer address of Debian's Java team
. 
Please use
debian-j...@lists.debian.org for discussions and questions.

Accepted jruby-joni 2.1.15-1 (source all) into unstable

2018-02-24 Thread Hideki Yamane

-BEGIN PGP SIGNED MESSAGE-
Hash: SHA512

Format: 1.8
Date: Sat, 24 Feb 2018 19:42:37 +0900
Source: jruby-joni
Binary: libjruby-joni-java
Architecture: source all
Version: 2.1.15-1
Distribution: unstable
Urgency: medium
Maintainer: Debian Java Maintainers 

Changed-By: Hideki Yamane 
Description:
 libjruby-joni-java - Java port of Oniguruma regexp library
Changes:
 jruby-joni (2.1.15-1) unstable; urgency=medium
 .
   * New upstream release
Checksums-Sha1:
 7396d89579644744b8228f995a8b1559c779d561 2149 jruby-joni_2.1.15-1.dsc
 4f88053c6b5c7b39d40aff8e363ec4cfcfa6725d 180615 jruby-joni_2.1.15.orig.tar.gz
 911e6c92a8e212a2d59f0e7ab0846578d8847cbd 5312 jruby-joni_2.1.15-1.debian.tar.xz
 019b1314b26dca8e2027b5fac33f8e72dc2f543b 15148 
jruby-joni_2.1.15-1_amd64.buildinfo
 1dc991bd21ee722ab67bc4df1ff85f3b8908d8a9 208488 
libjruby-joni-java_2.1.15-1_all.deb
Checksums-Sha256:
 b22c9e72bfe2149a374d13a4747c8fbcb297dd003c7ba510f12bc6823f2b07fc 2149 
jruby-joni_2.1.15-1.dsc
 5cc5b8af96c5a1e97db630779c15f54fbda4f905005151a64034a830544633c5 180615 
jruby-joni_2.1.15.orig.tar.gz
 7fc7c7c6f9430f766355f967c22e0369bf7912297e028be86e08245a2cb85745 5312 
jruby-joni_2.1.15-1.debian.tar.xz
 a7460a2103693b4017ecdda278e10602ed104c238f65315c3f7cb70602de68a5 15148 
jruby-joni_2.1.15-1_amd64.buildinfo
 f9fd0920c107b086eeb28c49def70f48268762b204fe9da3371706e024f30a30 208488 
libjruby-joni-java_2.1.15-1_all.deb
Files:
 1fad802626f954b8890b4774a1fe496a 2149 java optional jruby-joni_2.1.15-1.dsc
 657e4f1c92a5c2c6740cd0d00d6d288d 180615 java optional 
jruby-joni_2.1.15.orig.tar.gz
 f39fb23a9e560ee28e94d4a5ad8e1dbf 5312 java optional 
jruby-joni_2.1.15-1.debian.tar.xz
 09cb97d6b44bc084bdb252b13d2dce48 15148 java optional 
jruby-joni_2.1.15-1_amd64.buildinfo
 45ae50ca55cc6c48c04e414f4c614826 208488 java optional 
libjruby-joni-java_2.1.15-1_all.deb

-BEGIN PGP SIGNATURE-

iQJHBAEBCgAxFiEEWOEiL5aWyIWjzRBMXTKNCCqqsUAFAlqRQlQTHGhlbnJpY2hA
ZGViaWFuLm9yZwAKCRBdMo0IKqqxQDLuD/9Cd6j3Ihk2kpZkH59OiUzqCvsb9+94
Cu5jNwcGhmyR/gG2lKd3Th7oXeUZR3GclUZGaWhGkP9FO/9rtRfmd3jeWqOiVX28
yOJe4OAX43aCTLP/mFy1yKRUE7STdUulZaV8lk75hLcukoTCE41sZ0rkJTzQKUwx
8D8IFTMC7a/gRsaA9KPhJykmQxUln+P19/Et7AMrlrfsWcvSEEI3uXIQbawNAtyv
TfB4eCJVfD/xAREoCQjv1c/Q2O65mAVFwl9FQVgE1gOFGGfw9Es/8Z19DWa55Nzl
2xOKvNV1bbmwWUWphrrTwOgBdfLJbJYwRmy6B0kjBIWZXplckUQ+Ae4QhkASHBnH
4odq0/7aGYvqNVUGSiovqxn4aaH/E4Cl09WCbH0b7j+BThI+xDLHmzkAdOj4MdDw
jg6ksNrjndDdfE1rA63pMrRjhnpqRekmyqJUbrNjrDh/i4xPV5JlVUz2PHnoqU+3
aQYLuupoicAMt6PfjkrdvobYYNnTp8MU3YxfH1o6jvE5oSb6Z6aDx4fpqV78EHsk
VmrzIkz9brQOoeOW7Rvdm7bENeZYos+x814byCIA5mHc+GtaK5FoYipl/zo9R9Xh
LdQbC78B5aKRRbUxhLu5TMfFpmVilHEmkm2OiZTCf2VqKQ9EpQh0NYiRiVNpUotC
pkQmRIoOp+OsUg==
=Bxvz
-END PGP SIGNATURE-


__
This is the maintainer address of Debian's Java team
. 
Please use
debian-j...@lists.debian.org for discussions and questions.

jruby-joni_2.1.15-1_amd64.changes ACCEPTED into unstable

2018-02-24 Thread Debian FTP Masters



Accepted:

-BEGIN PGP SIGNED MESSAGE-
Hash: SHA512

Format: 1.8
Date: Sat, 24 Feb 2018 19:42:37 +0900
Source: jruby-joni
Binary: libjruby-joni-java
Architecture: source all
Version: 2.1.15-1
Distribution: unstable
Urgency: medium
Maintainer: Debian Java Maintainers 

Changed-By: Hideki Yamane 
Description:
 libjruby-joni-java - Java port of Oniguruma regexp library
Changes:
 jruby-joni (2.1.15-1) unstable; urgency=medium
 .
   * New upstream release
Checksums-Sha1:
 7396d89579644744b8228f995a8b1559c779d561 2149 jruby-joni_2.1.15-1.dsc
 4f88053c6b5c7b39d40aff8e363ec4cfcfa6725d 180615 jruby-joni_2.1.15.orig.tar.gz
 911e6c92a8e212a2d59f0e7ab0846578d8847cbd 5312 jruby-joni_2.1.15-1.debian.tar.xz
 019b1314b26dca8e2027b5fac33f8e72dc2f543b 15148 
jruby-joni_2.1.15-1_amd64.buildinfo
 1dc991bd21ee722ab67bc4df1ff85f3b8908d8a9 208488 
libjruby-joni-java_2.1.15-1_all.deb
Checksums-Sha256:
 b22c9e72bfe2149a374d13a4747c8fbcb297dd003c7ba510f12bc6823f2b07fc 2149 
jruby-joni_2.1.15-1.dsc
 5cc5b8af96c5a1e97db630779c15f54fbda4f905005151a64034a830544633c5 180615 
jruby-joni_2.1.15.orig.tar.gz
 7fc7c7c6f9430f766355f967c22e0369bf7912297e028be86e08245a2cb85745 5312 
jruby-joni_2.1.15-1.debian.tar.xz
 a7460a2103693b4017ecdda278e10602ed104c238f65315c3f7cb70602de68a5 15148 
jruby-joni_2.1.15-1_amd64.buildinfo
 f9fd0920c107b086eeb28c49def70f48268762b204fe9da3371706e024f30a30 208488 
libjruby-joni-java_2.1.15-1_all.deb
Files:
 1fad802626f954b8890b4774a1fe496a 2149 java optional jruby-joni_2.1.15-1.dsc
 657e4f1c92a5c2c6740cd0d00d6d288d 180615 java optional 
jruby-joni_2.1.15.orig.tar.gz
 f39fb23a9e560ee28e94d4a5ad8e1dbf 5312 java optional 
jruby-joni_2.1.15-1.debian.tar.xz
 09cb97d6b44bc084bdb252b13d2dce48 15148 java optional 
jruby-joni_2.1.15-1_amd64.buildinfo
 45ae50ca55cc6c48c04e414f4c614826 208488 java optional 
libjruby-joni-java_2.1.15-1_all.deb

-BEGIN PGP SIGNATURE-

iQJHBAEBCgAxFiEEWOEiL5aWyIWjzRBMXTKNCCqqsUAFAlqRQlQTHGhlbnJpY2hA
ZGViaWFuLm9yZwAKCRBdMo0IKqqxQDLuD/9Cd6j3Ihk2kpZkH59OiUzqCvsb9+94
Cu5jNwcGhmyR/gG2lKd3Th7oXeUZR3GclUZGaWhGkP9FO/9rtRfmd3jeWqOiVX28
yOJe4OAX43aCTLP/mFy1yKRUE7STdUulZaV8lk75hLcukoTCE41sZ0rkJTzQKUwx
8D8IFTMC7a/gRsaA9KPhJykmQxUln+P19/Et7AMrlrfsWcvSEEI3uXIQbawNAtyv
TfB4eCJVfD/xAREoCQjv1c/Q2O65mAVFwl9FQVgE1gOFGGfw9Es/8Z19DWa55Nzl
2xOKvNV1bbmwWUWphrrTwOgBdfLJbJYwRmy6B0kjBIWZXplckUQ+Ae4QhkASHBnH
4odq0/7aGYvqNVUGSiovqxn4aaH/E4Cl09WCbH0b7j+BThI+xDLHmzkAdOj4MdDw
jg6ksNrjndDdfE1rA63pMrRjhnpqRekmyqJUbrNjrDh/i4xPV5JlVUz2PHnoqU+3
aQYLuupoicAMt6PfjkrdvobYYNnTp8MU3YxfH1o6jvE5oSb6Z6aDx4fpqV78EHsk
VmrzIkz9brQOoeOW7Rvdm7bENeZYos+x814byCIA5mHc+GtaK5FoYipl/zo9R9Xh
LdQbC78B5aKRRbUxhLu5TMfFpmVilHEmkm2OiZTCf2VqKQ9EpQh0NYiRiVNpUotC
pkQmRIoOp+OsUg==
=Bxvz
-END PGP SIGNATURE-


Thank you for your contribution to Debian.

__
This is the maintainer address of Debian's Java team
. 
Please use
debian-j...@lists.debian.org for discussions and questions.

Processing of jruby-joni_2.1.15-1_amd64.changes

2018-02-24 Thread Debian FTP Masters

jruby-joni_2.1.15-1_amd64.changes uploaded successfully to localhost
along with the files:
  jruby-joni_2.1.15-1.dsc
  jruby-joni_2.1.15.orig.tar.gz
  jruby-joni_2.1.15-1.debian.tar.xz
  jruby-joni_2.1.15-1_amd64.buildinfo
  libjruby-joni-java_2.1.15-1_all.deb

Greetings,

Your Debian queue daemon (running on host usper.debian.org)

__
This is the maintainer address of Debian's Java team
. 
Please use
debian-j...@lists.debian.org for discussions and questions.

[jruby-joni] 01/01: pristine-tar data for jruby-joni_2.1.15.orig.tar.gz

2018-02-24 Thread Hideki Yamane

This is an automated email from the git hooks/post-receive script.

henrich pushed a commit to branch pristine-tar
in repository jruby-joni.

commit 713df2b8967f4d2ea9a5eaf48a4aa4faafa51aa5
Author: Hideki Yamane 
Date:   Sat Feb 24 19:38:45 2018 +0900

pristine-tar data for jruby-joni_2.1.15.orig.tar.gz
---
 jruby-joni_2.1.15.orig.tar.gz.delta | Bin 0 -> 3902 bytes
 jruby-joni_2.1.15.orig.tar.gz.id|   1 +
 2 files changed, 1 insertion(+)

diff --git a/jruby-joni_2.1.15.orig.tar.gz.delta 
b/jruby-joni_2.1.15.orig.tar.gz.delta
new file mode 100644
index 000..d99d0aa
Binary files /dev/null and b/jruby-joni_2.1.15.orig.tar.gz.delta differ
diff --git a/jruby-joni_2.1.15.orig.tar.gz.id b/jruby-joni_2.1.15.orig.tar.gz.id
new file mode 100644
index 000..3d767bb
--- /dev/null
+++ b/jruby-joni_2.1.15.orig.tar.gz.id
@@ -0,0 +1 @@
+24e3ce29c9eb99df5e9681d0cdb43407c2fffa9b

-- 
Alioth's /usr/local/bin/git-commit-notice on 
/srv/git.debian.org/git/pkg-java/jruby-joni.git

___
pkg-java-commits mailing list
pkg-java-comm...@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-java-commits

[jruby-joni] 26/31: reenable exact/map optimizations for quantifiers with lower bounds of 1

2018-02-24 Thread Hideki Yamane

This is an automated email from the git hooks/post-receive script.

henrich pushed a commit to branch debian/sid
in repository jruby-joni.

commit 7c5f6fa0c64a06c2b8b31406271c8509c49dff9b
Author: Marcin Mielzynski 
Date:   Fri Feb 16 18:21:57 2018 +0100

reenable exact/map optimizations for quantifiers with lower bounds of 1
---
 src/org/joni/Analyser.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/org/joni/Analyser.java b/src/org/joni/Analyser.java
index f209d25..400b779 100644
--- a/src/org/joni/Analyser.java
+++ b/src/org/joni/Analyser.java
@@ -2225,7 +2225,7 @@ final class Analyser extends Parser {
 opt.anchor.add(AnchorType.ANYCHAR_STAR);
 }
 }
-} else {
+} /*else*/ {
 if (qn.lower > 0) {
 opt.copy(nopt);
 if (nopt.exb.length > 0) {

-- 
Alioth's /usr/local/bin/git-commit-notice on 
/srv/git.debian.org/git/pkg-java/jruby-joni.git

___
pkg-java-commits mailing list
pkg-java-comm...@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-java-commits

[jruby-joni] branch pristine-tar updated (e961a08 -> 713df2b)

2018-02-24 Thread Hideki Yamane

This is an automated email from the git hooks/post-receive script.

henrich pushed a change to branch pristine-tar
in repository jruby-joni.

  from  e961a08   pristine-tar data for jruby-joni_2.1.14.orig.tar.gz
   new  713df2b   pristine-tar data for jruby-joni_2.1.15.orig.tar.gz

The 1 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails.  The revisions
listed as "adds" were already present in the repository and have only
been added to this reference.


Summary of changes:
 jruby-joni_2.1.15.orig.tar.gz.delta | Bin 0 -> 3902 bytes
 jruby-joni_2.1.15.orig.tar.gz.id|   1 +
 2 files changed, 1 insertion(+)
 create mode 100644 jruby-joni_2.1.15.orig.tar.gz.delta
 create mode 100644 jruby-joni_2.1.15.orig.tar.gz.id

-- 
Alioth's /usr/local/bin/git-commit-notice on 
/srv/git.debian.org/git/pkg-java/jruby-joni.git

___
pkg-java-commits mailing list
pkg-java-comm...@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-java-commits

[jruby-joni] 29/31: Merge tag 'joni-2.1.15' into debian/sid

2018-02-24 Thread Hideki Yamane

This is an automated email from the git hooks/post-receive script.

henrich pushed a commit to branch debian/sid
in repository jruby-joni.

commit d5303a4e98f7e1225a5ae75f01cc2635c75eff98
Merge: b7a5539 6a7ca3f
Author: Hideki Yamane 
Date:   Sat Feb 24 19:38:08 2018 +0900

Merge tag 'joni-2.1.15' into debian/sid

[maven-release-plugin]  copy for tag joni-2.1.15

 pom.xml   |  2 +-
 src/org/joni/Analyser.java| 47 +++
 src/org/joni/ArrayCompiler.java   | 50 ++--
 src/org/joni/ByteCodeMachine.java | 29 +++--
 src/org/joni/Lexer.java   | 18 +++---
 src/org/joni/Matcher.java |  8 ++-
 src/org/joni/ScanEnvironment.java |  3 +-
 src/org/joni/ScannerSupport.java  |  8 ++-
 src/org/joni/constants/OPCode.java|  4 +-
 src/org/joni/exception/ErrorMessages.java |  1 +
 test/org/joni/test/Test.java  | 49 ++--
 test/org/joni/test/TestA.java |  4 ++
 test/org/joni/test/TestError.java | 97 +++
 test/org/joni/test/TestU.java |  2 +
 test/org/joni/test/TestU8.java| 25 +++-
 15 files changed, 272 insertions(+), 75 deletions(-)

-- 
Alioth's /usr/local/bin/git-commit-notice on 
/srv/git.debian.org/git/pkg-java/jruby-joni.git

___
pkg-java-commits mailing list
pkg-java-comm...@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-java-commits

[jruby-joni] annotated tag joni-2.1.15 created (now 77c93a5)

2018-02-24 Thread Hideki Yamane

This is an automated email from the git hooks/post-receive script.

henrich pushed a change to annotated tag joni-2.1.15
in repository jruby-joni.

at  77c93a5   (tag)
   tagging  6a7ca3f6d24bf33b4600bac46f65bb09b42554bb (commit)
  replaces  joni-2.1.14
 tagged by  Thomas E. Enebo
on  Wed Feb 21 09:50:52 2018 -0600

- Log -
[maven-release-plugin]  copy for tag joni-2.1.15

Marcin Mielzynski (16):
  backref opcode cleanup
  move var
  fix recursion
  fix invalid backref
  fix for Onigmo #43
  Merge branch 'master' of https://github.com/jruby/joni
  more validation tests
  more validation tests
  add dont capture group option test
  enable passing invalid group tests
  more validation tests
  rejigger tests to accomodate for 7 bit matching
  enable tests for 7 bit matching
  dedup tests for singlebyte
  refactor to make ascii word opcodes more consistent
  reenable exact/map optimizations for quantifiers with lower bounds of 1

Thomas E. Enebo (3):
  [maven-release-plugin] prepare for next development iteration
  See #34 for more.  Some codepoint expansions duplicate characters and 
that is
  [maven-release-plugin] prepare release joni-2.1.15

lopex (9):
  add a test
  test for singlebyte CCLASS_MIX
  look behind fixes
  errors / syntax errors tests
  fix errors
  add conditional expression tests
  remove dupped test
  add implicit anchor optimization tests
  more tests

---

No new revisions were added by this update.

-- 
Alioth's /usr/local/bin/git-commit-notice on 
/srv/git.debian.org/git/pkg-java/jruby-joni.git

___
pkg-java-commits mailing list
pkg-java-comm...@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-java-commits

[jruby-joni] 30/31: new upstream release

2018-02-24 Thread Hideki Yamane

This is an automated email from the git hooks/post-receive script.

henrich pushed a commit to branch debian/sid
in repository jruby-joni.

commit 149296f59f883832f42563983630b4e660d2
Author: Hideki Yamane 
Date:   Sat Feb 24 19:38:26 2018 +0900

new upstream release
---
 debian/changelog | 6 ++
 1 file changed, 6 insertions(+)

diff --git a/debian/changelog b/debian/changelog
index 29b72af..ce914c3 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+jruby-joni (2.1.15-1) UNRELEASED; urgency=medium
+
+  * New upstream release
+
+ -- Hideki Yamane   Sat, 24 Feb 2018 19:38:18 +0900
+
 jruby-joni (2.1.14-1) unstable; urgency=medium
 
   * New upstream release

-- 
Alioth's /usr/local/bin/git-commit-notice on 
/srv/git.debian.org/git/pkg-java/jruby-joni.git

___
pkg-java-commits mailing list
pkg-java-comm...@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-java-commits

[jruby-joni] 31/31: upload to unstable

2018-02-24 Thread Hideki Yamane

This is an automated email from the git hooks/post-receive script.

henrich pushed a commit to branch debian/sid
in repository jruby-joni.

commit 639f582d1e596edf4334c933a1c7224b0ef29d9b
Author: Hideki Yamane 
Date:   Sat Feb 24 19:42:41 2018 +0900

upload to unstable
---
 debian/changelog | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index ce914c3..43645dc 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,8 +1,8 @@
-jruby-joni (2.1.15-1) UNRELEASED; urgency=medium
+jruby-joni (2.1.15-1) unstable; urgency=medium
 
   * New upstream release
 
- -- Hideki Yamane   Sat, 24 Feb 2018 19:38:18 +0900
+ -- Hideki Yamane   Sat, 24 Feb 2018 19:42:37 +0900
 
 jruby-joni (2.1.14-1) unstable; urgency=medium
 

-- 
Alioth's /usr/local/bin/git-commit-notice on 
/srv/git.debian.org/git/pkg-java/jruby-joni.git

___
pkg-java-commits mailing list
pkg-java-comm...@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-java-commits

[jruby-joni] 22/31: rejigger tests to accomodate for 7 bit matching

2018-02-24 Thread Hideki Yamane

This is an automated email from the git hooks/post-receive script.

henrich pushed a commit to branch debian/sid
in repository jruby-joni.

commit a0150f25eebc7bb06659312a6295171e23828b41
Author: Marcin Mielzynski 
Date:   Fri Feb 2 20:55:36 2018 +0100

rejigger tests to accomodate for 7 bit matching
---
 test/org/joni/test/Test.java | 24 ++--
 1 file changed, 18 insertions(+), 6 deletions(-)

diff --git a/test/org/joni/test/Test.java b/test/org/joni/test/Test.java
index 531d513..992b758 100644
--- a/test/org/joni/test/Test.java
+++ b/test/org/joni/test/Test.java
@@ -99,6 +99,13 @@ public abstract class Test {
 xx(pattern, str, from, to, mem, not, option());
 }
 
+static boolean is7bit(byte[]bytes, int p, int end) {
+for (int i = p; i < end; i++) {
+if ((bytes[i] & 0xff) >= 0x80) return false;
+}
+return true;
+}
+
 public int xx(byte[] pattern, byte[] str, int from, int to, int mem, 
boolean not, int option) throws InterruptedException {
 Regex reg;
 
@@ -118,12 +125,17 @@ public abstract class Test {
 return Matcher.FAILED;
 }
 
-Matcher m = reg.matcher(str, 0, length(str));
-Region region;
+int result = check(reg, pattern, str, option, from, to, mem, not);
 
-int r = 0;
+return result;
+}
+
+private int check(Regex reg, byte[]pattern, byte[]str, int option, int 
from, int to, int mem, boolean not) throws InterruptedException {
+Matcher m = reg.matcher(str, 0, length(str));
+final Region region;
+final int result;
 try {
-r = m.searchInterruptible(0, length(str), option);
+result = m.searchInterruptible(0, length(str), option);
 region = m.getEagerRegion();
 } catch (JOniException je) {
 Config.err.println("Pattern: " + reprTest(pattern, str, option));
@@ -141,7 +153,7 @@ public abstract class Test {
 return Matcher.FAILED;
 }
 
-if (r == -1) {
+if (result == -1) {
 if (not) {
 if (VERBOSE) Config.log.println("OK(NOT): " + 
reprTest(pattern, str, option));
 nsucc++;
@@ -164,7 +176,7 @@ public abstract class Test {
 }
 }
 }
-return r;
+return result;
 }
 
 protected void x2(byte[] pattern, byte[] str, int from, int to) throws 
InterruptedException {

-- 
Alioth's /usr/local/bin/git-commit-notice on 
/srv/git.debian.org/git/pkg-java/jruby-joni.git

___
pkg-java-commits mailing list
pkg-java-comm...@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-java-commits

[jruby-joni] 14/31: remove dupped test

2018-02-24 Thread Hideki Yamane

This is an automated email from the git hooks/post-receive script.

henrich pushed a commit to branch debian/sid
in repository jruby-joni.

commit 9f9939f6f997476e00127c7b1ed013542795822c
Author: lopex 
Date:   Fri Feb 2 11:51:17 2018 +0100

remove dupped test
---
 test/org/joni/test/TestU8.java | 2 --
 1 file changed, 2 deletions(-)

diff --git a/test/org/joni/test/TestU8.java b/test/org/joni/test/TestU8.java
index 6500930..ba2bdd6 100755
--- a/test/org/joni/test/TestU8.java
+++ b/test/org/joni/test/TestU8.java
@@ -188,8 +188,6 @@ public class TestU8 extends Test {
 x2s("(?i)(?<=\u0149)a", "\u02bcna", 3, 4);
 
 x2s("(?<=(?i)ab)cd", "ABcd", 2, 4);
-
-x2s("(?<=(?i)ab)cd", "ABcd", 2, 4);
 x2s("(?<=(?i:ab))cd", "ABcd", 2, 4);
 ns("(?<=(?i)ab)cd", "ABCD");
 ns("(?<=(?i:ab))cd", "ABCD");

-- 
Alioth's /usr/local/bin/git-commit-notice on 
/srv/git.debian.org/git/pkg-java/jruby-joni.git

___
pkg-java-commits mailing list
pkg-java-comm...@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-java-commits

[jruby-joni] 27/31: See #34 for more. Some codepoint expansions duplicate characters and that is causing erroneous warnings.

2018-02-24 Thread Hideki Yamane

This is an automated email from the git hooks/post-receive script.

henrich pushed a commit to branch debian/sid
in repository jruby-joni.

commit 59a6b567a3bdc2d38d6453507cc6fbdd0281eff3
Author: Thomas E. Enebo 
Date:   Wed Feb 21 09:50:05 2018 -0600

See #34 for more.  Some codepoint expansions duplicate characters and that 
is
causing erroneous warnings.
---
 src/org/joni/ScanEnvironment.java | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/org/joni/ScanEnvironment.java 
b/src/org/joni/ScanEnvironment.java
index f2130a0..09d6a48 100644
--- a/src/org/joni/ScanEnvironment.java
+++ b/src/org/joni/ScanEnvironment.java
@@ -152,7 +152,8 @@ public final class ScanEnvironment {
 void ccDuplicateWarn() {
 if (syntax.warnCCDup() && (warningsFlag & 
SyntaxProperties.WARN_CC_DUP) == 0) {
 warningsFlag |= SyntaxProperties.WARN_CC_DUP;
-warnings.warn("character class has duplicated range");
+// FIXME: #34 points out problem and what it will take to 
uncomment this (we were getting erroneous versions of this)
+// warnings.warn("character class has duplicated range");
 }
 }
 }

-- 
Alioth's /usr/local/bin/git-commit-notice on 
/srv/git.debian.org/git/pkg-java/jruby-joni.git

___
pkg-java-commits mailing list
pkg-java-comm...@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-java-commits

[jruby-joni] 13/31: add conditional expression tests

2018-02-24 Thread Hideki Yamane

This is an automated email from the git hooks/post-receive script.

henrich pushed a commit to branch debian/sid
in repository jruby-joni.

commit 73380870ec5a9a60126cc6663ca6bd1e3ca0c53e
Author: lopex 
Date:   Fri Feb 2 11:49:32 2018 +0100

add conditional expression tests
---
 test/org/joni/test/TestA.java | 4 
 1 file changed, 4 insertions(+)

diff --git a/test/org/joni/test/TestA.java b/test/org/joni/test/TestA.java
index a01a6af..a3248cf 100644
--- a/test/org/joni/test/TestA.java
+++ b/test/org/joni/test/TestA.java
@@ -23,6 +23,7 @@ import org.jcodings.Encoding;
 import org.jcodings.specific.ASCIIEncoding;
 import org.joni.Option;
 import org.joni.Syntax;
+import org.joni.exception.ErrorMessages;
 
 public class TestA extends Test {
@Override
@@ -526,6 +527,9 @@ public class TestA extends Test {
 x2s("((?x)|(?y))(?()y|x)", "yx", 0, 2);
 ns("((?x)|(?y))(?()y|x)", "xx");
 ns("((?x)|(?y))(?()y|x)", "yy");
+xerrs("(a)?(?b)?(?(1)a)(?()b)", 
ErrorMessages.ERR_NUMBERED_BACKREF_OR_CALL_NOT_ALLOWED);
+xerrs("()(?(2))", ErrorMessages.ERR_INVALID_BACKREF);
+xerrs("(?(70))", ErrorMessages.ERR_INVALID_BACKREF);
 
 x2s("\\R", "\n", 0, 1);
 x2s("\\R", "\r", 0, 1);

-- 
Alioth's /usr/local/bin/git-commit-notice on 
/srv/git.debian.org/git/pkg-java/jruby-joni.git

___
pkg-java-commits mailing list
pkg-java-comm...@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-java-commits

[jruby-joni] annotated tag debian/2.1.15-1 created (now 77f4944)

2018-02-24 Thread Hideki Yamane

This is an automated email from the git hooks/post-receive script.

henrich pushed a change to annotated tag debian/2.1.15-1
in repository jruby-joni.

at  77f4944   (tag)
   tagging  639f582d1e596edf4334c933a1c7224b0ef29d9b (commit)
  replaces  debian/2.1.14-1
 tagged by  Hideki Yamane
on  Sat Feb 24 19:44:21 2018 +0900

- Log -
jruby-joni Debian release 2.1.15-1
-BEGIN PGP SIGNATURE-

iQIzBAABCgAdFiEEWOEiL5aWyIWjzRBMXTKNCCqqsUAFAlqRQgUACgkQXTKNCCqq
sUDuig//cNlE15ycyCYTW54/RDgMcz7lx7YbFRwuDLHy+1Qh/jBknKM0tdUc4qjk
OPasmHwG5XUENamuo/jfa49/mnavh4Bv4pPkC9SVy2m/k0jsFhdf6assh5f9ojnG
qw46ftH4WunRkMf7x3rCQp3g8n8ULMz122px3055ykZOHLK1MCo+N4ZQgvtGvTtr
KuVJgbrUJnIdzOub0Tn0/rONfUYsqW0un4Fy7CEwxG55s64n48JcI/e0uQl5DEpv
RZlgOWJpetkru+UwN0t1cTRkp8IfnOZoEagKsNQH0V7ufUR9sQ4L97J9NlgsRwwD
nA82a36s7XtUSrpAKoIcdag3C4+g6/UblLiU0wagoYmWwZE8JbX8AVrjbWji2uO4
IWjLRbNDPJNhRSGcuBDlQ9PCI58KQU1TOv3cSUfVL+vL+nKGnIM/lV2Mhp7IsIKn
fU8scpD6OdWFPZHZoiO2aaQ9xRRFLM3fcUVozu3O2vwG+T8oMTeaTfH7ScrGQkbq
MAnmp3zyHQ9GRa92DSdwQPTUID2K2NzHm7PMRyivFHaz9DxlaV2RnMBVFh3ROVBk
ZqdquA51ZUVgWvfdWE6iUxw6DtvzwEw57zvLuY3Rxw4ntj79+lRcWIEsV/ZlOB4G
jfiqIxjrXlxerpcHasN7vzxpOcAxA5UxNHtO+MC5uneCBS64VYM=
=KXXV
-END PGP SIGNATURE-

Hideki Yamane (3):
  Merge tag 'joni-2.1.15' into debian/sid
  new upstream release
  upload to unstable

Marcin Mielzynski (16):
  backref opcode cleanup
  move var
  fix recursion
  fix invalid backref
  fix for Onigmo #43
  Merge branch 'master' of https://github.com/jruby/joni
  more validation tests
  more validation tests
  add dont capture group option test
  enable passing invalid group tests
  more validation tests
  rejigger tests to accomodate for 7 bit matching
  enable tests for 7 bit matching
  dedup tests for singlebyte
  refactor to make ascii word opcodes more consistent
  reenable exact/map optimizations for quantifiers with lower bounds of 1

Thomas E. Enebo (3):
  [maven-release-plugin] prepare for next development iteration
  See #34 for more.  Some codepoint expansions duplicate characters and 
that is
  [maven-release-plugin] prepare release joni-2.1.15

lopex (9):
  add a test
  test for singlebyte CCLASS_MIX
  look behind fixes
  errors / syntax errors tests
  fix errors
  add conditional expression tests
  remove dupped test
  add implicit anchor optimization tests
  more tests

---

No new revisions were added by this update.

-- 
Alioth's /usr/local/bin/git-commit-notice on 
/srv/git.debian.org/git/pkg-java/jruby-joni.git

___
pkg-java-commits mailing list
pkg-java-comm...@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-java-commits

[jruby-joni] 17/31: more validation tests

2018-02-24 Thread Hideki Yamane

This is an automated email from the git hooks/post-receive script.

henrich pushed a commit to branch debian/sid
in repository jruby-joni.

commit 85aea5b7825c72b52a14c8307d3fbafdca9ad80d
Author: Marcin Mielzynski 
Date:   Fri Feb 2 17:46:13 2018 +0100

more validation tests
---
 src/org/joni/Lexer.java   | 14 --
 src/org/joni/ScannerSupport.java  |  8 +---
 src/org/joni/exception/ErrorMessages.java |  1 +
 test/org/joni/test/TestError.java |  2 +-
 4 files changed, 15 insertions(+), 10 deletions(-)

diff --git a/src/org/joni/Lexer.java b/src/org/joni/Lexer.java
index bd80c21..221acca 100644
--- a/src/org/joni/Lexer.java
+++ b/src/org/joni/Lexer.java
@@ -552,7 +552,7 @@ class Lexer extends ScannerSupport {
 
 if (peekIs('{') && syntax.opEscXBraceHex8()) {
 inc();
-int num = scanUnsignedHexadecimalNumber(8);
+int num = scanUnsignedHexadecimalNumber(0, 8);
 if (num < 0) newValueException(ERR_TOO_BIG_WIDE_CHAR_VALUE);
 if (left()) {
 int c2 = peek();
@@ -569,7 +569,7 @@ class Lexer extends ScannerSupport {
 p = last;
 }
 } else if (syntax.opEscXHex2()) {
-int num = scanUnsignedHexadecimalNumber(2);
+int num = scanUnsignedHexadecimalNumber(0, 2);
 if (num < 0) newValueException(ERR_TOO_BIG_NUMBER);
 if (p == last) { /* can't read nothing. */
 num = 0; /* but, it's not error */
@@ -585,7 +585,8 @@ class Lexer extends ScannerSupport {
 int last = p;
 
 if (syntax.op2EscUHex4()) {
-int num = scanUnsignedHexadecimalNumber(4);
+int num = scanUnsignedHexadecimalNumber(4, 4);
+if (num < -1) newValueException(ERR_TOO_SHORT_DIGITS);
 if (num < 0) newValueException(ERR_TOO_BIG_NUMBER);
 if (p == last) {  /* can't read nothing. */
 num = 0; /* but, it's not error */
@@ -767,7 +768,7 @@ class Lexer extends ScannerSupport {
 int last = p;
 if (peekIs('{') && syntax.opEscXBraceHex8()) {
 inc();
-int num = scanUnsignedHexadecimalNumber(8);
+int num = scanUnsignedHexadecimalNumber(0, 8);
 if (num < 0) newValueException(ERR_TOO_BIG_WIDE_CHAR_VALUE);
 if (left()) {
 if (enc.isXDigit(peek())) 
newValueException(ERR_TOO_LONG_WIDE_CHAR_VALUE);
@@ -782,7 +783,7 @@ class Lexer extends ScannerSupport {
 p = last;
 }
 } else if (syntax.opEscXHex2()) {
-int num = scanUnsignedHexadecimalNumber(2);
+int num = scanUnsignedHexadecimalNumber(0, 2);
 if (num < 0) newValueException(ERR_TOO_BIG_NUMBER);
 if (p == last) { /* can't read nothing. */
 num = 0; /* but, it's not error */
@@ -798,7 +799,8 @@ class Lexer extends ScannerSupport {
 int last = p;
 
 if (syntax.op2EscUHex4()) {
-int num = scanUnsignedHexadecimalNumber(4);
+int num = scanUnsignedHexadecimalNumber(4, 4);
+if (num < -1) newValueException(ERR_TOO_SHORT_DIGITS);
 if (num < 0) newValueException(ERR_TOO_BIG_NUMBER);
 if (p == last) { /* can't read nothing. */
 num = 0; /* but, it's not error */
diff --git a/src/org/joni/ScannerSupport.java b/src/org/joni/ScannerSupport.java
index fde0d1d..9b98579 100644
--- a/src/org/joni/ScannerSupport.java
+++ b/src/org/joni/ScannerSupport.java
@@ -72,21 +72,23 @@ abstract class ScannerSupport extends IntHolder implements 
ErrorMessages {
 return num;
 }
 
-protected final int scanUnsignedHexadecimalNumber(int maxLength) {
+protected final int scanUnsignedHexadecimalNumber(int minLength, int 
maxLength) {
 int last = c;
 int num = 0;
+int restLen = maxLength - minLength;
 while(left() && maxLength-- != 0) {
 fetch();
 if (enc.isXDigit(c)) {
-int onum = num;
 int val = enc.xdigitVal(c);
+if ((Integer.MAX_VALUE - val) / 16 < num) return -1;
 num = (num << 4) + val;
-if (((onum ^ num) & INT_SIGN_BIT) != 0) return -1;
 } else {
 unfetch();
+maxLength++;
 break;
 }
 }
+if (maxLength > restLen) return -2;
 c = last;
 return num;
 }
diff --git a/src/org/joni/exception/ErrorMessages.java 
b/src/org/joni/exception/ErrorMessages.java
index 8605c5c..c138574 100644
--- a/src/org/joni/exception/ErrorMessages.java
+++ b/src/org/joni/exception/ErrorMessages.java
@@ -77,6 +77,7 @@ public interface ErrorMessages extends 
org.jcodings.exception.ErrorMessages {
 final String ERR_TOO_BIG_BACKREF_NUMBER = "too big backref number";
 final String ERR_INVALID_BACKREF =

[jruby-joni] 28/31: [maven-release-plugin] prepare release joni-2.1.15

2018-02-24 Thread Hideki Yamane

This is an automated email from the git hooks/post-receive script.

henrich pushed a commit to branch debian/sid
in repository jruby-joni.

commit 6a7ca3f6d24bf33b4600bac46f65bb09b42554bb
Author: Thomas E. Enebo 
Date:   Wed Feb 21 09:50:49 2018 -0600

[maven-release-plugin] prepare release joni-2.1.15
---
 pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index 942e8a5..a7cdb68 100644
--- a/pom.xml
+++ b/pom.xml
@@ -4,7 +4,7 @@
   org.jruby.joni
   joni
   jar
-  2.1.15-SNAPSHOT
+  2.1.15
   Joni
   
 Java port of Oniguruma: http://www.geocities.jp/kosako3/oniguruma

-- 
Alioth's /usr/local/bin/git-commit-notice on 
/srv/git.debian.org/git/pkg-java/jruby-joni.git

___
pkg-java-commits mailing list
pkg-java-comm...@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-java-commits

[jruby-joni] 18/31: more validation tests

2018-02-24 Thread Hideki Yamane

This is an automated email from the git hooks/post-receive script.

henrich pushed a commit to branch debian/sid
in repository jruby-joni.

commit e9e7a3ff17ace272b8b6a654c15c133b674b2e89
Author: Marcin Mielzynski 
Date:   Fri Feb 2 18:10:56 2018 +0100

more validation tests
---
 test/org/joni/test/Test.java  |  5 +
 test/org/joni/test/TestError.java | 24 +---
 2 files changed, 26 insertions(+), 3 deletions(-)

diff --git a/test/org/joni/test/Test.java b/test/org/joni/test/Test.java
index fe90317..531d513 100644
--- a/test/org/joni/test/Test.java
+++ b/test/org/joni/test/Test.java
@@ -24,6 +24,7 @@ import static org.junit.Assert.assertEquals;
 import java.io.UnsupportedEncodingException;
 
 import org.jcodings.Encoding;
+import org.jcodings.exception.CharacterPropertyException;
 import org.joni.Config;
 import org.joni.Matcher;
 import org.joni.Option;
@@ -87,6 +88,10 @@ public abstract class Test {
 } catch (JOniException je) {
 nsucc++;
 assertEquals(je.getMessage(), msg);
+} catch (CharacterPropertyException cpe) {
+nsucc++;
+assertEquals(cpe.getMessage(), msg);
+
 }
 }
 
diff --git a/test/org/joni/test/TestError.java 
b/test/org/joni/test/TestError.java
index 2d614ce..9d681ee 100755
--- a/test/org/joni/test/TestError.java
+++ b/test/org/joni/test/TestError.java
@@ -19,11 +19,11 @@
  */
 package org.joni.test;
 
+import org.jcodings.Encoding;
+import org.jcodings.specific.UTF8Encoding;
 import org.joni.Option;
 import org.joni.Syntax;
 import org.joni.exception.ErrorMessages;
-import org.jcodings.Encoding;
-import org.jcodings.specific.ASCIIEncoding;
 
 public class TestError extends Test {
 @Override
@@ -33,7 +33,7 @@ public class TestError extends Test {
 
 @Override
 public Encoding encoding() {
-return ASCIIEncoding.INSTANCE;
+return UTF8Encoding.INSTANCE;
 }
 
 @Override
@@ -62,5 +62,23 @@ public class TestError extends Test {
xerrs("\\((", 
ErrorMessages.ERR_END_PATTERN_WITH_UNMATCHED_PARENTHESIS);
xerrs("(|", 
ErrorMessages.ERR_END_PATTERN_WITH_UNMATCHED_PARENTHESIS);
xerrs("'/g\\\u00ff\u00ff\u00ff\u00ff&))", 
ErrorMessages.ERR_UNMATCHED_CLOSE_PARENTHESIS);
+   xerrs("[0-0-\u00ff  ", 
ErrorMessages.ERR_PREMATURE_END_OF_CHAR_CLASS); // \xe2
+   xerrs("\\p{foobarbaz}", 
ErrorMessages.ERR_INVALID_CHAR_PROPERTY_NAME.replace("%n", "foobarbaz"));
+   //xerrs("\\p{あ}", 
ErrorMessages.ERR_INVALID_CHAR_PROPERTY_NAME.replace("%n", "あ"));
+
+   xerrs("a{11}", 
ErrorMessages.ERR_TOO_BIG_NUMBER_FOR_REPEAT_RANGE);
+   xerrs("a{0,11}", 
ErrorMessages.ERR_TOO_BIG_NUMBER_FOR_REPEAT_RANGE);
+   xerrs("a{5,1}", 
ErrorMessages.ERR_UPPER_SMALLER_THAN_LOWER_IN_REPEAT_RANGE);
+   xerrs("[\\6000", ErrorMessages.ERR_TOO_BIG_NUMBER); // CVE-2017-9226
+   xerrs("[\\H- ]", 
ErrorMessages.ERR_UNMATCHED_RANGE_SPECIFIER_IN_CHAR_CLASS); // CVE-2017-9228
+
+   xerrs("(?:ab|cd)*\\1", ErrorMessages.ERR_INVALID_BACKREF);
+
+   xerrs("(.(?=\\g<1>))", ErrorMessages.ERR_NEVER_ENDING_RECURSION);
+   xerrs("(a)(?b)\\g<1>\\g", 
ErrorMessages.ERR_NUMBERED_BACKREF_OR_CALL_NOT_ALLOWED);
+
+   // xerrs("(?<", 
ErrorMessages.ERR_END_PATTERN_WITH_UNMATCHED_PARENTHESIS);
+   xerrs("(?<>)", ErrorMessages.ERR_EMPTY_GROUP_NAME);
+   // xerrs("(?<.>)", ErrorMessages.ERR_INVALID_CHAR_IN_GROUP_NAME);
 }
 }

-- 
Alioth's /usr/local/bin/git-commit-notice on 
/srv/git.debian.org/git/pkg-java/jruby-joni.git

___
pkg-java-commits mailing list
pkg-java-comm...@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-java-commits

[jruby-joni] 11/31: errors / syntax errors tests

2018-02-24 Thread Hideki Yamane

This is an automated email from the git hooks/post-receive script.

henrich pushed a commit to branch debian/sid
in repository jruby-joni.

commit dc125d428ee894714448c81ddbe6edd36ebd838e
Author: lopex 
Date:   Fri Feb 2 10:41:18 2018 +0100

errors / syntax errors tests
---
 test/org/joni/test/Test.java  | 16 ++
 test/org/joni/test/TestError.java | 63 +++
 test/org/joni/test/TestU8.java|  2 --
 3 files changed, 79 insertions(+), 2 deletions(-)

diff --git a/test/org/joni/test/Test.java b/test/org/joni/test/Test.java
index b394de9..2412e12 100644
--- a/test/org/joni/test/Test.java
+++ b/test/org/joni/test/Test.java
@@ -72,6 +72,22 @@ public abstract class Test {
 }
 }
 
+public void xerrs(String pattern, String msg) throws Exception {
+xerr(pattern.getBytes(testEncoding()), msg, option());
+}
+
+public void xerrs(String pattern, String msg, int option) throws Exception 
{
+xerr(pattern.getBytes(testEncoding()), msg, option);
+}
+
+public void xerr(byte[] pattern, String msg, int option) throws Exception {
+try {
+new Regex(pattern, 0, length(pattern), option, encoding(), 
syntax(), WarnCallback.NONE);
+} catch (JOniException je) {
+assertEquals(je.getMessage(), msg);
+}
+}
+
 public void xx(byte[] pattern, byte[] str, int from, int to, int mem, 
boolean not) throws InterruptedException {
 xx(pattern, str, from, to, mem, not, option());
 }
diff --git a/test/org/joni/test/TestError.java 
b/test/org/joni/test/TestError.java
new file mode 100755
index 000..4276174
--- /dev/null
+++ b/test/org/joni/test/TestError.java
@@ -0,0 +1,63 @@
+/*
+ * Permission is hereby granted, free of charge, to any person obtaining a 
copy of
+ * this software and associated documentation files (the "Software"), to deal 
in
+ * the Software without restriction, including without limitation the rights to
+ * use, copy, modify, merge, publish, distribute, sublicense, and/or sell 
copies
+ * of the Software, and to permit persons to whom the Software is furnished to 
do
+ * so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in 
all
+ * copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING 
FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN 
THE
+ * SOFTWARE.
+ */
+package org.joni.test;
+
+import org.joni.Option;
+import org.joni.Syntax;
+import org.joni.exception.ErrorMessages;
+import org.jcodings.Encoding;
+import org.jcodings.specific.ASCIIEncoding;
+
+public class TestError extends Test {
+   @Override
+public int option() {
+return Option.DEFAULT;
+}
+
+   @Override
+public Encoding encoding() {
+return ASCIIEncoding.INSTANCE;
+}
+
+   @Override
+public String testEncoding() {
+return "iso-8859-2";
+}
+
+   @Override
+public Syntax syntax() {
+return Syntax.TEST;
+}
+
+   @Override
+public void test() throws Exception {
+   xerrs("(", 
ErrorMessages.ERR_END_PATTERN_WITH_UNMATCHED_PARENTHESIS);
+   xerrs("(0?0|(?(1)||)|(?(1)||))?", 
ErrorMessages.ERR_INVALID_CONDITION_PATTERN);
+   // xerrs("[\\400", ErrorMessages.ERR_TOO_BIG_NUMBER);
+   // xerrs("[\\400\n", ErrorMessages.ERR_TOO_BIG_NUMBER);
+   xerrs("[]", ErrorMessages.ERR_EMPTY_CHAR_CLASS);
+   xerrs("[c-a]", ErrorMessages.ERR_EMPTY_RANGE_IN_CHAR_CLASS);
+   xerrs("\\x{}", ErrorMessages.ERR_TOO_BIG_WIDE_CHAR_VALUE);
+   xerrs("\\x{1}", ErrorMessages.ERR_TOO_LONG_WIDE_CHAR_VALUE);
+   // xerrs("\\u026x", ErrorMessages.ERR_TOO_SHORT_DIGITS);
+   xerrs("()(?\\!(?'a')\\1)", 
ErrorMessages.ERR_UNDEFINED_GROUP_OPTION);
+   xerrs("\\((", 
ErrorMessages.ERR_END_PATTERN_WITH_UNMATCHED_PARENTHESIS);
+}
+}
diff --git a/test/org/joni/test/TestU8.java b/test/org/joni/test/TestU8.java
index f933765..6500930 100755
--- a/test/org/joni/test/TestU8.java
+++ b/test/org/joni/test/TestU8.java
@@ -19,8 +19,6 @@
  */
 package org.joni.test;
 
-import java.util.Arrays;
-
 import org.jcodings.Encoding;
 import org.jcodings.specific.UTF8Encoding;
 import org.joni.Option;

-- 
Alioth's /usr/local/bin/git-commit-notice on 
/srv/git.debian.org/git/pkg-java/jruby-joni.git

___
pkg-java-commits mailing list
pkg-java-comm...@lists.alioth.debian.org

[jruby-joni] 25/31: refactor to make ascii word opcodes more consistent

2018-02-24 Thread Hideki Yamane

This is an automated email from the git hooks/post-receive script.

henrich pushed a commit to branch debian/sid
in repository jruby-joni.

commit 6b8564640b97b92c012f70cf399e3bfeb341c037
Author: Marcin Mielzynski 
Date:   Fri Feb 2 23:36:32 2018 +0100

refactor to make ascii word opcodes more consistent
---
 src/org/joni/ArrayCompiler.java| 4 ++--
 src/org/joni/ByteCodeMachine.java  | 8 
 src/org/joni/constants/OPCode.java | 4 ++--
 3 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/src/org/joni/ArrayCompiler.java b/src/org/joni/ArrayCompiler.java
index 736d68c..00af9b7 100644
--- a/src/org/joni/ArrayCompiler.java
+++ b/src/org/joni/ArrayCompiler.java
@@ -323,7 +323,7 @@ final class ArrayCompiler extends Compiler {
 case CharacterType.WORD:
 if (cn.not) {
 if (cn.asciiRange) {
-op = OPCode.NOT_ASCII_WORD;
+op = OPCode.ASCII_NOT_WORD;
 } else {
 op = OPCode.NOT_WORD;
 }
@@ -1058,7 +1058,7 @@ final class ArrayCompiler extends Compiler {
 
 case AnchorType.NOT_WORD_BOUND:
 if (node.asciiRange) {
-addOpcode(OPCode.NOT_ASCII_WORD_BOUND);
+addOpcode(OPCode.ASCII_NOT_WORD_BOUND);
 } else {
 addOpcode(OPCode.NOT_WORD_BOUND);
 }
diff --git a/src/org/joni/ByteCodeMachine.java 
b/src/org/joni/ByteCodeMachine.java
index 85d9916..9e74e0a 100644
--- a/src/org/joni/ByteCodeMachine.java
+++ b/src/org/joni/ByteCodeMachine.java
@@ -241,9 +241,9 @@ class ByteCodeMachine extends StackMachine {
 case OPCode.WORD_END:   opWordEnd();   
continue;
 
 case OPCode.ASCII_WORD: opAsciiWord(); 
break;
-case OPCode.NOT_ASCII_WORD: opNotAsciiWord();  
break;
+case OPCode.ASCII_NOT_WORD: opNotAsciiWord();  
break;
 case OPCode.ASCII_WORD_BOUND:   opAsciiWordBound();
break;
-case OPCode.NOT_ASCII_WORD_BOUND:   opNotAsciiWordBound(); 
continue;
+case OPCode.ASCII_NOT_WORD_BOUND:   opNotAsciiWordBound(); 
continue;
 case OPCode.ASCII_WORD_BEGIN:   opAsciiWordBegin();
continue;
 case OPCode.ASCII_WORD_END: opAsciiWordEnd();  
continue;
 
@@ -376,9 +376,9 @@ class ByteCodeMachine extends StackMachine {
 case OPCode.WORD_END:   opWordEndSb(); 
  continue;
 
 case OPCode.ASCII_WORD: opAsciiWord(); 
break;
-case OPCode.NOT_ASCII_WORD: opNotAsciiWord();  
break;
+case OPCode.ASCII_NOT_WORD: opNotAsciiWord();  
break;
 case OPCode.ASCII_WORD_BOUND:   opAsciiWordBound();
break;
-case OPCode.NOT_ASCII_WORD_BOUND:   opNotAsciiWordBound(); 
continue;
+case OPCode.ASCII_NOT_WORD_BOUND:   opNotAsciiWordBound(); 
continue;
 case OPCode.ASCII_WORD_BEGIN:   opAsciiWordBegin();
continue;
 case OPCode.ASCII_WORD_END: opAsciiWordEnd();  
continue;
 
diff --git a/src/org/joni/constants/OPCode.java 
b/src/org/joni/constants/OPCode.java
index 3e95aad..e4bf93c 100644
--- a/src/org/joni/constants/OPCode.java
+++ b/src/org/joni/constants/OPCode.java
@@ -63,9 +63,9 @@ public interface OPCode {
 final int WORD_END  = 33;
 
 final int ASCII_WORD= 34;
-final int NOT_ASCII_WORD= 35;
+final int ASCII_NOT_WORD= 35;
 final int ASCII_WORD_BOUND  = 36;
-final int NOT_ASCII_WORD_BOUND  = 37;
+final int ASCII_NOT_WORD_BOUND  = 37;
 final int ASCII_WORD_BEGIN  = 38;
 final int ASCII_WORD_END= 39;
 

-- 
Alioth's /usr/local/bin/git-commit-notice on 
/srv/git.debian.org/git/pkg-java/jruby-joni.git

___
pkg-java-commits mailing list
pkg-java-comm...@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-java-commits

[jruby-joni] 21/31: more validation tests

2018-02-24 Thread Hideki Yamane

This is an automated email from the git hooks/post-receive script.

henrich pushed a commit to branch debian/sid
in repository jruby-joni.

commit e542bd56a32309278dac14222311d7893db62d62
Author: Marcin Mielzynski 
Date:   Fri Feb 2 18:42:01 2018 +0100

more validation tests
---
 test/org/joni/test/TestError.java | 7 +++
 1 file changed, 7 insertions(+)

diff --git a/test/org/joni/test/TestError.java 
b/test/org/joni/test/TestError.java
index f052ace..246cd33 100755
--- a/test/org/joni/test/TestError.java
+++ b/test/org/joni/test/TestError.java
@@ -86,5 +86,12 @@ public class TestError extends Test {
// xerrs("\\k<1-1/>", 
ErrorMessages.ERR_INVALID_GROUP_NAME.replace("%n", "1-1/>"));
// xerrs("\\k", 
ErrorMessages.ERR_INVALID_CHAR_IN_GROUP_NAME.replace("%n", "a/"));
 
+   xerrs("*", 
ErrorMessages.ERR_TARGET_OF_REPEAT_OPERATOR_NOT_SPECIFIED);
+   xerrs("{1}", 
ErrorMessages.ERR_TARGET_OF_REPEAT_OPERATOR_NOT_SPECIFIED);
+
+   xerrs("(?a)(?b)\\g", 
ErrorMessages.ERR_MULTIPLEX_DEFINITION_NAME_CALL.replace("%n", "a"));
+
+   xerrs("(a)?(?b)?(?(1)a)(?()b)", 
ErrorMessages.ERR_NUMBERED_BACKREF_OR_CALL_NOT_ALLOWED);
+
 }
 }

-- 
Alioth's /usr/local/bin/git-commit-notice on 
/srv/git.debian.org/git/pkg-java/jruby-joni.git

___
pkg-java-commits mailing list
pkg-java-comm...@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-java-commits

[jruby-joni] 20/31: enable passing invalid group tests

2018-02-24 Thread Hideki Yamane

This is an automated email from the git hooks/post-receive script.

henrich pushed a commit to branch debian/sid
in repository jruby-joni.

commit b768b38c43e5c7cbd0cc0a035520d4d6fba6e75f
Author: Marcin Mielzynski 
Date:   Fri Feb 2 18:39:09 2018 +0100

enable passing invalid group tests
---
 test/org/joni/test/TestError.java | 7 ++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/test/org/joni/test/TestError.java 
b/test/org/joni/test/TestError.java
index 5c44f91..f052ace 100755
--- a/test/org/joni/test/TestError.java
+++ b/test/org/joni/test/TestError.java
@@ -80,6 +80,11 @@ public class TestError extends Test {
 
// xerrs("(?<", 
ErrorMessages.ERR_END_PATTERN_WITH_UNMATCHED_PARENTHESIS);
xerrs("(?<>)", ErrorMessages.ERR_EMPTY_GROUP_NAME);
-   // xerrs("(?<.>)", ErrorMessages.ERR_INVALID_CHAR_IN_GROUP_NAME);
+   //xerrs("(?<.>)", ErrorMessages.ERR_INVALID_CHAR_IN_GROUP_NAME);
+   xerrs("\\g<1->", 
ErrorMessages.ERR_INVALID_CHAR_IN_GROUP_NAME.replace("%n", "1->"));
+   xerrs("\\k<1/>", ErrorMessages.ERR_INVALID_GROUP_NAME.replace("%n", 
"1/"));
+   // xerrs("\\k<1-1/>", 
ErrorMessages.ERR_INVALID_GROUP_NAME.replace("%n", "1-1/>"));
+   // xerrs("\\k", 
ErrorMessages.ERR_INVALID_CHAR_IN_GROUP_NAME.replace("%n", "a/"));
+
 }
 }

-- 
Alioth's /usr/local/bin/git-commit-notice on 
/srv/git.debian.org/git/pkg-java/jruby-joni.git

___
pkg-java-commits mailing list
pkg-java-comm...@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-java-commits

[jruby-joni] 24/31: dedup tests for singlebyte

2018-02-24 Thread Hideki Yamane

This is an automated email from the git hooks/post-receive script.

henrich pushed a commit to branch debian/sid
in repository jruby-joni.

commit 3e7a38bac791bafa2097c61f135fa66cf63510ac
Author: Marcin Mielzynski 
Date:   Fri Feb 2 22:15:29 2018 +0100

dedup tests for singlebyte
---
 test/org/joni/test/Test.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/test/org/joni/test/Test.java b/test/org/joni/test/Test.java
index 88c1a88..ac598e4 100644
--- a/test/org/joni/test/Test.java
+++ b/test/org/joni/test/Test.java
@@ -125,7 +125,7 @@ public abstract class Test {
 return Matcher.FAILED;
 }
 
-if (encoding().isAsciiCompatible() && is7bit(str, 0, str.length)) {
+if ((!encoding().isSingleByte()) && encoding().isAsciiCompatible() && 
is7bit(str, 0, str.length)) {
 check(reg, pattern, str, option | Option.CR_7_BIT, from, to, mem, 
not);
 }
 

-- 
Alioth's /usr/local/bin/git-commit-notice on 
/srv/git.debian.org/git/pkg-java/jruby-joni.git

___
pkg-java-commits mailing list
pkg-java-comm...@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-java-commits

[jruby-joni] 23/31: enable tests for 7 bit matching

2018-02-24 Thread Hideki Yamane

This is an automated email from the git hooks/post-receive script.

henrich pushed a commit to branch debian/sid
in repository jruby-joni.

commit 248caea8ca43264df61533c98d524bb087febd63
Author: Marcin Mielzynski 
Date:   Fri Feb 2 20:59:22 2018 +0100

enable tests for 7 bit matching
---
 test/org/joni/test/Test.java | 6 --
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/test/org/joni/test/Test.java b/test/org/joni/test/Test.java
index 992b758..88c1a88 100644
--- a/test/org/joni/test/Test.java
+++ b/test/org/joni/test/Test.java
@@ -125,9 +125,11 @@ public abstract class Test {
 return Matcher.FAILED;
 }
 
-int result = check(reg, pattern, str, option, from, to, mem, not);
+if (encoding().isAsciiCompatible() && is7bit(str, 0, str.length)) {
+check(reg, pattern, str, option | Option.CR_7_BIT, from, to, mem, 
not);
+}
 
-return result;
+return check(reg, pattern, str, option, from, to, mem, not);
 }
 
 private int check(Regex reg, byte[]pattern, byte[]str, int option, int 
from, int to, int mem, boolean not) throws InterruptedException {

-- 
Alioth's /usr/local/bin/git-commit-notice on 
/srv/git.debian.org/git/pkg-java/jruby-joni.git

___
pkg-java-commits mailing list
pkg-java-comm...@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-java-commits

[jruby-joni] 15/31: add implicit anchor optimization tests

2018-02-24 Thread Hideki Yamane

This is an automated email from the git hooks/post-receive script.

henrich pushed a commit to branch debian/sid
in repository jruby-joni.

commit 59cc0e8242219d07a0f65851cc6ebb0b3b8c0d3e
Author: lopex 
Date:   Fri Feb 2 11:54:15 2018 +0100

add implicit anchor optimization tests
---
 test/org/joni/test/TestU8.java | 12 
 1 file changed, 12 insertions(+)

diff --git a/test/org/joni/test/TestU8.java b/test/org/joni/test/TestU8.java
index ba2bdd6..2a8eccc 100755
--- a/test/org/joni/test/TestU8.java
+++ b/test/org/joni/test/TestU8.java
@@ -187,6 +187,18 @@ public class TestU8 extends Test {
 x2s("(?i)\u0149\u0149", "\u0149\u0149", 0, 4);
 x2s("(?i)(?<=\u0149)a", "\u02bcna", 3, 4);
 
+x2s("(?m:.*abc)", "dddabdd\nddabc", 0, 13);
+x2s("(?m:.+abc)", "dddabdd\nddabc", 0, 13);
+x2s("(?-m:.*abc)", "dddabdd\nddabc", 8, 13);
+ns("(?-m:.*ab[x-z])", "dddabdd\nddabc");
+x2s("(?-m:.*(?:abc|\\Gabc))", "dddabdd\nddabc", 8, 13);
+x2s("(?-m:.+abc)", "dddabdd\nddabc", 8, 13);
+x2s("(?-m:.*abc)", "dddabdd\nabc", 8, 11);
+ns("(?-m:.+abc)", "dddabdd\nabc");
+x2s("(?m:.*\\Z)", "dddabdd\nddabc", 0, 13);
+x2s("(?-m:.*\\Z)", "dddabdd\nddabc", 8, 13);
+x2s("(.*)X\\1", "1234X2345", 1, 8);
+
 x2s("(?<=(?i)ab)cd", "ABcd", 2, 4);
 x2s("(?<=(?i:ab))cd", "ABcd", 2, 4);
 ns("(?<=(?i)ab)cd", "ABCD");

-- 
Alioth's /usr/local/bin/git-commit-notice on 
/srv/git.debian.org/git/pkg-java/jruby-joni.git

___
pkg-java-commits mailing list
pkg-java-comm...@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-java-commits

[jruby-joni] 10/31: Merge branch 'master' of https://github.com/jruby/joni

2018-02-24 Thread Hideki Yamane

This is an automated email from the git hooks/post-receive script.

henrich pushed a commit to branch debian/sid
in repository jruby-joni.

commit d6c22ea031eb069b5fb6d8b3f6f0f4590c8656d3
Merge: a779d35 0bbfe42
Author: Marcin Mielzynski 
Date:   Thu Feb 1 18:14:21 2018 +0100

Merge branch 'master' of https://github.com/jruby/joni

 src/org/joni/Analyser.java | 8 ++--
 src/org/joni/Matcher.java  | 8 +++-
 test/org/joni/test/TestU8.java | 4 
 3 files changed, 17 insertions(+), 3 deletions(-)

diff --cc test/org/joni/test/TestU8.java
index 8915175,90d34d2..f933765
--- a/test/org/joni/test/TestU8.java
+++ b/test/org/joni/test/TestU8.java
@@@ -327,8 -327,8 +327,12 @@@ public class TestU8 extends Test 
  
  ns("(\\2)(\\1)", "");
  
+ x2s("(?<=fo).*", "foo", 2, 3);
+ x2s("(?m)(?<=fo).*", "foo", 2, 3);
+ x2s("(?m)(?<=fo).+", "foo", 2, 3);
++
 +x3s("\\(((?:[^(]|\\g<0>)*)\\)", "(abc)(abc)", 1, 4, 1);
 +x3s("\\(((?:[^(]|\\g<0>)*)\\)", "((abc)(abc))", 1, 11, 1);
 +x3s("\\(((?:[^(]|(\\g<0>))*)\\)", "((abc)(abc))", 6, 11, 2);
  }
  }

-- 
Alioth's /usr/local/bin/git-commit-notice on 
/srv/git.debian.org/git/pkg-java/jruby-joni.git

___
pkg-java-commits mailing list
pkg-java-comm...@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-java-commits

[jruby-joni] 01/31: [maven-release-plugin] prepare for next development iteration

2018-02-24 Thread Hideki Yamane

This is an automated email from the git hooks/post-receive script.

henrich pushed a commit to branch debian/sid
in repository jruby-joni.

commit a7d9b11c58f004b1b2be9073c7d444ce64cecbe7
Author: Thomas E. Enebo 
Date:   Thu Jan 25 14:53:36 2018 -0600

[maven-release-plugin] prepare for next development iteration
---
 pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index 9d52b6c..942e8a5 100644
--- a/pom.xml
+++ b/pom.xml
@@ -4,7 +4,7 @@
   org.jruby.joni
   joni
   jar
-  2.1.14
+  2.1.15-SNAPSHOT
   Joni
   
 Java port of Oniguruma: http://www.geocities.jp/kosako3/oniguruma

-- 
Alioth's /usr/local/bin/git-commit-notice on 
/srv/git.debian.org/git/pkg-java/jruby-joni.git

___
pkg-java-commits mailing list
pkg-java-comm...@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-java-commits

[jruby-joni] 02/31: backref opcode cleanup

2018-02-24 Thread Hideki Yamane

This is an automated email from the git hooks/post-receive script.

henrich pushed a commit to branch debian/sid
in repository jruby-joni.

commit f160ae9ae75f1f7866bba3af8cb23702b673decb
Author: Marcin Mielzynski 
Date:   Sat Jan 27 18:22:56 2018 +0100

backref opcode cleanup
---
 src/org/joni/ByteCodeMachine.java | 17 +++--
 1 file changed, 3 insertions(+), 14 deletions(-)

diff --git a/src/org/joni/ByteCodeMachine.java 
b/src/org/joni/ByteCodeMachine.java
index a64c712..603b9d6 100644
--- a/src/org/joni/ByteCodeMachine.java
+++ b/src/org/joni/ByteCodeMachine.java
@@ -1368,24 +1368,17 @@ class ByteCodeMachine extends StackMachine {
 }
 
 private void backref(int mem) {
-/* if you want to remove following line,
-you should check in parse and compile time. (numMem) */
 if (mem > regex.numMem || backrefInvalid(mem)) {opFail(); return;}
-
 int pstart = backrefStart(mem);
 int pend = backrefEnd(mem);
-
 int n = pend - pstart;
 if (s + n > range) {opFail(); return;}
 sprev = s;
 
-// STRING_CMP
-while(n-- > 0) if (bytes[pstart++] != bytes[s++]) {opFail(); return;}
+while (n-- > 0) if (bytes[pstart++] != bytes[s++]) {opFail(); return;}
 
-int len;
-
-// beyond string check
-if (sprev < range) {
+if (sprev < range) { // beyond string check
+int len;
 while (sprev + (len = enc.length(bytes, sprev, end)) < s) sprev += 
len;
 }
 }
@@ -1404,13 +1397,9 @@ class ByteCodeMachine extends StackMachine {
 
 private void opBackRefNIC() {
 int mem = code[ip++];
-/* if you want to remove following line,
-you should check in parse and compile time. (numMem) */
 if (mem > regex.numMem || backrefInvalid(mem)) {opFail(); return;}
-
 int pstart = backrefStart(mem);
 int pend = backrefEnd(mem);
-
 int n = pend - pstart;
 if (s + n > range) {opFail(); return;}
 sprev = s;

-- 
Alioth's /usr/local/bin/git-commit-notice on 
/srv/git.debian.org/git/pkg-java/jruby-joni.git

___
pkg-java-commits mailing list
pkg-java-comm...@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-java-commits

[jruby-joni] 16/31: more tests

2018-02-24 Thread Hideki Yamane

This is an automated email from the git hooks/post-receive script.

henrich pushed a commit to branch debian/sid
in repository jruby-joni.

commit fe8e1fc73907caaecb4e42475cdbcec2ccfe2c77
Author: lopex 
Date:   Fri Feb 2 13:42:53 2018 +0100

more tests
---
 src/org/joni/Lexer.java   | 4 ++--
 test/org/joni/test/TestError.java | 7 +--
 2 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/src/org/joni/Lexer.java b/src/org/joni/Lexer.java
index 35869ad..bd80c21 100644
--- a/src/org/joni/Lexer.java
+++ b/src/org/joni/Lexer.java
@@ -601,7 +601,7 @@ class Lexer extends ScannerSupport {
 unfetch();
 int last = p;
 int num = scanUnsignedOctalNumber(3);
-if (num < 0) newValueException(ERR_TOO_BIG_NUMBER);
+if (num < 0 || num > 0xff) newValueException(ERR_TOO_BIG_NUMBER);
 if (p == last) {  /* can't read nothing. */
 num = 0; /* but, it's not error */
 }
@@ -840,7 +840,7 @@ class Lexer extends ScannerSupport {
 if (syntax.opEscOctal3()) {
 int last = p;
 int num = scanUnsignedOctalNumber(c == '0' ? 2 : 3);
-if (num < 0) newValueException(ERR_TOO_BIG_NUMBER);
+if (num < 0 || num > 0xff) newValueException(ERR_TOO_BIG_NUMBER);
 if (p == last) { /* can't read nothing. */
 num = 0; /* but, it's not error */
 }
diff --git a/test/org/joni/test/TestError.java 
b/test/org/joni/test/TestError.java
index e0f1347..f520907 100755
--- a/test/org/joni/test/TestError.java
+++ b/test/org/joni/test/TestError.java
@@ -49,9 +49,10 @@ public class TestError extends Test {
 @Override
 public void test() throws Exception {
xerrs("(", 
ErrorMessages.ERR_END_PATTERN_WITH_UNMATCHED_PARENTHESIS);
+   xerrs("[[:WoRd:]]", ErrorMessages.ERR_INVALID_POSIX_BRACKET_TYPE);
xerrs("(0?0|(?(1)||)|(?(1)||))?", 
ErrorMessages.ERR_INVALID_CONDITION_PATTERN);
-   // xerrs("[\\400", ErrorMessages.ERR_TOO_BIG_NUMBER);
-   // xerrs("[\\400\n", ErrorMessages.ERR_TOO_BIG_NUMBER);
+   xerrs("[\\400", ErrorMessages.ERR_TOO_BIG_NUMBER);
+   xerrs("[\\400\n", ErrorMessages.ERR_TOO_BIG_NUMBER);
xerrs("[]", ErrorMessages.ERR_EMPTY_CHAR_CLASS);
xerrs("[c-a]", ErrorMessages.ERR_EMPTY_RANGE_IN_CHAR_CLASS);
xerrs("\\x{}", ErrorMessages.ERR_TOO_BIG_WIDE_CHAR_VALUE);
@@ -59,5 +60,7 @@ public class TestError extends Test {
// xerrs("\\u026x", ErrorMessages.ERR_TOO_SHORT_DIGITS);
xerrs("()(?\\!(?'a')\\1)", 
ErrorMessages.ERR_UNDEFINED_GROUP_OPTION);
xerrs("\\((", 
ErrorMessages.ERR_END_PATTERN_WITH_UNMATCHED_PARENTHESIS);
+   xerrs("(|", 
ErrorMessages.ERR_END_PATTERN_WITH_UNMATCHED_PARENTHESIS);
+   xerrs("'/g\\\u00ff\u00ff\u00ff\u00ff&))", 
ErrorMessages.ERR_UNMATCHED_CLOSE_PARENTHESIS);
 }
 }

-- 
Alioth's /usr/local/bin/git-commit-notice on 
/srv/git.debian.org/git/pkg-java/jruby-joni.git

___
pkg-java-commits mailing list
pkg-java-comm...@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-java-commits

[jruby-joni] 08/31: look behind fixes

2018-02-24 Thread Hideki Yamane

This is an automated email from the git hooks/post-receive script.

henrich pushed a commit to branch debian/sid
in repository jruby-joni.

commit 0bbfe42d295efb432ba53afb3993533f89ee4495
Author: lopex 
Date:   Thu Feb 1 12:24:32 2018 +0100

look behind fixes
---
 src/org/joni/Analyser.java | 8 ++--
 src/org/joni/Matcher.java  | 8 +++-
 test/org/joni/test/TestU8.java | 4 
 3 files changed, 17 insertions(+), 3 deletions(-)

diff --git a/src/org/joni/Analyser.java b/src/org/joni/Analyser.java
index 467fc46..d5ce220 100644
--- a/src/org/joni/Analyser.java
+++ b/src/org/joni/Analyser.java
@@ -2311,10 +2311,14 @@ final class Analyser extends Parser {
 regex.anchor = opt.anchor.leftAnchor & (AnchorType.BEGIN_BUF |
 AnchorType.BEGIN_POSITION |
 AnchorType.ANYCHAR_STAR |
-AnchorType.ANYCHAR_STAR_ML);
+AnchorType.ANYCHAR_STAR_ML |
+AnchorType.LOOK_BEHIND);
+
+if ((opt.anchor.leftAnchor & (AnchorType.LOOK_BEHIND | 
AnchorType.PREC_READ_NOT)) != 0) regex.anchor &= ~AnchorType.ANYCHAR_STAR_ML;
 
 regex.anchor |= opt.anchor.rightAnchor & (AnchorType.END_BUF |
-  AnchorType.SEMI_END_BUF);
+  AnchorType.SEMI_END_BUF |
+  AnchorType.PREC_READ_NOT);
 
 if ((regex.anchor & (AnchorType.END_BUF | AnchorType.SEMI_END_BUF)) != 
0) {
 regex.anchorDmin = opt.length.min;
diff --git a/src/org/joni/Matcher.java b/src/org/joni/Matcher.java
index 5d63442..c4226fd 100644
--- a/src/org/joni/Matcher.java
+++ b/src/org/joni/Matcher.java
@@ -433,10 +433,16 @@ public abstract class Matcher extends IntHolder {
 if (matchCheck(origRange, s, prev)) return 
match(s);
 prev = s;
 s += enc.length(bytes, s, end);
+
+if ((regex.anchor & (AnchorType.LOOK_BEHIND | 
AnchorType.PREC_READ_NOT)) == 0) {
+while (!enc.isNewLine(bytes, prev, end) && s < 
range) {
+prev = s;
+s += enc.length(bytes, s, end);
+}
+}
 } while (s < range);
 return mismatch();
 }
-
 }
 }
 
diff --git a/test/org/joni/test/TestU8.java b/test/org/joni/test/TestU8.java
index 539e3d1..90d34d2 100755
--- a/test/org/joni/test/TestU8.java
+++ b/test/org/joni/test/TestU8.java
@@ -326,5 +326,9 @@ public class TestU8 extends Test {
 ns("[^a\\x{80}]", "a", Option.CR_7_BIT);
 
 ns("(\\2)(\\1)", "");
+
+x2s("(?<=fo).*", "foo", 2, 3);
+x2s("(?m)(?<=fo).*", "foo", 2, 3);
+x2s("(?m)(?<=fo).+", "foo", 2, 3);
 }
 }

-- 
Alioth's /usr/local/bin/git-commit-notice on 
/srv/git.debian.org/git/pkg-java/jruby-joni.git

___
pkg-java-commits mailing list
pkg-java-comm...@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-java-commits

[jruby-joni] 19/31: add dont capture group option test

2018-02-24 Thread Hideki Yamane

This is an automated email from the git hooks/post-receive script.

henrich pushed a commit to branch debian/sid
in repository jruby-joni.

commit 0fbd4aac0a3da5fc0e1ed80d26b2341a602ddf25
Author: Marcin Mielzynski 
Date:   Fri Feb 2 18:14:35 2018 +0100

add dont capture group option test
---
 test/org/joni/test/TestError.java | 1 +
 1 file changed, 1 insertion(+)

diff --git a/test/org/joni/test/TestError.java 
b/test/org/joni/test/TestError.java
index 9d681ee..5c44f91 100755
--- a/test/org/joni/test/TestError.java
+++ b/test/org/joni/test/TestError.java
@@ -73,6 +73,7 @@ public class TestError extends Test {
xerrs("[\\H- ]", 
ErrorMessages.ERR_UNMATCHED_RANGE_SPECIFIER_IN_CHAR_CLASS); // CVE-2017-9228
 
xerrs("(?:ab|cd)*\\1", ErrorMessages.ERR_INVALID_BACKREF);
+   xerrs("(ab|cd)*\\1", ErrorMessages.ERR_INVALID_BACKREF, 
Option.DONT_CAPTURE_GROUP);
 
xerrs("(.(?=\\g<1>))", ErrorMessages.ERR_NEVER_ENDING_RECURSION);
xerrs("(a)(?b)\\g<1>\\g", 
ErrorMessages.ERR_NUMBERED_BACKREF_OR_CALL_NOT_ALLOWED);

-- 
Alioth's /usr/local/bin/git-commit-notice on 
/srv/git.debian.org/git/pkg-java/jruby-joni.git

___
pkg-java-commits mailing list
pkg-java-comm...@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-java-commits

[jruby-joni] 07/31: test for singlebyte CCLASS_MIX

2018-02-24 Thread Hideki Yamane

This is an automated email from the git hooks/post-receive script.

henrich pushed a commit to branch debian/sid
in repository jruby-joni.

commit 9166c343506d933b4a50fc939177f90dc3363a40
Author: lopex 
Date:   Wed Jan 31 10:47:21 2018 +0100

test for singlebyte CCLASS_MIX
---
 test/org/joni/test/TestU8.java | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/test/org/joni/test/TestU8.java b/test/org/joni/test/TestU8.java
index c5cf149..539e3d1 100755
--- a/test/org/joni/test/TestU8.java
+++ b/test/org/joni/test/TestU8.java
@@ -320,6 +320,8 @@ public class TestU8 extends Test {
 
 x2s("[^a\\x{80}]", "x", 0, 1);
 ns("[^a\\x{80}]", "a");
+ns("[a\\x{80}]", "x", Option.CR_7_BIT);
+x2s("[a\\x{80}]", "a", 0, 1, Option.CR_7_BIT);
 x2s("[^a\\x{80}]", "x", 0, 1, Option.CR_7_BIT);
 ns("[^a\\x{80}]", "a", Option.CR_7_BIT);
 

-- 
Alioth's /usr/local/bin/git-commit-notice on 
/srv/git.debian.org/git/pkg-java/jruby-joni.git

___
pkg-java-commits mailing list
pkg-java-comm...@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-java-commits

[jruby-joni] 03/31: move var

2018-02-24 Thread Hideki Yamane

This is an automated email from the git hooks/post-receive script.

henrich pushed a commit to branch debian/sid
in repository jruby-joni.

commit 62b12a9dd3e222dd2096fc5e19042cb1c5043838
Author: Marcin Mielzynski 
Date:   Mon Jan 29 21:39:07 2018 +0100

move var
---
 src/org/joni/ByteCodeMachine.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/org/joni/ByteCodeMachine.java 
b/src/org/joni/ByteCodeMachine.java
index 603b9d6..0d01bee 100644
--- a/src/org/joni/ByteCodeMachine.java
+++ b/src/org/joni/ByteCodeMachine.java
@@ -1408,8 +1408,8 @@ class ByteCodeMachine extends StackMachine {
 if (!stringCmpIC(regex.caseFoldFlag, pstart, this, n, end)) {opFail(); 
return;}
 s = value;
 
-int len;
 if (sprev < range) {
+int len;
 while (sprev + (len = enc.length(bytes, sprev, end)) < s) sprev += 
len;
 }
 }

-- 
Alioth's /usr/local/bin/git-commit-notice on 
/srv/git.debian.org/git/pkg-java/jruby-joni.git

___
pkg-java-commits mailing list
pkg-java-comm...@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-java-commits

[jruby-joni] 05/31: fix invalid backref

2018-02-24 Thread Hideki Yamane

This is an automated email from the git hooks/post-receive script.

henrich pushed a commit to branch debian/sid
in repository jruby-joni.

commit 40796a494907814201f42d79ece33d295c5749b8
Author: Marcin Mielzynski 
Date:   Mon Jan 29 22:05:42 2018 +0100

fix invalid backref
---
 src/org/joni/Analyser.java | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/org/joni/Analyser.java b/src/org/joni/Analyser.java
index 1da0c64..467fc46 100644
--- a/src/org/joni/Analyser.java
+++ b/src/org/joni/Analyser.java
@@ -1956,6 +1956,7 @@ final class Analyser extends Parser {
 
newValueException(ERR_NUMBERED_BACKREF_OR_CALL_NOT_ALLOWED);
 }
 }
+if (en.regNum > env.numMem) 
newValueException(ERR_INVALID_BACKREF);
 setupTree(en.target, state);
 break;
 

-- 
Alioth's /usr/local/bin/git-commit-notice on 
/srv/git.debian.org/git/pkg-java/jruby-joni.git

___
pkg-java-commits mailing list
pkg-java-comm...@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-java-commits

[jruby-joni] 04/31: fix recursion

2018-02-24 Thread Hideki Yamane

This is an automated email from the git hooks/post-receive script.

henrich pushed a commit to branch debian/sid
in repository jruby-joni.

commit a54891227246432003219b05164956dbea70364b
Author: Marcin Mielzynski 
Date:   Mon Jan 29 21:51:08 2018 +0100

fix recursion
---
 src/org/joni/Analyser.java | 24 ++--
 test/org/joni/test/TestU8.java |  1 +
 2 files changed, 19 insertions(+), 6 deletions(-)

diff --git a/src/org/joni/Analyser.java b/src/org/joni/Analyser.java
index 2db61ad..1da0c64 100644
--- a/src/org/joni/Analyser.java
+++ b/src/org/joni/Analyser.java
@@ -473,9 +473,15 @@ final class Analyser extends Parser {
 if (en.isMinFixed()) {
 min = en.minLength;
 } else {
-min = getMinMatchLength(en.target);
-en.minLength = min;
-en.setMinFixed();
+if (en.isMark1()) {
+min = 0; /* recursive */
+} else {
+en.setMark1();
+min = getMinMatchLength(en.target);
+en.clearMark1();
+en.minLength = min;
+en.setMinFixed();
+}
 }
 } // USE_SUBEXP_CALL
 break;
@@ -582,9 +588,15 @@ final class Analyser extends Parser {
 if (en.isMaxFixed()) {
 max = en.maxLength;
 } else {
-max = getMaxMatchLength(en.target);
-en.maxLength = max;
-en.setMaxFixed();
+if (en.isMark1()) {
+max = MinMaxLen.INFINITE_DISTANCE;
+} else {
+en.setMark1();
+max = getMaxMatchLength(en.target);
+en.clearMark1();
+en.maxLength = max;
+en.setMaxFixed();
+}
 }
 } // USE_SUBEXP_CALL
 break;
diff --git a/test/org/joni/test/TestU8.java b/test/org/joni/test/TestU8.java
index 6f33a2b..c5cf149 100755
--- a/test/org/joni/test/TestU8.java
+++ b/test/org/joni/test/TestU8.java
@@ -323,5 +323,6 @@ public class TestU8 extends Test {
 x2s("[^a\\x{80}]", "x", 0, 1, Option.CR_7_BIT);
 ns("[^a\\x{80}]", "a", Option.CR_7_BIT);
 
+ns("(\\2)(\\1)", "");
 }
 }

-- 
Alioth's /usr/local/bin/git-commit-notice on 
/srv/git.debian.org/git/pkg-java/jruby-joni.git

___
pkg-java-commits mailing list
pkg-java-comm...@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-java-commits

[jruby-joni] 06/31: add a test

2018-02-24 Thread Hideki Yamane

This is an automated email from the git hooks/post-receive script.

henrich pushed a commit to branch debian/sid
in repository jruby-joni.

commit 1fe4664127296351f81e55771bb643a9340fcc77
Author: lopex 
Date:   Tue Jan 30 11:08:37 2018 +0100

add a test
---
 test/org/joni/test/TestU.java | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/test/org/joni/test/TestU.java b/test/org/joni/test/TestU.java
index 4f4a2f2..f0ca360 100755
--- a/test/org/joni/test/TestU.java
+++ b/test/org/joni/test/TestU.java
@@ -793,5 +793,7 @@ public class TestU extends Test {
 
 // Case fold exceeding Analyser#THRESHOLD_CASE_FOLD_ALT_FOR_EXPANSION 
(= 8)
 x2s("\u\u0041\u\u0041\u\u0041\u\u0041\000\000", 
"\u\u0061\u\u0061\u\u0061\u\u0061\000\000", 0, 8, 
Option.IGNORECASE);
+
+x2s("\000[\000\134\000x\000{\\000}\000-\000X\000]\000\000", 
"\\000\000", 0, 2, Option.IGNORECASE);
 }
 }

-- 
Alioth's /usr/local/bin/git-commit-notice on 
/srv/git.debian.org/git/pkg-java/jruby-joni.git

___
pkg-java-commits mailing list
pkg-java-comm...@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-java-commits

[jruby-joni] 09/31: fix for Onigmo #43

2018-02-24 Thread Hideki Yamane

This is an automated email from the git hooks/post-receive script.

henrich pushed a commit to branch debian/sid
in repository jruby-joni.

commit a779d3564c797157ed9ef4bdccb66ee79034e39f
Author: Marcin Mielzynski 
Date:   Thu Feb 1 18:08:42 2018 +0100

fix for Onigmo #43
---
 src/org/joni/Analyser.java| 12 --
 src/org/joni/ArrayCompiler.java   | 46 ---
 src/org/joni/ByteCodeMachine.java |  2 +-
 test/org/joni/test/TestU8.java|  4 
 4 files changed, 44 insertions(+), 20 deletions(-)

diff --git a/src/org/joni/Analyser.java b/src/org/joni/Analyser.java
index 467fc46..ce83cc2 100644
--- a/src/org/joni/Analyser.java
+++ b/src/org/joni/Analyser.java
@@ -1789,6 +1789,8 @@ final class Analyser extends Parser {
 private static final int IN_NOT = (1<<1);
 private static final int IN_REPEAT  = (1<<2);
 private static final int IN_VAR_REPEAT  = (1<<3);
+private static final int IN_CALL= (1<<4);
+private static final int IN_RECCALL = (1<<5);
 private static final int EXPAND_STRING_MAX_LENGTH   = 100;
 
 /* setup_tree does the following work.
@@ -1931,11 +1933,17 @@ final class Analyser extends Parser {
 break;
 
 case EncloseType.MEMORY:
-if ((state & (IN_ALT | IN_NOT | IN_VAR_REPEAT)) != 0) {
+if ((state & (IN_ALT | IN_NOT | IN_VAR_REPEAT | IN_CALL)) != 
0) {
 env.btMemStart = bsOnAt(env.btMemStart, en.regNum);
 /* SET_ENCLOSE_STATUS(node, NST_MEM_IN_ALT_NOT); */
-
 }
+if (en.isCalled()) state |= IN_CALL;
+if (en.isRecursion()) {
+state |= IN_RECCALL;
+} else if ((state & IN_RECCALL) != 0){
+en.setRecursion();
+}
+
 setupTree(en.target, state);
 break;
 
diff --git a/src/org/joni/ArrayCompiler.java b/src/org/joni/ArrayCompiler.java
index ce1a326..736d68c 100644
--- a/src/org/joni/ArrayCompiler.java
+++ b/src/org/joni/ArrayCompiler.java
@@ -843,8 +843,15 @@ final class ArrayCompiler extends Compiler {
 } else {
 len += node.isRecursion() ? OPSize.MEMORY_END_REC : 
OPSize.MEMORY_END;
 }
-} else { // USE_SUBEXP_CALL
+} else if (Config.USE_SUBEXP_CALL && node.isRecursion()) { // 
USE_SUBEXP_CALL
 len = OPSize.MEMORY_START_PUSH; // or OPSize.MEMORY_START;
+len += tlen + (bsAt(regex.btMemEnd, node.regNum) ? 
OPSize.MEMORY_END_PUSH_REC : OPSize.MEMORY_END_REC);
+} else {
+if (bsAt(regex.btMemStart, node.regNum)) {
+len = OPSize.MEMORY_START_PUSH;
+} else {
+len= OPSize.MEMORY_START;
+}
 len += tlen + (bsAt(regex.btMemEnd, node.regNum) ? 
OPSize.MEMORY_END_PUSH : OPSize.MEMORY_END);
 }
 break;
@@ -889,22 +896,20 @@ final class ArrayCompiler extends Compiler {
 int len;
 switch (node.type) {
 case EncloseType.MEMORY:
-if (Config.USE_SUBEXP_CALL) {
-if (node.isCalled()) {
-regex.requireStack = true;
-addOpcode(OPCode.CALL);
-node.callAddr = codeLength + OPSize.ABSADDR + OPSize.JUMP;
-node.setAddrFixed();
-addAbsAddr(node.callAddr);
-len = compileLengthTree(node.target);
-len += OPSize.MEMORY_START_PUSH + OPSize.RETURN;
-if (bsAt(regex.btMemEnd, node.regNum)) {
-len += node.isRecursion() ? OPSize.MEMORY_END_PUSH_REC 
: OPSize.MEMORY_END_PUSH;
-} else {
-len += node.isRecursion() ? OPSize.MEMORY_END_REC : 
OPSize.MEMORY_END;
-}
-addOpcodeRelAddr(OPCode.JUMP, len);
+if (Config.USE_SUBEXP_CALL && node.isCalled()) {
+regex.requireStack = true;
+addOpcode(OPCode.CALL);
+node.callAddr = codeLength + OPSize.ABSADDR + OPSize.JUMP;
+node.setAddrFixed();
+addAbsAddr(node.callAddr);
+len = compileLengthTree(node.target);
+len += OPSize.MEMORY_START_PUSH + OPSize.RETURN;
+if (bsAt(regex.btMemEnd, node.regNum)) {
+len += node.isRecursion() ? OPSize.MEMORY_END_PUSH_REC : 
OPSize.MEMORY_END_PUSH;
+} else {
+len += node.isRecursion() ? OPSize.MEMORY_END_REC : 
OPSize.MEMORY_END;
 }
+addOpcodeRelAddr(OPCode.JUMP, len);
 } // USE_SUBEXP_CALL
 
 if (bsAt(regex.btMemStart, node.regNum)) {
@@ -925,7 +930,14

[jruby-joni] branch debian/sid updated (b7a5539 -> 639f582)

2018-02-24 Thread Hideki Yamane

This is an automated email from the git hooks/post-receive script.

henrich pushed a change to branch debian/sid
in repository jruby-joni.

  from  b7a5539   update junit version to 4.x
   new  a7d9b11   [maven-release-plugin] prepare for next development 
iteration
   new  f160ae9   backref opcode cleanup
   new  62b12a9   move var
   new  a548912   fix recursion
   new  40796a4   fix invalid backref
   new  1fe4664   add a test
   new  9166c34   test for singlebyte CCLASS_MIX
   new  a779d35   fix for Onigmo #43
   new  0bbfe42   look behind fixes
   new  d6c22ea   Merge branch 'master' of https://github.com/jruby/joni
   new  dc125d4   errors / syntax errors tests
   new  f1c37bd   fix errors
   new  7338087   add conditional expression tests
   new  9f9939f   remove dupped test
   new  59cc0e8   add implicit anchor optimization tests
   new  fe8e1fc   more tests
   new  85aea5b   more validation tests
   new  e9e7a3f   more validation tests
   new  0fbd4aa   add dont capture group option test
   new  b768b38   enable passing invalid group tests
   new  e542bd5   more validation tests
   new  a0150f2   rejigger tests to accomodate for 7 bit matching
   new  248caea   enable tests for 7 bit matching
   new  3e7a38b   dedup tests for singlebyte
   new  6b85646   refactor to make ascii word opcodes more consistent
   new  7c5f6fa   reenable exact/map optimizations for quantifiers with 
lower bounds of 1
   new  59a6b56   See #34 for more.  Some codepoint expansions duplicate 
characters and that is causing erroneous warnings.
   new  6a7ca3f   [maven-release-plugin] prepare release joni-2.1.15
   new  d5303a4   Merge tag 'joni-2.1.15' into debian/sid
   new  149296f   new upstream release
   new  639f582   upload to unstable

The 31 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails.  The revisions
listed as "adds" were already present in the repository and have only
been added to this reference.


Summary of changes:
 debian/changelog  |  6 ++
 pom.xml   |  2 +-
 src/org/joni/Analyser.java| 47 +++
 src/org/joni/ArrayCompiler.java   | 50 ++--
 src/org/joni/ByteCodeMachine.java | 29 +++--
 src/org/joni/Lexer.java   | 18 +++---
 src/org/joni/Matcher.java |  8 ++-
 src/org/joni/ScanEnvironment.java |  3 +-
 src/org/joni/ScannerSupport.java  |  8 ++-
 src/org/joni/constants/OPCode.java|  4 +-
 src/org/joni/exception/ErrorMessages.java |  1 +
 test/org/joni/test/Test.java  | 49 ++--
 test/org/joni/test/TestA.java |  4 ++
 test/org/joni/test/TestError.java | 97 +++
 test/org/joni/test/TestU.java |  2 +
 test/org/joni/test/TestU8.java| 25 +++-
 16 files changed, 278 insertions(+), 75 deletions(-)
 create mode 100755 test/org/joni/test/TestError.java

-- 
Alioth's /usr/local/bin/git-commit-notice on 
/srv/git.debian.org/git/pkg-java/jruby-joni.git

___
pkg-java-commits mailing list
pkg-java-comm...@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-java-commits

[jruby-joni] 12/31: fix errors

2018-02-24 Thread Hideki Yamane

This is an automated email from the git hooks/post-receive script.

henrich pushed a commit to branch debian/sid
in repository jruby-joni.

commit f1c37bdf26ac33e551473753ec0c584c79960cf7
Author: lopex 
Date:   Fri Feb 2 10:54:39 2018 +0100

fix errors
---
 test/org/joni/test/Test.java  |  2 ++
 test/org/joni/test/TestError.java | 10 +-
 2 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/test/org/joni/test/Test.java b/test/org/joni/test/Test.java
index 2412e12..fe90317 100644
--- a/test/org/joni/test/Test.java
+++ b/test/org/joni/test/Test.java
@@ -83,7 +83,9 @@ public abstract class Test {
 public void xerr(byte[] pattern, String msg, int option) throws Exception {
 try {
 new Regex(pattern, 0, length(pattern), option, encoding(), 
syntax(), WarnCallback.NONE);
+nfail++;
 } catch (JOniException je) {
+nsucc++;
 assertEquals(je.getMessage(), msg);
 }
 }
diff --git a/test/org/joni/test/TestError.java 
b/test/org/joni/test/TestError.java
index 4276174..e0f1347 100755
--- a/test/org/joni/test/TestError.java
+++ b/test/org/joni/test/TestError.java
@@ -26,27 +26,27 @@ import org.jcodings.Encoding;
 import org.jcodings.specific.ASCIIEncoding;
 
 public class TestError extends Test {
-   @Override
+@Override
 public int option() {
 return Option.DEFAULT;
 }
 
-   @Override
+@Override
 public Encoding encoding() {
 return ASCIIEncoding.INSTANCE;
 }
 
-   @Override
+@Override
 public String testEncoding() {
 return "iso-8859-2";
 }
 
-   @Override
+@Override
 public Syntax syntax() {
 return Syntax.TEST;
 }
 
-   @Override
+@Override
 public void test() throws Exception {
xerrs("(", 
ErrorMessages.ERR_END_PATTERN_WITH_UNMATCHED_PARENTHESIS);
xerrs("(0?0|(?(1)||)|(?(1)||))?", 
ErrorMessages.ERR_INVALID_CONDITION_PATTERN);

-- 
Alioth's /usr/local/bin/git-commit-notice on 
/srv/git.debian.org/git/pkg-java/jruby-joni.git

___
pkg-java-commits mailing list
pkg-java-comm...@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-java-commits

45 matches

Mail list logo