[jruby-joni] 36/194: more 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 23582673a3bd44b2e8dddf302c8380aafa685986
Author: Marcin Mielzynski <lopx at gazeta.pl>
Date:   Wed Dec 27 12:52:58 2017 +0100

    more cleanup
---
 src/org/joni/ByteCodeMachine.java | 32 +++++++++++++++-----------------
 src/org/joni/ByteCodePrinter.java | 13 +++----------
 2 files changed, 18 insertions(+), 27 deletions(-)

diff --git a/src/org/joni/ByteCodeMachine.java b/src/org/joni/ByteCodeMachine.java
index 1d0ced3..e42e9e7 100644
--- a/src/org/joni/ByteCodeMachine.java
+++ b/src/org/joni/ByteCodeMachine.java
@@ -152,26 +152,24 @@ class ByteCodeMachine extends StackMachine {
     }
 
     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++) {
-                int len = enc.length(bytes, q, end);
-                while (len-- > 0) {
-                    if (q < end) {
-                        Config.log.print(new String(bytes, q++, 1));
-                    }
+        Config.log.printf("%4d", (s - str)).print("> \"");
+        int q, 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(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(" ");
-            StringBuilder sb = new StringBuilder();
-            new ByteCodePrinter(regex).compiledByteCodeToString(sb, ip);
-            Config.log.println(sb.toString());
         }
+        String str = q < end ? "...\"" : "\"";
+        q += str.length();
+        Config.log.print(str);
+        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());
     }
 
     protected final int matchAt(int range, int sstart, int sprev) throws InterruptedException {
diff --git a/src/org/joni/ByteCodePrinter.java b/src/org/joni/ByteCodePrinter.java
index e44dae6..8bb1e6c 100644
--- a/src/org/joni/ByteCodePrinter.java
+++ b/src/org/joni/ByteCodePrinter.java
@@ -393,26 +393,19 @@ class ByteCodePrinter {
         }
 
         sb.append("]");
-
-        // @opcode_address(opcode_size)
         if (Config.DEBUG_COMPILE_BYTE_CODE_INFO) sb.append("@" + ip + "(" + (bp - ip) + ")");
-
         return bp;
     }
 
     private String compiledByteCodeListToString() {
-        StringBuilder sb = new StringBuilder();
-        sb.append("code length: " + codeLength + "\n");
-
-        int ncode = 0;
+        StringBuilder sb = new StringBuilder("code length: " + codeLength + "\n");
+        int ncode = -1;
         int bp = 0;
         int end = codeLength;
 
         while (bp < end) {
             ncode++;
-
-            if (bp > 0) sb.append(ncode % 5 == 0 ? "\n" : " ");
-
+            sb.append(ncode % 5 == 0 ? "\n" : " ");
             bp = compiledByteCodeToString(sb, bp);
         }
         sb.append("\n");

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