ability to pass null region

jruby · Jul 25, 2018 · af9a0dd · af9a0dd
1 parent 7ba2e02
commit af9a0dd
Show file tree

Hide file tree

Showing 6 changed files with 16 additions and 13 deletions.
diff --git a/src/org/joni/ByteCodeMachine.java b/src/org/joni/ByteCodeMachine.java
@@ -52,8 +52,8 @@ class ByteCodeMachine extends StackMachine {
     private final int[]code;        // byte code
     private int ip;                 // instruction pointer
 
-    ByteCodeMachine(Regex regex, byte[]bytes, int p, int end) {
-        super(regex, bytes, p, end);
+    ByteCodeMachine(Regex regex, Region region, byte[]bytes, int p, int end) {
+        super(regex, region, bytes, p, end);
         this.code = regex.code;
     }
 

diff --git a/src/org/joni/Matcher.java b/src/org/joni/Matcher.java
@@ -48,14 +48,13 @@ public abstract class Matcher extends IntHolder {
     protected int msaBegin;
     protected int msaEnd;
 
-    Matcher(Regex regex, byte[]bytes, int p, int end) {
+    Matcher(Regex regex, Region region, byte[]bytes, int p, int end) {
         this.regex = regex;
         this.enc = regex.enc;
         this.bytes = bytes;
         this.str = p;
         this.end = end;
-
-        this.msaRegion = regex.numMem == 0 ? null : new Region(regex.numMem + 1);
+        this.msaRegion = region;
     }
 
     // main matching method

diff --git a/src/org/joni/MatcherFactory.java b/src/org/joni/MatcherFactory.java
@@ -20,12 +20,12 @@
 package org.joni;
 
 abstract class MatcherFactory {
-    abstract Matcher create(Regex regex, byte[]bytes, int p, int end);
+    abstract Matcher create(Regex regex, Region region, byte[]bytes, int p, int end);
 
     static final MatcherFactory DEFAULT = new MatcherFactory() {
         @Override
-        Matcher create(Regex regex, byte[] bytes, int p, int end) {
-            return new ByteCodeMachine(regex, bytes, p, end);
+        Matcher create(Regex regex, Region region, byte[]bytes, int p, int end) {
+            return new ByteCodeMachine(regex, region, bytes, p, end);
         }
     };
 }
diff --git a/src/org/joni/NativeMachine.java b/src/org/joni/NativeMachine.java
@@ -21,7 +21,7 @@
 
 abstract class NativeMachine extends Matcher {
 
-    protected NativeMachine(Regex regex, byte[]bytes, int p, int end) {
-        super(regex, bytes, p, end);
+    protected NativeMachine(Regex regex, Region region, byte[]bytes, int p, int end) {
+        super(regex, region, bytes, p, end);
     }
 }
diff --git a/src/org/joni/Regex.java b/src/org/joni/Regex.java
@@ -157,7 +157,11 @@ public Matcher matcher(byte[]bytes) {
     }
 
     public Matcher matcher(byte[]bytes, int p, int end) {
-        return factory.create(this, bytes, p, end);
+        return factory.create(this, numMem == 0 ? null : new Region(numMem + 1), bytes, p, end);
+    }
+
+    public Matcher matcherNoRegion(byte[]bytes, int p, int end) {
+        return factory.create(this, null, bytes, p, end);
     }
 
     public int numberOfCaptures() {

diff --git a/src/org/joni/StackMachine.java b/src/org/joni/StackMachine.java
@@ -38,8 +38,8 @@ abstract class StackMachine extends Matcher implements StackType {
     protected byte[] stateCheckBuff; // CEC, move to int[] ?
     protected int stateCheckBuffSize;
 
-    protected StackMachine(Regex regex, byte[]bytes, int p , int end) {
-        super(regex, bytes, p, end);
+    protected StackMachine(Regex regex, Region region, byte[]bytes, int p , int end) {
+        super(regex, region, bytes, p, end);
         stack = regex.requireStack ? fetchStack() : null;
         final int n;
         if (Config.USE_SUBEXP_CALL) {