[jruby-joni] 35/194: debug info cleanup

[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 dae7d018f2159f7682062702f9cc7f697a21becb
Author: Marcin Mielzynski <lopx at gazeta.pl>
Date:   Wed Dec 27 12:06:10 2017 +0100

    debug info cleanup
---
 src/org/joni/ByteCodeMachine.java | 21 +++++++++++----------
 src/org/joni/ByteCodePrinter.java | 11 ++---------
 2 files changed, 13 insertions(+), 19 deletions(-)

diff --git a/src/org/joni/ByteCodeMachine.java b/src/org/joni/ByteCodeMachine.java
index 5ac56b9..1d0ced3 100644
--- a/src/org/joni/ByteCodeMachine.java
+++ b/src/org/joni/ByteCodeMachine.java
@@ -39,7 +39,7 @@ import org.joni.exception.InternalException;
 class ByteCodeMachine extends StackMachine {
     private static final int INTERRUPT_CHECK_EVERY = 30000;
     int interruptCheckCounter = 0; // we modulos this to occasionally check for interrupts
-    
+
     private int bestLen;          // return value
     private int s = 0;            // current char
 
@@ -147,26 +147,27 @@ class ByteCodeMachine extends StackMachine {
     }
 
     private void debugMatchBegin() {
-        Config.log.println("match_at: " +
-                "str: " + str +
-                ", end: " + end +
-                ", start: " + this.sstart +
-                ", sprev: " + this.sprev);
-        Config.log.println("size: " + (end - str) + ", start offset: " + (this.sstart - str));
+        Config.log.println("match_at: " + "str: " + str + ", end: " + end + ", start: " + sstart + ", sprev: " + sprev);
+        Config.log.println("size: " + (end - str) + ", start offset: " + (sstart - str));
     }
 
     private void debugMatchLoop() {
         if (Config.DEBUG_MATCH) {
             Config.log.printf("%4d", (s - str)).print("> \"");
             int q, i;
-            for (i=0, q=s; i<7 && q<end && s>=0; i++) {
+            for (i = 0, q = s; i < 7 && q < end && s >= 0; i++) {
                 int len = enc.length(bytes, q, end);
-                while (len-- > 0) if (q < end) Config.log.print(new String(new byte[]{bytes[q++]}));
+                while (len-- > 0) {
+                    if (q < end) {
+                        Config.log.print(new String(bytes, q++, 1));
+                    }
+                }
             }
             String str = q < end ? "...\"" : "\"";
             q += str.length();
             Config.log.print(str);
-            for (i=0; i<20-(q-s);i++) Config.log.print(" ");
+            for (i = 0; i < 20 - (q - s); i++)
+                Config.log.print(" ");
             StringBuilder sb = new StringBuilder();
             new ByteCodePrinter(regex).compiledByteCodeToString(sb, ip);
             Config.log.println(sb.toString());
diff --git a/src/org/joni/ByteCodePrinter.java b/src/org/joni/ByteCodePrinter.java
index 3ffe9c0..e44dae6 100644
--- a/src/org/joni/ByteCodePrinter.java
+++ b/src/org/joni/ByteCodePrinter.java
@@ -56,11 +56,6 @@ class ByteCodePrinter {
         while (len-- > 0) sb.append(new String(new byte[]{(byte)code[s++]}));
     }
 
-    private void pStringFromTemplate(StringBuilder sb, int len, byte[]tm, int idx) {
-        sb.append(":T:");
-        while (len-- > 0) sb.append(new String(new byte[]{tm[idx++]}));
-    }
-
     private void pLenString(StringBuilder sb, int len, int mbLen, int s) {
         int x = len * mbLen;
         sb.append(":" + len + ":");
@@ -70,7 +65,7 @@ class ByteCodePrinter {
     private void pLenStringFromTemplate(StringBuilder sb, int len, int mbLen, byte[]tm, int idx) {
         int x = len * mbLen;
         sb.append(":T:" + len + ":");
-        while (x-- > 0) sb.append(new String(new byte[]{(byte)tm[idx++]}));
+        while (x-- > 0) sb.append(new String(tm, idx++, 1));
     }
 
     public int compiledByteCodeToString(StringBuilder sb, int bp) {
@@ -221,11 +216,9 @@ class ByteCodePrinter {
                     idx = code[bp];
                     bp += OPSize.INDEX;
                     sb.append(":T:" + mbLen + ":" + len + ":");
-
-                    while (n-- > 0) sb.append(new String(new byte[]{templates[tm][idx++]}));
+                    while (n-- > 0) sb.append(new String(templates[tm], idx++, 1));
                 } else {
                     sb.append(":" + mbLen + ":" + len + ":");
-
                     while (n-- > 0) sb.append(new String(new byte[]{(byte)code[bp++]}));
                 }
 

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