[base] Flatten out [Bi|Contra]Eithered.forContext

Author: rayrobdod

Base/src/main/scala/typeclass/Eithered.scala

@@ -192,24 +192,7 @@ object ContraEithered extends LowPrioContraEithered {
 	}
 
 	@ifdef("scalaEpochVersion:2")
-	trait ContraEithereds[Ctx, Expr[+_]] extends LowPrioContraEithereds[Ctx, Expr] {
-		implicit def unitUnit:ContraEithered[Ctx, Expr, Unit, Unit, Unit]
-	}
-	@ifdef("scalaEpochVersion:2")
-	private[typeclass]
-	trait LowPrioContraEithereds[Ctx, Expr[+_]] {
-		implicit def symmetric[A]:ContraEithered[Ctx, Expr, A, A, A]
-	}
-
-	@ifdef("scalaEpochVersion:2")
-	def forContext(c:scala.reflect.macros.blackbox.Context):ContraEithereds[c.type, c.Expr] = {
-		val backing = BiEithered.forContext(c)
-
-		new ContraEithereds[c.type, c.Expr] {
-			implicit override def unitUnit:ContraEithered[c.type, c.Expr, Unit, Unit, Unit] = backing.unitUnit
-			implicit override def symmetric[A]:ContraEithered[c.type, c.Expr, A, A, A] = backing.symmetric[A]
-		}
-	}
+	implicit def contextUnitUnit[Ctx <: scala.reflect.macros.blackbox.Context with Singleton, A]:ContraEithered[Ctx, Ctx#Expr, Unit, Unit, Unit] = BiEithered.contextUnitUnit[Ctx]
 
 	@ifdef("scalaBinaryVersion:3")
 	implicit def quotedUnitUnit:ContraEithered[scala.quoted.Quotes, scala.quoted.Expr, Unit, Unit, Unit] = quotedSymmetric[Unit]
@@ -221,6 +204,9 @@ private[typeclass] trait LowPrioContraEithered {
 	@ifdef("scalaBinaryVersion:3")
 	implicit def quotedSymmetric[A]:ContraEithered[scala.quoted.Quotes, scala.quoted.Expr, A, A, A] = BiEithered.quotedSymmetric
 
+	@ifdef("scalaEpochVersion:2")
+	implicit def contextSymmetric[Ctx <: scala.reflect.macros.blackbox.Context with Singleton, A]:ContraEithered[Ctx, Ctx#Expr, A, A, A] = BiEithered.contextSymmetric[Ctx, A]
+
 	implicit def idSymmetric[A]:ContraEithered[IdCtx, Id, A, A, A] = BiEithered.idSymmetric
 }
 
@@ -249,29 +235,7 @@ object BiEithered extends LowPrioBiEithered {
 	}
 
 	@ifdef("scalaEpochVersion:2")
-	trait BiEithereds[Ctx, Expr[+_]] extends LowPrioBiEithereds[Ctx, Expr] {
-		implicit def unitUnit:BiEithered[Ctx, Expr, Unit, Unit, Unit]
-	}
-	@ifdef("scalaEpochVersion:2")
-	private[typeclass]
-	trait LowPrioBiEithereds[Ctx, Expr[+_]] {
-		implicit def symmetric[A]:BiEithered[Ctx, Expr, A, A, A]
-	}
-	@ifdef("scalaEpochVersion:2")
-	def forContext(c:scala.reflect.macros.blackbox.Context):BiEithereds[c.type, c.Expr] = {
-		new BiEithereds[c.type, c.Expr] {
-			override def unitUnit:BiEithered[c.type, c.Expr, Unit, Unit, Unit] = this.symmetric[Unit]
-
-			implicit override def symmetric[A]:BiEithered[c.type, c.Expr, A, A, A] = {
-				BiEithered.apply[c.type, c.Expr, A, A, A](
-					(value, _) => value,
-					(value, _) => value,
-					PartialExprFunction.identity[c.type, c.Expr, c.TypeTag, A](using typeclass.Exprs.forContext[c.type]),
-					PartialExprFunction.identity[c.type, c.Expr, c.TypeTag, A](using typeclass.Exprs.forContext[c.type]),
-				)
-			}
-		}
-	}
+	implicit def contextUnitUnit[Ctx <: scala.reflect.macros.blackbox.Context with Singleton]:BiEithered[Ctx, Ctx#Expr, Unit, Unit, Unit] = this.contextSymmetric[Ctx, Unit]
 
 	@ifdef("scalaBinaryVersion:3")
 	implicit def quotedUnitUnit:BiEithered[scala.quoted.Quotes, scala.quoted.Expr, Unit, Unit, Unit] = quotedSymmetric[Unit]
@@ -314,6 +278,16 @@ private[typeclass] trait LowPrioBiEithered {
 		)
 	}
 
+	@ifdef("scalaEpochVersion:2")
+	implicit def contextSymmetric[Ctx <: scala.reflect.macros.blackbox.Context with Singleton, A]:BiEithered[Ctx, Ctx#Expr, A, A, A] = {
+		BiEithered.apply[Ctx, Ctx#Expr, A, A, A](
+			(value, _) => value,
+			(value, _) => value,
+			PartialExprFunction.identity[Ctx, Ctx#Expr, Ctx#TypeTag, A](using typeclass.Exprs.forContext[Ctx]),
+			PartialExprFunction.identity[Ctx, Ctx#Expr, Ctx#TypeTag, A](using typeclass.Exprs.forContext[Ctx]),
+		)
+	}
+
 	implicit def idSymmetric[A]:BiEithered[IdCtx, Id, A, A, A] = {
 		BiEithered.apply[IdCtx, Id, A, A, A](
 			(value, _) => value,

CHANGES.md

@@ -10,11 +10,12 @@
 * Flatten Interpolator, Extractor, Parser and companions' inheritance hierarchy
   * Include pages for `Interpolator.LiftedInterpolator` inner classes in docs
   * Use `ifdef` annotation instead of inheritance for scala-version-specific methods
-* Add `Ctx` type parameters and `ctx:Ctx` parameters to a lot of classes, methods, and function paramters
+* Add `Ctx` type parameters and `ctx:Ctx` parameters to a lot of classes, methods, and function parameters
   * On scala-3, add overloads to some parsers/extractors/interpolators methods such that one has a function parameter with an explicit Ctx parameter and the other has a function parameter with an implicit Ctx parameter
   * Makes this library `-Xcheck-macros`-safe
   * `scpc.IdCtx` created as the `Ctx` for the identity context
   * Removed `quoted.Quotes` or `blackbox.Context` using parameters from leaf parser methods
+* Flatten out typeclass `forContext` methods, putting respective methods that do not require a `Context` instance to create directly on the companion object
 * Create `TypeCreator` class; Change `Quotes`-context associated `Type[_]` from `quotes.Type` to `scpc.TypeCreator`
 
 ## [0.1.1](https://github.com/rayrobdod/string-context-parser-combinator/compare/0.1.0...0.1.1) – 2025-02-04

JsonParser/src/main/scala-2/MacroImpl.scala

@@ -29,11 +29,12 @@ final class MacroImpl(val c:Context {type PrefixType = JsonStringContext}) {
 	import myInterpolators.lifted
 	private[this] val myRepeateds = typeclass.Repeated.forContext(c)
 	import myRepeateds._
-	private[this] val myBiEithered = typeclass.BiEithered.forContext(c)
-	import myBiEithered._
 	private[this] val myBiRepeateds = typeclass.BiRepeated.forContext(c)
 	import myBiRepeateds._
 
+	// 2.13 can find `contextSymmetric` without the local variable. 2.12 cannot
+	private[this] implicit def mySymmetricBiEithered[A]: typeclass.BiEithered[c.type, c.Expr, A, A, A] = typeclass.BiEithered.contextSymmetric[c.type, A]
+
 	private[this] def charFlatCollect[A](pf: PartialFunction[Char, Interpolator[A]]):Interpolator[A] = {
 		charWhere(pf.isDefinedAt)
 			.flatMap((x, _) => pf.apply(x))

TimeParser/src/main/scala-2/package.scala

@@ -11,8 +11,8 @@ package datetime {
 
 		private[this] val leafParsers = Parser.contextParsers(c)
 		import leafParsers._
-		private[this] val bieithereds = typeclass.BiEithered.forContext(c)
-		import bieithereds._
+		// 2.13 can find `contextSymmetric` without the local variable. 2.12 cannot
+		private[this] implicit def mySymmetricBiEithered[A]: typeclass.BiEithered[c.type, c.Expr, A, A, A] = typeclass.BiEithered.contextSymmetric[c.type, A]
 		private[this] val timeLiftables = TimeLiftables(c)
 		import timeLiftables._
 		private[this] val timeUnliftables = TimeUnliftables(c)