[base] Mark Expr higher-kinded type parameters as being covariant

rayrobdod · rayrobdod · commit 6f858c7c66a1 · 2025-04-26T16:54:36.000-04:00
diff --git a/Base/src/main/scala-2/typeclass/ToExprMapping.scala b/Base/src/main/scala-2/typeclass/ToExprMapping.scala
@@ -8,7 +8,7 @@ import scala.reflect.ClassTag
  * Associates an Expr type with the implicit types required to lift a value into an Expr.
  * Support for [[Interpolator.mapToExpr]].
  */
-trait ToExprMapping[Expr[_], ToExpr[_], Type[_]] {
+trait ToExprMapping[Expr[+_], ToExpr[_], Type[_]] {
 	def apply[A](value:A, fn:ToExpr[A], tpe: Type[A]):Expr[A]
 }
 
diff --git a/Base/src/main/scala-3/typeclass/ToExprMapping.scala b/Base/src/main/scala-3/typeclass/ToExprMapping.scala
@@ -7,7 +7,7 @@ import scala.reflect.ClassTag
  * Associates an Expr type with the implicit types required to lift a value into an Expr.
  * Support for [[Interpolator.mapToExpr]]
  */
-trait ToExprMapping[Expr[_], ToExpr[_], Type[_]] {
+trait ToExprMapping[Expr[+_], ToExpr[_], Type[_]] {
 	def apply[A](value:A, fn:ToExpr[A], tpe: Type[A]):Expr[A]
 }
 
diff --git a/Base/src/main/scala/Extractor.scala b/Base/src/main/scala/Extractor.scala
@@ -31,7 +31,7 @@ import name.rayrobdod.stringContextParserCombinator.{Extractor => SCExtractor}
  * @groupname Misc Other Combinators
  * @groupprio Misc 1999
  */
-final class Extractor[Expr[_], Type[_], -A] private[stringContextParserCombinator] (
+final class Extractor[Expr[+_], Type[_], -A] private[stringContextParserCombinator] (
 		protected[stringContextParserCombinator] val impl: internal.Extractor[Expr, Type, A]
 ) {
 
@@ -372,7 +372,7 @@ object Extractor
 	 * Indirectly refers to a parser, to allow for mutual-recursion
 	 * @group Misc
 	 */
-	def `lazy`[Expr[_], Type[_], A](fn:Function0[SCExtractor[Expr, Type, A]]):SCExtractor[Expr, Type, A] =
+	def `lazy`[Expr[+_], Type[_], A](fn:Function0[SCExtractor[Expr, Type, A]]):SCExtractor[Expr, Type, A] =
 		new SCExtractor(internal.DelayedConstruction.extractor(() => fn().impl))
 
 	/**
@@ -558,7 +558,7 @@ trait VersionSpecificExtractorModule extends ExprIndependentExtractors[scala.quo
 /**
  * Extractors that do not introduce an input dependency on Expr
  */
-private[stringContextParserCombinator] trait ExprIndependentExtractors[Expr[_], Type[_]] {
+private[stringContextParserCombinator] trait ExprIndependentExtractors[Expr[+_], Type[_]] {
 	/**
 	 * Succeeds if the next character is a member of the given Set; captures that character
 	 * @group PartAsChar
diff --git a/Base/src/main/scala/Interpolator.scala b/Base/src/main/scala/Interpolator.scala
@@ -196,7 +196,7 @@ final class Interpolator[-Expr, +A] private[stringContextParserCombinator] (
 	 * successful result into an Expr
 	 * @group Map
 	 */
-	def mapToExpr[Z >: A, Expr2[_], ToExpr[_], Type[_]](
+	def mapToExpr[Z >: A, Expr2[+_], ToExpr[_], Type[_]](
 		implicit mapping:typeclass.ToExprMapping[Expr2, ToExpr, Type],
 		toExpr:ToExpr[Z],
 		tpe:Type[Z]
@@ -259,7 +259,7 @@ final class Interpolator[-Expr, +A] private[stringContextParserCombinator] (
 	 * The extractor parsing will probably fail if this parser expects to find holes.
 	 * @group Misc
 	 */
-	def extractorAtom[ExprZ[_], TypeZ[_], UnexprA](
+	def extractorAtom[ExprZ[+_], TypeZ[_], UnexprA](
 		implicit t:TypeZ[UnexprA],
 		ev:ExprZ[Any] <:< Expr,
 		ev2:A <:< ExprZ[UnexprA]
diff --git a/Base/src/main/scala/Parser.scala b/Base/src/main/scala/Parser.scala
@@ -34,7 +34,7 @@ import name.rayrobdod.stringContextParserCombinator.{Parser => SCPCParser}
  * @groupname Convert convert
  * @groupprio Convert 2000
  */
-final class Parser[Expr[_], Type[_], A] private[stringContextParserCombinator] (
+final class Parser[Expr[+_], Type[_], A] private[stringContextParserCombinator] (
 		protected[stringContextParserCombinator] val impl: internal.Parser[Expr, Type, A]
 ) {
 
@@ -365,7 +365,7 @@ object Parser
 	 * A parser that acts like the Interpolator when interpolating, and like the Extractor when extracting
 	 * @group Misc
 	 */
-	def paired[Expr[_], Type[_], A](
+	def paired[Expr[+_], Type[_], A](
 		interpolator:SCPCInterpolator[Expr[Any], A],
 		extractor:SCPCExtractor[Expr, Type, A]
 	):SCPCParser[Expr, Type, A] =
@@ -375,7 +375,7 @@ object Parser
 	 * Indirectly refers to a parser, to allow for mutual-recursion
 	 * @group Misc
 	 */
-	def `lazy`[Expr[_], Type[_], A](fn:Function0[SCPCParser[Expr, Type, A]]):SCPCParser[Expr, Type, A] =
+	def `lazy`[Expr[+_], Type[_], A](fn:Function0[SCPCParser[Expr, Type, A]]):SCPCParser[Expr, Type, A] =
 		new SCPCParser(internal.DelayedConstruction.parser(() => fn().impl))
 
 	// The `ToExpr` tparam isn't used directly, but it does help type inference at use sites
@@ -570,7 +570,7 @@ trait VersionSpecificParserModule extends ExprIndependentParsers[scala.quoted.Ex
 /**
  * Parsers that do not introduce an input dependency on Expr
  */
-private[stringContextParserCombinator] trait ExprIndependentParsers[Expr[_], Type[_]] {
+private[stringContextParserCombinator] trait ExprIndependentParsers[Expr[+_], Type[_]] {
 	/**
 	 * Succeeds if the next character is a member of the given Set; captures that character
 	 * @group PartAsChar
diff --git a/Base/src/main/scala/PartialExprFunction.scala b/Base/src/main/scala/PartialExprFunction.scala
@@ -3,13 +3,13 @@ package name.rayrobdod.stringContextParserCombinator
 /**
  * A partial function which is valid according to an `Expr[Boolean]` instead of a plain `Boolean`
  */
-trait PartialExprFunction[+Expr[_], -A, +Z] {
+trait PartialExprFunction[+Expr[+_], -A, +Z] {
 	def isDefinedAt(a:A):Expr[Boolean]
 	def apply(a:A):Z
 }
 
 object PartialExprFunction {
-	def apply[Expr[_], A, Z](
+	def apply[Expr[+_], A, Z](
 		isDefinedAtFn:A => Expr[Boolean],
 		applyFn:A => Z
 	):PartialExprFunction[Expr, A, Z] = {
@@ -20,7 +20,7 @@ object PartialExprFunction {
 	}
 
 	private[stringContextParserCombinator]
-	def identity[Expr[_], A](
+	def identity[Expr[+_], A](
 		constTrue:Expr[Boolean]
 	):PartialExprFunction[Expr, A, A] = {
 		new PartialExprFunction[Expr, A, A] {
diff --git a/Base/src/main/scala/UnapplyExpr.scala b/Base/src/main/scala/UnapplyExpr.scala
@@ -6,20 +6,20 @@ import scala.reflect.ClassTag
  * The data needed to create an Unapply
  */
 private[stringContextParserCombinator]
-final case class UnapplyExpr[+Expr[_], +Type[_], -A] (
+final case class UnapplyExpr[+Expr[+_], +Type[_], -A] (
 	condition: A => Expr[Boolean],
 	parts: List[UnapplyExpr.Part[Expr, Type, A, _]]
 )
 
 private[stringContextParserCombinator]
 object UnapplyExpr {
-	final case class Part[+Expr[_], +Type[_], -A, Z](typ: Type[Z], value: A => Expr[Z]) {
+	final case class Part[+Expr[+_], +Type[_], -A, Z](typ: Type[Z], value: A => Expr[Z]) {
 		def contramapValue[B](contrafn: B => A):Part[Expr, Type, B, Z] = new Part(typ, contrafn.andThen(value))
 	}
 }
 
 private[stringContextParserCombinator]
-trait UnapplyExprs[Expr[_], Type[_]] {
+trait UnapplyExprs[Expr[+_], Type[_]] {
 	def empty:UnapplyExpr[Expr, Type, Any]
 
 	def isChar(expecting:Char):UnapplyExpr[Expr, Type, Char]
@@ -74,7 +74,7 @@ trait UnapplyExprs[Expr[_], Type[_]] {
 private[stringContextParserCombinator]
 object UnapplyExprs extends VersionSpecificUnapplyExprs {
 	private[stringContextParserCombinator]
-	abstract class Common[Expr[_], Type[_]](
+	abstract class Common[Expr[+_], Type[_]](
 		`true`: Expr[Boolean],
 		`false`: Expr[Boolean],
 		andBooleans: (Expr[Boolean], () => Expr[Boolean]) => Expr[Boolean]
diff --git a/Base/src/main/scala/internal/AndThen.scala b/Base/src/main/scala/internal/AndThen.scala
@@ -20,7 +20,7 @@ object AndThen {
 		}
 	}
 
-	def extractor[Expr[_], Type[_], A, B, Z](
+	def extractor[Expr[+_], Type[_], A, B, Z](
 		left:Extractor[Expr, Type, A],
 		right:Extractor[Expr, Type, B],
 		combiner:typeclass.ContraSequenced[A, B, Z]
@@ -39,7 +39,7 @@ object AndThen {
 		}
 	}
 
-	def parser[Expr[_], Type[_], A, B, Z](
+	def parser[Expr[+_], Type[_], A, B, Z](
 		left:Parser[Expr, Type, A],
 		right:Parser[Expr, Type, B],
 		combiner:typeclass.BiSequenced[A, B, Z]
diff --git a/Base/src/main/scala/internal/Attempt.scala b/Base/src/main/scala/internal/Attempt.scala
@@ -13,7 +13,7 @@ object Attempt {
 		}
 	}
 
-	def extractor[Expr[_], Type[_], A](
+	def extractor[Expr[+_], Type[_], A](
 		backing:Extractor[Expr, Type, A]
 	):Extractor[Expr, Type, A] = {
 		new Extractor[Expr, Type, A] {
@@ -23,7 +23,7 @@ object Attempt {
 		}
 	}
 
-	def parser[Expr[_], Type[_], A](
+	def parser[Expr[+_], Type[_], A](
 		backing:Parser[Expr, Type, A]
 	):Parser[Expr, Type, A] = {
 		new Parser[Expr, Type, A] {
diff --git a/Base/src/main/scala/internal/DelayedConstruction.scala b/Base/src/main/scala/internal/DelayedConstruction.scala
@@ -13,7 +13,7 @@ object DelayedConstruction {
 		}
 	}
 
-	def extractor[Expr[_], Type[_], A](
+	def extractor[Expr[+_], Type[_], A](
 		backing:() => Extractor[Expr, Type, A]
 	):Extractor[Expr, Type, A] = {
 		new Extractor[Expr, Type, A] {
@@ -23,7 +23,7 @@ object DelayedConstruction {
 		}
 	}
 
-	def parser[Expr[_], Type[_], A](
+	def parser[Expr[+_], Type[_], A](
 		backing:() => Parser[Expr, Type, A]
 	):Parser[Expr, Type, A] = {
 		new Parser[Expr, Type, A] {
diff --git a/Base/src/main/scala/internal/End.scala b/Base/src/main/scala/internal/End.scala
@@ -2,7 +2,7 @@ package name.rayrobdod.stringContextParserCombinator
 package internal
 
 private[stringContextParserCombinator]
-final class End[Expr[_], Type[_]] extends Parser[Expr, Type, Unit] {
+final class End[Expr[+_], Type[_]] extends Parser[Expr, Type, Unit] {
 	override def interpolate[ExprZ <: Expr[Any], Pos](input:Input[ExprZ, Pos])(implicit ev1:Ordering[Pos]):Result[ExprZ, Pos, Unit] = {
 		this.parse(())(input)
 	}
diff --git a/Base/src/main/scala/internal/ExtractorAtom.scala b/Base/src/main/scala/internal/ExtractorAtom.scala
@@ -7,7 +7,7 @@ package internal
  * As a parser, this will pass through the result of the backing parser.
  */
 private[stringContextParserCombinator]
-final class ExtractorAtom[Expr[_], Type[_], A](
+final class ExtractorAtom[Expr[+_], Type[_], A](
 	backing:Interpolator[Expr[Any], Expr[A]],
 	tpeA:Type[A]
 ) extends Parser[Expr, Type, Expr[A]] {
diff --git a/Base/src/main/scala/internal/Fail.scala b/Base/src/main/scala/internal/Fail.scala
@@ -3,7 +3,7 @@ package internal
 
 /** A parser that consumes no input and always fails */
 private[stringContextParserCombinator]
-final class Fail[Expr[_], Type[_]](desc:ExpectingDescription) extends Parser[Expr, Type, Nothing] {
+final class Fail[Expr[+_], Type[_]](desc:ExpectingDescription) extends Parser[Expr, Type, Nothing] {
 	def interpolate[ExprZ <: Expr[Any], Pos](input:Input[ExprZ, Pos])(implicit ev1:Ordering[Pos]):Result[ExprZ, Pos, Nothing] = {
 		Failure(ExpectingSet(Expecting(desc, input.position)))
 	}
diff --git a/Base/src/main/scala/internal/Hide.scala b/Base/src/main/scala/internal/Hide.scala
@@ -13,7 +13,7 @@ object Hide {
 		}
 	}
 
-	def extractor[Expr[_], Type[_], Z](
+	def extractor[Expr[+_], Type[_], Z](
 		backing:Extractor[Expr, Type, Z]
 	):Extractor[Expr, Type, Z] = {
 		new Extractor[Expr, Type, Z] {
@@ -23,7 +23,7 @@ object Hide {
 		}
 	}
 
-	def parser[Expr[_], Type[_], Z](
+	def parser[Expr[+_], Type[_], Z](
 		backing:Parser[Expr, Type, Z]
 	):Parser[Expr, Type, Z] = {
 		new Parser[Expr, Type, Z] {
diff --git a/Base/src/main/scala/internal/Map.scala b/Base/src/main/scala/internal/Map.scala
@@ -14,7 +14,7 @@ object Map {
 		}
 	}
 
-	def extractor[Expr[_], Type[_], A, Z](
+	def extractor[Expr[+_], Type[_], A, Z](
 		backing:Extractor[Expr, Type, A],
 		contramapping: Z => A
 	):Extractor[Expr, Type, Z] = {
@@ -25,7 +25,7 @@ object Map {
 		}
 	}
 
-	def parser[Expr[_], Type[_], A, Z](
+	def parser[Expr[+_], Type[_], A, Z](
 		backing:Parser[Expr, Type, A],
 		mapping: A => Z,
 		contramapping: Z => A
diff --git a/Base/src/main/scala/internal/Opaque.scala b/Base/src/main/scala/internal/Opaque.scala
@@ -14,7 +14,7 @@ object Opaque {
 		}
 	}
 
-	def extractor[Expr[_], Type[_], A](
+	def extractor[Expr[+_], Type[_], A](
 		backing:Extractor[Expr, Type, A],
 		description:ExpectingDescription
 	):Extractor[Expr, Type, A] = {
@@ -25,7 +25,7 @@ object Opaque {
 		}
 	}
 
-	def parser[Expr[_], Type[_], A](
+	def parser[Expr[+_], Type[_], A](
 		backing:Parser[Expr, Type, A],
 		description:ExpectingDescription
 	):Parser[Expr, Type, A] = {
diff --git a/Base/src/main/scala/internal/Optionally.scala b/Base/src/main/scala/internal/Optionally.scala
@@ -16,7 +16,7 @@ object Optionally {
 		})
 	}
 
-	def extractor[Expr[_], Type[_], A, Z](
+	def extractor[Expr[+_], Type[_], A, Z](
 		backing:Extractor[Expr, Type, A],
 		strategy:RepeatStrategy,
 		ev:typeclass.ContraOptionally[Expr, A, Z]
@@ -43,7 +43,7 @@ object Optionally {
 		}
 	}
 
-	def parser[Expr[_], Type[_], A, Z](
+	def parser[Expr[+_], Type[_], A, Z](
 		backing:Parser[Expr, Type, A],
 		strategy:RepeatStrategy,
 		ev:typeclass.BiOptionally[Expr, A, Z]
diff --git a/Base/src/main/scala/internal/OrElse.scala b/Base/src/main/scala/internal/OrElse.scala
@@ -15,7 +15,7 @@ object OrElse {
 		}
 	}
 
-	def extractor[Expr[_], Type[_], A, B, Z](
+	def extractor[Expr[+_], Type[_], A, B, Z](
 		left:Extractor[Expr, Type, A],
 		right:Extractor[Expr, Type, B],
 		combiner:typeclass.ContraEithered[Expr, A, B, Z]
@@ -27,7 +27,7 @@ object OrElse {
 		}
 	}
 
-	def parser[Expr[_], Type[_], A, B, Z](
+	def parser[Expr[+_], Type[_], A, B, Z](
 		left:Parser[Expr, Type, A],
 		right:Parser[Expr, Type, B],
 		combiner:typeclass.BiEithered[Expr, A, B, Z]
@@ -66,7 +66,7 @@ object OrElse {
 		}
 	}
 
-	private def extractor[Expr[_], Type[_], A, B, Z, Pos](
+	private def extractor[Expr[+_], Type[_], A, B, Z, Pos](
 		left:Extractor[Expr, Type, A],
 		right:Extractor[Expr, Type, B],
 		combiner:typeclass.ContraEithered[Expr, A, B, Z],
diff --git a/Base/src/main/scala/internal/Paired.scala b/Base/src/main/scala/internal/Paired.scala
@@ -3,7 +3,7 @@ package internal
 
 /** Acts like the Interpolator when interpolating, and like the Extractor when extracting */
 private[stringContextParserCombinator]
-final class Paired[Expr[_], Type[_], A](
+final class Paired[Expr[+_], Type[_], A](
 	val interpolator:Interpolator[Expr[Any], A],
 	val extractor:Extractor[Expr, Type, A]
 ) extends Parser[Expr, Type, A] {
diff --git a/Base/src/main/scala/internal/Parser.scala b/Base/src/main/scala/internal/Parser.scala
@@ -10,7 +10,7 @@ trait Interpolator[-Expr, +A] {
 }
 
 private[stringContextParserCombinator]
-trait Extractor[Expr[_], Type[_], -A] {
+trait Extractor[Expr[+_], Type[_], -A] {
 	def extractor[Pos](
 		input:Input[Unit, Pos])(
 		implicit ev1:Ordering[Pos],
@@ -19,6 +19,6 @@ trait Extractor[Expr[_], Type[_], -A] {
 }
 
 private[stringContextParserCombinator]
-trait Parser[Expr[_], Type[_], A]
+trait Parser[Expr[+_], Type[_], A]
        extends Interpolator[Expr[Any], A]
        with Extractor[Expr, Type, A]
diff --git a/Base/src/main/scala/internal/Pass.scala b/Base/src/main/scala/internal/Pass.scala
@@ -3,7 +3,7 @@ package internal
 
 /** A parser that consumes no input and always succeeds */
 private[stringContextParserCombinator]
-final class Pass[Expr[_], Type[_]] extends Parser[Expr, Type, Unit] {
+final class Pass[Expr[+_], Type[_]] extends Parser[Expr, Type, Unit] {
 	def interpolate[ExprZ <: Any, Pos](input:Input[ExprZ, Pos])(implicit ev1:Ordering[Pos]):Result[ExprZ, Pos, Unit] = {
 		Success((), input, ExpectingSet.empty)
 	}
diff --git a/Base/src/main/scala/internal/Repeat.scala b/Base/src/main/scala/internal/Repeat.scala
@@ -32,7 +32,7 @@ object Repeat {
 		}
 	}
 
-	def extractor[Expr[_], Type[_], A, Z](
+	def extractor[Expr[+_], Type[_], A, Z](
 		inner:Extractor[Expr, Type, A],
 		min:Int,
 		max:Int,
@@ -59,7 +59,7 @@ object Repeat {
 		}
 	}
 
-	def parser[Expr[_], Type[_], A, Z](
+	def parser[Expr[+_], Type[_], A, Z](
 		inner:Parser[Expr, Type, A],
 		min:Int,
 		max:Int,
diff --git a/Base/src/main/scala/internal/Void.scala b/Base/src/main/scala/internal/Void.scala
diff --git a/Base/src/main/scala/internal/WidenWith.scala b/Base/src/main/scala/internal/WidenWith.scala
diff --git a/Base/src/main/scala/internal/package.scala b/Base/src/main/scala/internal/package.scala
diff --git a/Base/src/main/scala/typeclass/Eithered.scala b/Base/src/main/scala/typeclass/Eithered.scala
diff --git a/Base/src/main/scala/typeclass/Optionally.scala b/Base/src/main/scala/typeclass/Optionally.scala
diff --git a/Base/src/main/scala/typeclass/Repeated.scala b/Base/src/main/scala/typeclass/Repeated.scala
diff --git a/TimeParser/src/main/scala/TimeParsers.scala b/TimeParser/src/main/scala/TimeParsers.scala

Original file line number	Diff line number	Diff line change
`@@ -8,7 +8,7 @@ import scala.reflect.ClassTag`
`8`	`8`	`* Associates an Expr type with the implicit types required to lift a value into an Expr.`
`9`	`9`	`* Support for [[Interpolator.mapToExpr]].`
`10`	`10`	`*/`
`11`		`-trait ToExprMapping[Expr[_], ToExpr[_], Type[_]] {`
	`11`	`+trait ToExprMapping[Expr[+_], ToExpr[_], Type[_]] {`
`12`	`12`	`def apply[A](value:A, fn:ToExpr[A], tpe: Type[A]):Expr[A]`
`13`	`13`	`}`
`14`	`14`
Original file line number	Diff line number	Diff line change
`@@ -7,7 +7,7 @@ import scala.reflect.ClassTag`
`7`	`7`	`* Associates an Expr type with the implicit types required to lift a value into an Expr.`
`8`	`8`	`* Support for [[Interpolator.mapToExpr]]`
`9`	`9`	`*/`
`10`		`-trait ToExprMapping[Expr[_], ToExpr[_], Type[_]] {`
	`10`	`+trait ToExprMapping[Expr[+_], ToExpr[_], Type[_]] {`
`11`	`11`	`def apply[A](value:A, fn:ToExpr[A], tpe: Type[A]):Expr[A]`
`12`	`12`	`}`
`13`	`13`
Original file line number	Diff line number	Diff line change
`@@ -20,7 +20,7 @@ object AndThen {`
`20`	`20`	`}`
`21`	`21`	`}`
`22`	`22`
`23`		`- def extractor[Expr[_], Type[_], A, B, Z](`
	`23`	`+ def extractor[Expr[+_], Type[_], A, B, Z](`
`24`	`24`	`left:Extractor[Expr, Type, A],`
`25`	`25`	`right:Extractor[Expr, Type, B],`
`26`	`26`	`combiner:typeclass.ContraSequenced[A, B, Z]`
`@@ -39,7 +39,7 @@ object AndThen {`
`39`	`39`	`}`
`40`	`40`	`}`
`41`	`41`
`42`		`- def parser[Expr[_], Type[_], A, B, Z](`
	`42`	`+ def parser[Expr[+_], Type[_], A, B, Z](`
`43`	`43`	`left:Parser[Expr, Type, A],`
`44`	`44`	`right:Parser[Expr, Type, B],`
`45`	`45`	`combiner:typeclass.BiSequenced[A, B, Z]`
Original file line number	Diff line number	Diff line change
`@@ -13,7 +13,7 @@ object Attempt {`
`13`	`13`	`}`
`14`	`14`	`}`
`15`	`15`
`16`		`- def extractor[Expr[_], Type[_], A](`
	`16`	`+ def extractor[Expr[+_], Type[_], A](`
`17`	`17`	`backing:Extractor[Expr, Type, A]`
`18`	`18`	`):Extractor[Expr, Type, A] = {`
`19`	`19`	`new Extractor[Expr, Type, A] {`
`@@ -23,7 +23,7 @@ object Attempt {`
`23`	`23`	`}`
`24`	`24`	`}`
`25`	`25`
`26`		`- def parser[Expr[_], Type[_], A](`
	`26`	`+ def parser[Expr[+_], Type[_], A](`
`27`	`27`	`backing:Parser[Expr, Type, A]`
`28`	`28`	`):Parser[Expr, Type, A] = {`
`29`	`29`	`new Parser[Expr, Type, A] {`
Original file line number	Diff line number	Diff line change
`@@ -13,7 +13,7 @@ object DelayedConstruction {`
`13`	`13`	`}`
`14`	`14`	`}`
`15`	`15`
`16`		`- def extractor[Expr[_], Type[_], A](`
	`16`	`+ def extractor[Expr[+_], Type[_], A](`
`17`	`17`	`backing:() => Extractor[Expr, Type, A]`
`18`	`18`	`):Extractor[Expr, Type, A] = {`
`19`	`19`	`new Extractor[Expr, Type, A] {`
`@@ -23,7 +23,7 @@ object DelayedConstruction {`
`23`	`23`	`}`
`24`	`24`	`}`
`25`	`25`
`26`		`- def parser[Expr[_], Type[_], A](`
	`26`	`+ def parser[Expr[+_], Type[_], A](`
`27`	`27`	`backing:() => Parser[Expr, Type, A]`
`28`	`28`	`):Parser[Expr, Type, A] = {`
`29`	`29`	`new Parser[Expr, Type, A] {`