Minor changes

jurisk · Dec 9, 2023 · cbcb948 · cbcb948
1 parent 0a7dfa9
commit cbcb948
Show file tree

Hide file tree

Showing 7 changed files with 26 additions and 18 deletions.
diff --git a/scala2/src/main/scala/jurisk/adventofcode/Advent00.scala b/scala2/src/main/scala/jurisk/adventofcode/Advent00.scala
@@ -20,7 +20,7 @@ object Advent00 {
     def parse(s: String): Command =
       s match {
         case "noop"            => Noop
-        case s"something $rem" => Something(rem.extractInts)
+        case s"something $rem" => Something(rem.extractIntList)
         case s if s.nonEmpty   => Other(s)
         case _                 => s.failedToParse
       }

diff --git a/scala2/src/main/scala/jurisk/adventofcode/y2018/Advent10.scala b/scala2/src/main/scala/jurisk/adventofcode/y2018/Advent10.scala
@@ -21,7 +21,7 @@ object Advent10 {
 
   object PointWithVelocity {
     def parse(s: String): PointWithVelocity = {
-      val List(a, b, c, d) = s.extractInts
+      val List(a, b, c, d) = s.extractIntList
       PointWithVelocity(Coords2D.of(a, b), Coords2D.of(c, d))
     }
   }

diff --git a/scala2/src/main/scala/jurisk/adventofcode/y2022/Advent11.scala b/scala2/src/main/scala/jurisk/adventofcode/y2022/Advent11.scala
@@ -34,7 +34,7 @@ object Advent11 {
     val Array(m, si, o, t, iT, iF) = s.split("\n")
 
     val logic = MonkeyLogic(
-      index = m.extractInts.singleElementUnsafe,
+      index = m.extractIntList.singleElementUnsafe,
       operation = o match {
         case "  Operation: new = old * old" =>
           old => old * old
@@ -47,12 +47,12 @@ object Advent11 {
 
         case _ => sys.error(s"Did not recognize $o")
       },
-      testIsDivisibleBy = t.extractInts.singleElementUnsafe,
-      ifTrueThrowTo = iT.extractInts.singleElementUnsafe,
-      ifFalseThrowTo = iF.extractInts.singleElementUnsafe,
+      testIsDivisibleBy = t.extractIntList.singleElementUnsafe,
+      ifTrueThrowTo = iT.extractIntList.singleElementUnsafe,
+      ifFalseThrowTo = iF.extractIntList.singleElementUnsafe,
     )
 
-    val itemStates = si.extractInts.map(_.toLong) map { x =>
+    val itemStates = si.extractIntList.map(_.toLong) map { x =>
       ItemState(
         logic.index,
         x,

diff --git a/scala2/src/main/scala/jurisk/adventofcode/y2023/Advent04.scala b/scala2/src/main/scala/jurisk/adventofcode/y2023/Advent04.scala
@@ -22,8 +22,8 @@ object Advent04 {
         case s"Card$id: $winning | $youHave" =>
           Card(
             id.trim.toInt,
-            winning.extractInts.toSet,
-            youHave.extractInts.toSet,
+            winning.extractIntList.toSet,
+            youHave.extractIntList.toSet,
           )
         case _                               => s.failedToParse
       }

diff --git a/scala2/src/main/scala/jurisk/adventofcode/y2023/Advent05.scala b/scala2/src/main/scala/jurisk/adventofcode/y2023/Advent05.scala
@@ -135,15 +135,15 @@ object Advent05 extends IOApp.Simple {
 
   private object Converter {
     def parse(input: String): Converter = {
-      val List(a, b, c) = input.extractLongs
+      val List(a, b, c) = input.extractLongList
       Converter(a, b, c)
     }
   }
 
   def parse(input: String): Input = {
     val sections = input.split("\n\n").toList
     sections match {
-      case h :: t => Input(h.extractLongs, t map ConversionMap.parse)
+      case h :: t => Input(h.extractLongList, t map ConversionMap.parse)
       case _      => input.failedToParse
     }
   }

diff --git a/scala2/src/main/scala/jurisk/adventofcode/y2023/Advent09.scala b/scala2/src/main/scala/jurisk/adventofcode/y2023/Advent09.scala
@@ -15,7 +15,7 @@ object Advent09 {
   def part1(input: Input): N = input.map(extrapolatedValue).sum
   def part2(input: Input): N = part1(input.map(_.reverse))
 
-  def parse(input: String): Input = input.parseLines(_.extractLongs)
+  def parse(input: String): Input = input.parseLines(_.extractLongList)
 
   def parseFile(fileName: String): Input =
     parse(readFileText(fileName))

diff --git a/scala2/src/main/scala/jurisk/utils/Parsing.scala b/scala2/src/main/scala/jurisk/utils/Parsing.scala
@@ -5,6 +5,8 @@ import jurisk.geometry.Coords2D
 import jurisk.utils.CollectionOps.IterableOps
 
 import scala.annotation.tailrec
+import scala.collection.immutable.ArraySeq
+import scala.util.matching.Regex
 
 object Parsing {
 
@@ -79,15 +81,21 @@ object Parsing {
       parser: String => T
     ): List[T] = parseList("\n", parser)
 
-    def extractInts: List[Int] = {
+    private def extractDigitStrings: Regex.MatchIterator = {
       val RegEx = """([-+]?\d+)""".r
-      RegEx.findAllIn(s).map(_.toInt).toList
+      RegEx.findAllIn(s)
     }
 
-    def extractLongs: List[Long] = {
-      val RegEx = """([-+]?\d+)""".r
-      RegEx.findAllIn(s).map(_.toLong).toList
-    }
+    def extractInts: Iterator[Int]   = extractDigitStrings.map(_.toInt)
+    def extractLongs: Iterator[Long] = extractDigitStrings.map(_.toLong)
+
+    def extractIntList: List[Int]   = extractInts.toList
+    def extractLongList: List[Long] = extractLongs.toList
+
+    def extractIntVector: Vector[Int]   = extractInts.toVector
+    def extractLongVector: Vector[Long] = extractLongs.toVector
 
+    def extractIntArraySeq: ArraySeq[Int]   = ArraySeq.from(extractInts)
+    def extractLongArraySeq: ArraySeq[Long] = ArraySeq.from(extractLongs)
   }
 }