Regex: Only use subSequence in the region() method.

sjrd · sjrd · commit 0896ff4ef0dc · 2021-07-09T10:48:04.000+02:00
Previously, the constructor of `Matcher` accepted region params,
but the only call site always used the full string. This commit
confines the use of `subSequence` to the `region()` method.
diff --git a/javalib/src/main/scala/java/util/regex/Matcher.scala b/javalib/src/main/scala/java/util/regex/Matcher.scala
@@ -19,16 +19,17 @@ import scala.annotation.switch
 import scala.scalajs.js
 
 final class Matcher private[regex] (
-    private var pattern0: Pattern, private var input0: CharSequence,
-    private var regionStart0: Int, private var regionEnd0: Int)
+    private var pattern0: Pattern, private var input0: CharSequence)
     extends AnyRef with MatchResult {
 
   import Matcher._
 
   def pattern(): Pattern = pattern0
 
-  // Configuration (updated manually)
-  private var inputstr = input0.subSequence(regionStart0, regionEnd0).toString
+  // Region configuration (updated by reset() and region())
+  private var regionStart0 = 0
+  private var regionEnd0 = input0.length()
+  private var inputstr = input0.toString()
 
   // Match result (updated by successful matches)
   private var position: Int = 0 // within `inputstr`, not `input0`
@@ -151,8 +152,12 @@ final class Matcher private[regex] (
     this
   }
 
-  def reset(): Matcher =
-    region(0, input0.length())
+  def reset(): Matcher = {
+    regionStart0 = 0
+    regionEnd0 = input0.length()
+    inputstr = input0.toString()
+    resetMatch()
+  }
 
   def reset(input: CharSequence): Matcher = {
     input0 = input
@@ -229,7 +234,7 @@ final class Matcher private[regex] (
   // Similar difficulties as with hitEnd()
   //def requireEnd(): Boolean
 
-  // Stub methods for region management
+  // Region management
 
   def regionStart(): Int = regionStart0
   def regionEnd(): Int = regionEnd0
diff --git a/javalib/src/main/scala/java/util/regex/Pattern.scala b/javalib/src/main/scala/java/util/regex/Pattern.scala
@@ -140,7 +140,7 @@ final class Pattern private[regex] (
   override def toString(): String = pattern()
 
   def matcher(input: CharSequence): Matcher =
-    new Matcher(this, input, 0, input.length)
+    new Matcher(this, input)
 
   def split(input: CharSequence): Array[String] =
     split(input, 0)
diff --git a/linker/shared/src/test/scala/org/scalajs/linker/LibrarySizeTest.scala b/linker/shared/src/test/scala/org/scalajs/linker/LibrarySizeTest.scala
@@ -70,9 +70,9 @@ class LibrarySizeTest {
     )
 
     testLinkedSizes(
-      expectedFastLinkSize = 187486,
-      expectedFullLinkSizeWithoutClosure = 174649,
-      expectedFullLinkSizeWithClosure = 31827,
+      expectedFastLinkSize = 186816,
+      expectedFullLinkSizeWithoutClosure = 173972,
+      expectedFullLinkSizeWithClosure = 31629,
       classDefs,
       moduleInitializers = MainTestModuleInitializers
     )

Original file line number	Diff line number	Diff line change
`@@ -70,9 +70,9 @@ class LibrarySizeTest {`
`70`	`70`	`)`
`71`	`71`
`72`	`72`	`testLinkedSizes(`
`73`		`- expectedFastLinkSize = 187486,`
`74`		`- expectedFullLinkSizeWithoutClosure = 174649,`
`75`		`- expectedFullLinkSizeWithClosure = 31827,`
	`73`	`+ expectedFastLinkSize = 186816,`
	`74`	`+ expectedFullLinkSizeWithoutClosure = 173972,`
	`75`	`+ expectedFullLinkSizeWithClosure = 31629,`
`76`	`76`	`classDefs,`
`77`	`77`	`moduleInitializers = MainTestModuleInitializers`
`78`	`78`	`)`