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 0cb26b9b2b573ab516eb8120fd87dff474a80ce1 Author: Marcin Mielzynski <l...@gazeta.pl> Date: Wed Feb 28 18:38:58 2018 +0100 move debug info --- src/org/joni/Analyser.java | 31 ++++++++++++++++++++++++++++++- src/org/joni/Regex.java | 28 ---------------------------- 2 files changed, 30 insertions(+), 29 deletions(-) diff --git a/src/org/joni/Analyser.java b/src/org/joni/Analyser.java index 400b779..dc64921 100644 --- a/src/org/joni/Analyser.java +++ b/src/org/joni/Analyser.java @@ -32,6 +32,8 @@ import static org.joni.ast.ListNode.newAlt; import static org.joni.ast.ListNode.newList; import static org.joni.ast.QuantifierNode.isRepeatInfinite; +import java.util.IllegalFormatConversionException; + import org.jcodings.CaseFoldCodeItem; import org.jcodings.ObjPtr; import org.jcodings.Ptr; @@ -59,7 +61,7 @@ final class Analyser extends Parser { } protected final void compile() { - if (Config.DEBUG) Config.log.println(regex.encStringToString(bytes, getBegin(), getEnd())); + if (Config.DEBUG) Config.log.println(encStringToString(bytes, getBegin(), getEnd())); reset(); regex.numMem = 0; @@ -170,6 +172,33 @@ final class Analyser extends Parser { regex.options &= ~syntax.options; } + private String encStringToString(byte[]bytes, int p, int end) { + StringBuilder sb = new StringBuilder("\nPATTERN: /"); + + if (enc.minLength() > 1) { + int p_ = p; + while (p_ < end) { + int code = enc.mbcToCode(bytes, p_, end); + if (code >= 0x80) { + try { + sb.append(String.format(" 0x%04x ", code)); + } catch (IllegalFormatConversionException ifce) { + sb.append(code); + } + } else { + sb.append((char)code); + } + p_ += enc.length(bytes, p_, end); + } + } else { + while (p < end) { + sb.append(new String(bytes, p, 1)); + p++; + } + } + return sb.append("/").toString(); + } + private void noNameDisableMapFor_listAlt(Node node, int[]map, Ptr counter) { ListNode can = (ListNode)node; do { diff --git a/src/org/joni/Regex.java b/src/org/joni/Regex.java index 1aff46a..c32dff8 100644 --- a/src/org/joni/Regex.java +++ b/src/org/joni/Regex.java @@ -23,7 +23,6 @@ import static org.joni.BitStatus.bsAt; import static org.joni.Option.isCaptureGroup; import static org.joni.Option.isDontCaptureGroup; -import java.util.IllegalFormatConversionException; import java.util.Iterator; import org.jcodings.Encoding; @@ -352,33 +351,6 @@ public final class Regex { exactP = exactEnd = 0; } - public String encStringToString(byte[]bytes, int p, int end) { - StringBuilder sb = new StringBuilder("\nPATTERN: /"); - - if (enc.minLength() > 1) { - int p_ = p; - while (p_ < end) { - int code = enc.mbcToCode(bytes, p_, end); - if (code >= 0x80) { - try { - sb.append(String.format(" 0x%04x ", code)); - } catch (IllegalFormatConversionException ifce) { - sb.append(code); - } - } else { - sb.append((char)code); - } - p_ += enc.length(bytes, p_, end); - } - } else { - while (p < end) { - sb.append(new String(bytes, p, 1)); - p++; - } - } - return sb.append("/").toString(); - } - public String optimizeInfoToString() { String s = ""; s += "optimize: " + searchAlgorithm.getName() + "\n"; -- 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