refactor: prelude.parser.number

2015/day16.scala

@@ -1,16 +1,14 @@
 package y2015.day16
 
 import prelude.*
+import prelude.parser.*
 
 import cats.parse.Parser
 import cats.parse.Parser.*
 import cats.parse.Rfc5234.{digit, alpha}
 
 type Clue = Map[String, Int]
 
-val number: Parser[Int] =
-  digit.rep.string.map(_.toInt)
-
 val ident: Parser[String] =
   alpha.rep.string
 

2015/day6.scala

@@ -1,6 +1,8 @@
 package y2015.day6
 
 import prelude.*
+import prelude.parser.*
+
 import utils.*
 import java.awt.image.BufferedImage
 
@@ -51,9 +53,6 @@ class Grid[T](
 import cats.parse.Parser.*
 import cats.parse.Rfc5234.{digit, sp}
 
-val number: Parser[Int] =
-  digit.rep.string.map(_.toInt)
-
 val coord: Parser[Point] =
   (number <* char(',')) ~ number map Point.apply
 

2015/day7.scala

@@ -2,6 +2,7 @@ package y2015.day7
 
 import scala.collection.mutable.HashMap
 import prelude.*
+import prelude.parser.*
 import utils.uint.*
 import utils.*
 
@@ -24,8 +25,8 @@ object Parser {
 
   def keyword(s: String): Parser[Unit] = string(s).surroundedBy(sp.rep0)
 
-  val number: Parser[UInt16] = digit.rep.string.map(x => UInt16(x.toInt))
-  val signal: Parser[Expr] = number.map(Expr.Emit.apply)
+  val u16: Parser[UInt16] = number.map(UInt16.apply)
+  val signal: Parser[Expr] = u16.map(Expr.Emit.apply)
   val literal: Parser[String] = charIn('a' to 'z').rep.string
   val wire: Parser[Expr] = literal.map(Expr.Var.apply)
   val value: Parser[Expr] = signal | wire
@@ -35,9 +36,9 @@ object Parser {
   val and = ((value <* keyword("AND")) ~ value).map(Expr.And.apply) ~ to
   val or = ((value <* keyword("OR")) ~ value).map(Expr.Or.apply) ~ to
   val lshift =
-    ((value <* keyword("LSHIFT")) ~ number).map(Expr.LShift.apply) ~ to
+    ((value <* keyword("LSHIFT")) ~ u16).map(Expr.LShift.apply) ~ to
   val rshift =
-    ((value <* keyword("RSHIFT")) ~ number).map(Expr.RShift.apply) ~ to
+    ((value <* keyword("RSHIFT")) ~ u16).map(Expr.RShift.apply) ~ to
   val not = (keyword("NOT") *> value).map(Expr.Not.apply) ~ to
   val ops =
     oneOf(List(connection, and, or, lshift, rshift, not).map(_.backtrack))

2015/day7.test.scala

@@ -6,7 +6,7 @@ class Day7Tests extends FunSuite:
   import Parser.*
 
   test("atoms"):
-    assertEquals(number.parse("123"), Right("", UInt16(123)))
+    assertEquals(u16.parse("123"), Right("", UInt16(123)))
     assertEquals(signal.parse("123"), Right("", Expr.Emit(UInt16(123))))
     assertEquals(wire.parse("abc"), Right("", Expr.Var("abc")))
 

2015/day9.scala

@@ -1,12 +1,12 @@
 package y2015.day9
 
 import prelude.*
+import prelude.parser.*
 
 import cats.parse.Parser
 import cats.parse.Parser.*
 import cats.parse.Rfc5234.alpha
 
-import y2015.day6.number
 import y2015.day7.Parser.keyword
 
 val city: Parser[String] = alpha.rep.string

prelude/parser.scala

@@ -0,0 +1,7 @@
+package prelude.parser
+
+import cats.parse.Parser
+import cats.parse.Rfc5234.{digit, alpha}
+
+val number: Parser[Int] =
+  digit.rep.string.map(_.toInt)