[jruby-joni] 109/194: move singlebyte ops to the end

[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 69b64f2adcdc1e1d71e9c878ec2022e47704145d
Author: Marcin Mielzynski <lopx at gazeta.pl>
Date:   Sun Jan 7 17:03:46 2018 +0100

    move singlebyte ops to the end
---
 src/org/joni/ByteCodeMachine.java  | 5 ++++-
 src/org/joni/constants/OPCode.java | 9 ++++++---
 2 files changed, 10 insertions(+), 4 deletions(-)

diff --git a/src/org/joni/ByteCodeMachine.java b/src/org/joni/ByteCodeMachine.java
index d4a41c0..63e6f6b 100644
--- a/src/org/joni/ByteCodeMachine.java
+++ b/src/org/joni/ByteCodeMachine.java
@@ -225,7 +225,7 @@ class ByteCodeMachine extends StackMachine {
                 case OPCode.CCLASS_NOT:                 opCClassNot();             break;
                 case OPCode.CCLASS_MB_NOT:              opCClassMBNot();           break;
                 case OPCode.CCLASS_MIX_NOT:             opCClassMIXNot();          break;
-                case OPCode.LOOK_BEHIND_SB:             opLookBehindSb();          continue;
+
                 case OPCode.ANYCHAR:                    opAnyChar();               break;
                 case OPCode.ANYCHAR_ML:                 opAnyCharML();             break;
                 case OPCode.ANYCHAR_STAR:               opAnyCharStar();           break;
@@ -333,6 +333,9 @@ class ByteCodeMachine extends StackMachine {
 
                 case OPCode.EXACT1_IC_SB:                   opExact1ICSb();              break;
                 case OPCode.EXACTN_IC_SB:                   opExactNICSb();              continue;
+
+                case OPCode.LOOK_BEHIND_SB:                 opLookBehindSb();            continue;
+
                 case OPCode.CONDITION:                      opCondition();               continue;
 
                 case OPCode.FINISH:                         return finish();
diff --git a/src/org/joni/constants/OPCode.java b/src/org/joni/constants/OPCode.java
index 50b653a..b447b48 100644
--- a/src/org/joni/constants/OPCode.java
+++ b/src/org/joni/constants/OPCode.java
@@ -47,7 +47,7 @@ public interface OPCode {
     final int CCLASS_NOT                    = 19;
     final int CCLASS_MB_NOT                 = 20;
     final int CCLASS_MIX_NOT                = 21;
-    final int LOOK_BEHIND_SB                = 22;
+
     final int ANYCHAR                       = 23;           /* "."  */
     final int ANYCHAR_ML                    = 24;           /* "."  multi-line */
     final int ANYCHAR_STAR                  = 25;           /* ".*" */
@@ -157,6 +157,8 @@ public interface OPCode {
     final int EXACT1_IC_SB                  = 112;           /* single byte, N = 1, ignore case */
     final int EXACTN_IC_SB                  = 113;           /* single byte,        ignore case */
 
+    final int LOOK_BEHIND_SB                = 22;
+
     public final String OpCodeNames[] = Config.DEBUG_COMPILE ? new String[] {
         "finish", /*OP_FINISH*/
         "end", /*OP_END*/
@@ -180,7 +182,6 @@ public interface OPCode {
         "cclass-not", /*OP_CCLASS_NOT*/
         "cclass-mb-not", /*OP_CCLASS_MB_NOT*/
         "cclass-mix-not", /*OP_CCLASS_MIX_NOT*/
-        "look-behind-sb", /*OP_LOOK_BEHIND*/
         "anychar", /*OP_ANYCHAR*/
         "anychar-ml", /*OP_ANYCHAR_ML*/
         "anychar*", /*OP_ANYCHAR_STAR*/
@@ -278,6 +279,7 @@ public interface OPCode {
         "exact1-ic-sb", /*OP_EXACT1_IC*/
         "exactn-ic-sb", /*OP_EXACTN_IC*/
 
+        "look-behind-sb", /*OP_LOOK_BEHIND*/
     } : null;
 
     public final int OpCodeArgTypes[] = Config.DEBUG_COMPILE ? new int[] {
@@ -303,7 +305,6 @@ public interface OPCode {
         Arguments.SPECIAL, /*OP_CCLASS_NOT*/
         Arguments.SPECIAL, /*OP_CCLASS_MB_NOT*/
         Arguments.SPECIAL, /*OP_CCLASS_MIX_NOT*/
-        Arguments.SPECIAL, /*OP_LOOK_BEHIND*/
         Arguments.NON, /*OP_ANYCHAR*/
         Arguments.NON, /*OP_ANYCHAR_ML*/
         Arguments.NON, /*OP_ANYCHAR_STAR*/
@@ -400,5 +401,7 @@ public interface OPCode {
 
         Arguments.SPECIAL, /*OP_EXACT1_IC*/
         Arguments.SPECIAL, /*OP_EXACTN_IC*/
+
+        Arguments.SPECIAL, /*OP_LOOK_BEHIND*/
     } : null;
 }

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