Rename constraint solving internal interface

These methods are only meant to exist for the quote patterns matcher

Author: nicolasstucki

compiler/src/dotty/tools/dotc/tastyreflect/ReflectionCompilerInterface.scala

@@ -52,13 +52,17 @@ class ReflectionCompilerInterface(val rootContext: core.Contexts.Context) extend
   def Context_owner(self: Context): Symbol = self.owner
 
 
-  def Context_GADT_setFreshGADTBounds(self: Context): Context =
+  /////////////////
+  // Constraints //
+  /////////////////
+
+  def Constraints_init(self: Context): Context =
     self.fresh.setFreshGADTBounds.addMode(Mode.GadtConstraintInference)
 
-  def Context_GADT_addToConstraint(self: Context)(syms: List[Symbol]): Boolean =
+  def Constraints_add(self: Context)(syms: List[Symbol]): Boolean =
     self.gadt.addToConstraint(syms)
 
-  def Context_GADT_approximation(self: Context)(sym: Symbol, fromBelow: Boolean): Type =
+  def Constraints_approximation(self: Context)(sym: Symbol, fromBelow: Boolean): Type =
     self.gadt.approximation(sym, fromBelow)
 
   ////////////

library/src/scala/internal/quoted/Matcher.scala

@@ -147,14 +147,14 @@ object Matcher {
     def termMatch(scrutineeTerm: Term, patternTerm: Term, hasTypeSplices: Boolean): Option[Tuple] = {
       given Env = Map.empty
       if (hasTypeSplices) {
-        val ctx: Context = internal.Context_GADT_setFreshGADTBounds(rootContext)
+        val ctx: Context = internal.Constraints_init(rootContext)
         given Context = ctx
         val matchings = scrutineeTerm =?= patternTerm
         // After matching and doing all subtype checks, we have to approximate all the type bindings
         // that we have found and seal them in a quoted.Type
         matchings.asOptionOfTuple.map { tup =>
           Tuple.fromArray(tup.toArray.map { // TODO improve performance
-            case x: SymBinding => internal.Context_GADT_approximation(summon[Context])(x.sym, !x.fromAbove).seal
+            case x: SymBinding => internal.Constraints_approximation(summon[Context])(x.sym, !x.fromAbove).seal
             case x => x
           })
         }
@@ -168,14 +168,14 @@ object Matcher {
     def typeTreeMatch(scrutineeTypeTree: TypeTree, patternTypeTree: TypeTree, hasTypeSplices: Boolean): Option[Tuple] = {
       given Env = Map.empty
       if (hasTypeSplices) {
-        val ctx: Context = internal.Context_GADT_setFreshGADTBounds(rootContext)
+        val ctx: Context = internal.Constraints_init(rootContext)
         given Context = ctx
         val matchings = scrutineeTypeTree =?= patternTypeTree
         // After matching and doing all subtype checks, we have to approximate all the type bindings
         // that we have found and seal them in a quoted.Type
         matchings.asOptionOfTuple.map { tup =>
           Tuple.fromArray(tup.toArray.map { // TODO improve performance
-            case x: SymBinding => internal.Context_GADT_approximation(summon[Context])(x.sym, !x.fromAbove).seal
+            case x: SymBinding => internal.Constraints_approximation(summon[Context])(x.sym, !x.fromAbove).seal
             case x => x
           })
         }
@@ -323,7 +323,7 @@ object Matcher {
             fn1 =?= fn2 &&& args1 =?= args2
 
           case (Block(stats1, expr1), Block(binding :: stats2, expr2)) if isTypeBinding(binding) =>
-            qctx.tasty.internal.Context_GADT_addToConstraint(summon[Context])(binding.symbol :: Nil)
+            qctx.tasty.internal.Constraints_add(summon[Context])(binding.symbol :: Nil)
             matched(new SymBinding(binding.symbol, hasFromAboveAnnotation(binding.symbol))) &&& Block(stats1, expr1) =?= Block(stats2, expr2)
 
           /* Match block */
@@ -340,7 +340,7 @@ object Matcher {
 
           case (scrutinee, Block(typeBindings, expr2)) if typeBindings.forall(isTypeBinding) =>
             val bindingSymbols = typeBindings.map(_.symbol)
-            qctx.tasty.internal.Context_GADT_addToConstraint(summon[Context])(bindingSymbols)
+            qctx.tasty.internal.Constraints_add(summon[Context])(bindingSymbols)
             bindingSymbols.foldRight(scrutinee =?= expr2)((x, acc) => matched(new SymBinding(x, hasFromAboveAnnotation(x))) &&& acc)
 
           /* Match if */

library/src/scala/tasty/reflect/CompilerInterface.scala

@@ -143,10 +143,13 @@ trait CompilerInterface {
   /** Returns the owner of the context */
   def Context_owner(self: Context): Symbol
 
-  def Context_GADT_setFreshGADTBounds(self: Context): Context
-  def Context_GADT_addToConstraint(self: Context)(syms: List[Symbol]): Boolean
-  def Context_GADT_approximation(self: Context)(sym: Symbol, fromBelow: Boolean): Type
+  /////////////////
+  // Constraints //
+  /////////////////
 
+  def Constraints_init(self: Context): Context
+  def Constraints_add(self: Context)(syms: List[Symbol]): Boolean
+  def Constraints_approximation(self: Context)(sym: Symbol, fromBelow: Boolean): Type
 
   ////////////
   // Source //