Adds concrete classes

internal/util-logging/src/main/scala/sbt/util/InterfaceUtil.scala

@@ -0,0 +1,85 @@
+package sbt.util
+
+import xsbti.{ Maybe, F0, F1, T2, Position, Problem, Severity }
+import java.io.File
+
+object InterfaceUtil {
+  def f0[A](a: => A): F0[A] = new ConcreteF0[A](a)
+  def f1[A1, R](f: A1 => R): F1[A1, R] = new ConcreteF1(f)
+  def t2[A1, A2](x: (A1, A2)): T2[A1, A2] = new ConcreteT2(x._1, x._2)
+
+  def m2o[A](m: Maybe[A]): Option[A] =
+    if (m.isDefined) Some(m.get)
+    else None
+
+  def o2m[A](o: Option[A]): Maybe[A] =
+    o match {
+      case Some(v) => Maybe.just(v)
+      case None    => Maybe.nothing()
+    }
+
+  def position(line0: Option[Integer], content: String, offset0: Option[Integer], pointer0: Option[Integer],
+    pointerSpace0: Option[String], sourcePath0: Option[String], sourceFile0: Option[File]): Position =
+    new ConcretePosition(line0, content, offset0, pointer0, pointerSpace0, sourcePath0, sourceFile0)
+
+  def problem(cat: String, pos: Position, msg: String, sev: Severity): Problem =
+    new ConcreteProblem(cat, pos, msg, sev)
+
+  private final class ConcreteF0[A](a: => A) extends F0[A] {
+    def apply: A = a
+  }
+
+  private final class ConcreteF1[A1, R](f: A1 => R) extends F1[A1, R] {
+    def apply(a1: A1): R = f(a1)
+  }
+
+  private final class ConcreteT2[A1, A2](a1: A1, a2: A2) extends T2[A1, A2] {
+    val get1: A1 = a1
+    val get2: A2 = a2
+    override def toString: String = s"ConcreteT2($a1, $a2)"
+    override def equals(o: Any): Boolean = o match {
+      case o: ConcreteT2[A1, A2] =>
+        this.get1 == o.get1 &&
+          this.get2 == o.get2
+      case _ => false
+    }
+    override def hashCode: Int =
+      {
+        var hash = 1
+        hash = hash * 31 + this.get1.##
+        hash = hash * 31 + this.get2.##
+        hash
+      }
+  }
+
+  private final class ConcretePosition(
+    line0: Option[Integer],
+    content: String,
+    offset0: Option[Integer],
+    pointer0: Option[Integer],
+    pointerSpace0: Option[String],
+    sourcePath0: Option[String],
+    sourceFile0: Option[File]
+  ) extends Position {
+    val line = o2m(line0)
+    val lineContent = content
+    val offset = o2m(offset0)
+    val pointer = o2m(pointer0)
+    val pointerSpace = o2m(pointerSpace0)
+    val sourcePath = o2m(sourcePath0)
+    val sourceFile = o2m(sourceFile0)
+  }
+
+  private final class ConcreteProblem(
+    cat: String,
+    pos: Position,
+    msg: String,
+    sev: Severity
+  ) extends Problem {
+    val category = cat
+    val position = pos
+    val message = msg
+    val severity = sev
+    override def toString = s"[$severity] $pos: $message"
+  }
+}

internal/util-logging/src/main/scala/sbt/util/Logger.scala

@@ -85,28 +85,12 @@ object Logger {
         }
       }
   }
-  def f0[T](t: => T): F0[T] = new F0[T] { def apply = t }
+  def f0[A](a: => A): F0[A] = InterfaceUtil.f0[A](a)
-
+  def m2o[A](m: Maybe[A]): Option[A] = InterfaceUtil.m2o(m)
-  def m2o[S](m: Maybe[S]): Option[S] = if (m.isDefined) Some(m.get) else None
+  def o2m[A](o: Option[A]): Maybe[A] = InterfaceUtil.o2m(o)
-  def o2m[S](o: Option[S]): Maybe[S] = o match { case Some(v) => Maybe.just(v); case None => Maybe.nothing() }
+  def position(line0: Option[Integer], content: String, offset0: Option[Integer], pointer0: Option[Integer],
-
+    pointerSpace0: Option[String], sourcePath0: Option[String], sourceFile0: Option[File]): Position =
-  def position(line0: Option[Integer], content: String, offset0: Option[Integer], pointer0: Option[Integer], pointerSpace0: Option[String], sourcePath0: Option[String], sourceFile0: Option[File]): Position =
+    InterfaceUtil.position(line0, content, offset0, pointer0, pointerSpace0, sourcePath0, sourceFile0)
-    new Position {
-      val line = o2m(line0)
-      val lineContent = content
-      val offset = o2m(offset0)
-      val pointer = o2m(pointer0)
-      val pointerSpace = o2m(pointerSpace0)
-      val sourcePath = o2m(sourcePath0)
-      val sourceFile = o2m(sourceFile0)
-    }
-
   def problem(cat: String, pos: Position, msg: String, sev: Severity): Problem =
-    new Problem {
+    InterfaceUtil.problem(cat, pos, msg, sev)
-      val category = cat
-      val position = pos
-      val message = msg
-      val severity = sev
-      override def toString = s"[$severity] $pos: $message"
-    }
 }