Updated macros due to changes in scala/scala3#8601

Author: mpilquist

core/shared/src/main/scala-3/scodec/bits/BitVectorPlatform.scala

@@ -15,7 +15,7 @@ private[bits] object BitVectorFromDigits {
       digitsToBitVector(digits, radix)
   }
 
-  private def digitsToBitVector(digits: String, radix: Int): BitVector =
+  def digitsToBitVector(digits: String, radix: Int): BitVector =
     if (radix == 16) ByteVector.fromValidHex(digits.tail).bits
     else throw FromDigits.MalformedNumber(s"unsupported radix $radix")
 
@@ -25,17 +25,4 @@ private[bits] object BitVectorFromDigits {
     override inline def fromDigits(digits: String, radix: Int): BitVector =
       ${digitsToBitVectorMacro('digits, 'radix)}
   }
-
-  private def digitsToBitVectorMacro(digits: Expr[String], radix: Expr[Int])(using qctx: QuoteContext): Expr[BitVector] =
-    (digits, radix) match {
-      case (Const(ds), Const(r)) =>
-        if (r == 16) {
-          '{ByteVector.fromValidHex($digits.tail).bits}
-        } else {
-          qctx.error(s"unsupported radix $r", radix)
-          '{BitVector.empty}
-        }
-      case other =>
-        '{digitsToBitVector($digits, $radix)}
-    }
 }

core/shared/src/main/scala-3/scodec/bits/ByteVectorPlatform.scala

@@ -15,7 +15,7 @@ private[bits] object ByteVectorFromDigits {
       digitsToByteVector(digits, radix)
   }
 
-  private def digitsToByteVector(digits: String, radix: Int): ByteVector =
+  def digitsToByteVector(digits: String, radix: Int): ByteVector =
     if (radix == 16) ByteVector.fromValidHex(digits.tail)
     else throw FromDigits.MalformedNumber(s"unsupported radix $radix")
 
@@ -25,17 +25,4 @@ private[bits] object ByteVectorFromDigits {
     override inline def fromDigits(digits: String, radix: Int): ByteVector =
       ${digitsToByteVectorMacro('digits, 'radix)}
   }
-
-  private def digitsToByteVectorMacro(digits: Expr[String], radix: Expr[Int])(using qctx: QuoteContext): Expr[ByteVector] =
-    (digits, radix) match {
-      case (Const(ds), Const(r)) =>
-        if (r == 16) {
-          '{ByteVector.fromValidHex($digits.tail)}
-        } else {
-          qctx.error(s"unsupported radix $r", radix)
-          '{ByteVector.empty}
-        }
-      case other =>
-        '{digitsToByteVector($digits, $radix)}
-    }
 }

core/shared/src/main/scala-3/scodec/bits/DigitsMacros.scala

@@ -0,0 +1,31 @@
+package scodec.bits
+
+import scala.quoted._
+import scala.quoted.matching._
+
+def digitsToBitVectorMacro(digits: Expr[String], radix: Expr[Int])(using qctx: QuoteContext): Expr[BitVector] =
+  (digits, radix) match {
+    case (Const(ds), Const(r)) =>
+      if (r == 16) {
+        '{ByteVector.fromValidHex($digits.tail).bits}
+      } else {
+        qctx.error(s"unsupported radix $r", radix)
+        '{BitVector.empty}
+      }
+    case other =>
+      '{BitVectorFromDigits.digitsToBitVector($digits, $radix)}
+  }
+
+def digitsToByteVectorMacro(digits: Expr[String], radix: Expr[Int])(using qctx: QuoteContext): Expr[ByteVector] =
+  (digits, radix) match {
+    case (Const(ds), Const(r)) =>
+      if (r == 16) {
+        '{ByteVector.fromValidHex($digits.tail)}
+      } else {
+        qctx.error(s"unsupported radix $r", radix)
+        '{ByteVector.empty}
+      }
+    case other =>
+      '{ByteVectorFromDigits.digitsToByteVector($digits, $radix)}
+  }
+