[jruby-joni] 165/194: rejigger ExactMB2N and ExactMB3N

[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 94b66245a7bf1c6d5458347fc74e59e01ad562ee
Author: Marcin Mielzynski <lopx at gazeta.pl>
Date:   Sun Jan 14 22:26:35 2018 +0100

    rejigger ExactMB2N and ExactMB3N
---
 src/org/joni/ByteCodeMachine.java | 20 ++++----------------
 1 file changed, 4 insertions(+), 16 deletions(-)

diff --git a/src/org/joni/ByteCodeMachine.java b/src/org/joni/ByteCodeMachine.java
index 37c28c6..b365d18 100644
--- a/src/org/joni/ByteCodeMachine.java
+++ b/src/org/joni/ByteCodeMachine.java
@@ -631,16 +631,12 @@ class ByteCodeMachine extends StackMachine {
             int ps = code[ip++];
 
             while(tlen-- > 0) {
-                if (bs[ps] != bytes[s]) {opFail(); return;}
-                ps++; s++;
-                if (bs[ps] != bytes[s]) {opFail(); return;}
+                if (bs[ps] != bytes[s] || bs[++ps] != bytes[++s]) {opFail(); return;}
                 ps++; s++;
             }
         } else {
             while(tlen-- > 0) {
-                if (code[ip] != bytes[s]) {opFail(); return;}
-                ip++; s++;
-                if (code[ip] != bytes[s]) {opFail(); return;}
+                if (code[ip] != bytes[s] || code[++ip] != bytes[++s]) {opFail(); return;}
                 ip++; s++;
             }
         }
@@ -656,20 +652,12 @@ class ByteCodeMachine extends StackMachine {
             int ps = code[ip++];
 
             while (tlen-- > 0) {
-                if (bs[ps] != bytes[s]) {opFail(); return;}
-                ps++; s++;
-                if (bs[ps] != bytes[s]) {opFail(); return;}
-                ps++; s++;
-                if (bs[ps] != bytes[s]) {opFail(); return;}
+                if (bs[ps] != bytes[s] || bs[++ps] != bytes[++s] || bs[++ps] != bytes[++s]) {opFail(); return;}
                 ps++; s++;
             }
         } else {
             while (tlen-- > 0) {
-                if (code[ip] != bytes[s]) {opFail(); return;}
-                ip++; s++;
-                if (code[ip] != bytes[s]) {opFail(); return;}
-                ip++; s++;
-                if (code[ip] != bytes[s]) {opFail(); return;}
+                if (code[ip] != bytes[s] || code[++ip] != bytes[++s] || code[++ip] != bytes[++s]) {opFail(); return;}
                 ip++; s++;
             }
         }

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