diff --git a/tyck/src/main/scala/chester/resolve/Desalt.scala b/tyck-base/src/main/scala/chester/resolve/Desalt.scala similarity index 100% rename from tyck/src/main/scala/chester/resolve/Desalt.scala rename to tyck-base/src/main/scala/chester/resolve/Desalt.scala diff --git a/tyck/src/main/scala/chester/resolve/MacroExpander.scala b/tyck-base/src/main/scala/chester/resolve/MacroExpander.scala similarity index 100% rename from tyck/src/main/scala/chester/resolve/MacroExpander.scala rename to tyck-base/src/main/scala/chester/resolve/MacroExpander.scala diff --git a/tyck/src/main/scala/chester/resolve/operator.scala b/tyck-base/src/main/scala/chester/resolve/operator.scala similarity index 100% rename from tyck/src/main/scala/chester/resolve/operator.scala rename to tyck-base/src/main/scala/chester/resolve/operator.scala diff --git a/tyck/src/main/scala/chester/tyck/Builtin.scala b/tyck-base/src/main/scala/chester/tyck/Builtin.scala similarity index 100% rename from tyck/src/main/scala/chester/tyck/Builtin.scala rename to tyck-base/src/main/scala/chester/tyck/Builtin.scala diff --git a/tyck/src/main/scala/chester/tyck/Context.scala b/tyck-base/src/main/scala/chester/tyck/Context2.scala similarity index 94% rename from tyck/src/main/scala/chester/tyck/Context.scala rename to tyck-base/src/main/scala/chester/tyck/Context2.scala index 60ae4ca89..ba08c5a31 100644 --- a/tyck/src/main/scala/chester/tyck/Context.scala +++ b/tyck-base/src/main/scala/chester/tyck/Context2.scala @@ -1,13 +1,10 @@ package chester.tyck -import chester.syntax.accociativity.OperatorsContext import chester.syntax.* import chester.syntax.core.* -import chester.syntax.Name import chester.tyck.BuiltIn.BuiltinItem -import chester.tyck.api.SymbolCollector -import chester.utils.propagator.* import chester.uniqid.* +import chester.utils.propagator.* trait ProvideCtx extends ProvideCellId with ElaboraterBase { diff --git a/tyck/src/main/scala/chester/tyck/ElaboraterCommon.scala b/tyck-base/src/main/scala/chester/tyck/ElaboraterCommon.scala similarity index 100% rename from tyck/src/main/scala/chester/tyck/ElaboraterCommon.scala rename to tyck-base/src/main/scala/chester/tyck/ElaboraterCommon.scala index 3685974d1..e64c2ae4d 100644 --- a/tyck/src/main/scala/chester/tyck/ElaboraterCommon.scala +++ b/tyck-base/src/main/scala/chester/tyck/ElaboraterCommon.scala @@ -5,9 +5,9 @@ import chester.resolve.{SimpleDesalt, resolveOpSeq} import chester.syntax.Name import chester.syntax.concrete.* import chester.syntax.core.* +import chester.uniqid.* import chester.utils.* import chester.utils.propagator.CommonPropagator -import chester.uniqid.* trait ElaboraterCommon extends ProvideCtx with ElaboraterBase with CommonPropagator[Tyck] { diff --git a/tyck/src/main/scala/chester/tyck/common.scala b/tyck-base/src/main/scala/chester/tyck/common.scala similarity index 77% rename from tyck/src/main/scala/chester/tyck/common.scala rename to tyck-base/src/main/scala/chester/tyck/common.scala index 1a674cbfd..d2f5ae4b7 100644 --- a/tyck/src/main/scala/chester/tyck/common.scala +++ b/tyck-base/src/main/scala/chester/tyck/common.scala @@ -3,3 +3,5 @@ package chester.tyck import chester.error.TyckProblem given ckToReport(using ck: Tyck): Reporter[TyckProblem] = ck.reporter + +type Tyck = Get[TyckProblem, Unit] diff --git a/tyck/src/main/scala/chester/tyck/convertMeta.scala b/tyck-base/src/main/scala/chester/tyck/convertMeta.scala similarity index 100% rename from tyck/src/main/scala/chester/tyck/convertMeta.scala rename to tyck-base/src/main/scala/chester/tyck/convertMeta.scala diff --git a/tyck/src/main/scala/chester/utils/propagator/CommonPropagator.scala b/tyck-base/src/main/scala/chester/utils/propagator/CommonPropagator.scala similarity index 100% rename from tyck/src/main/scala/chester/utils/propagator/CommonPropagator.scala rename to tyck-base/src/main/scala/chester/utils/propagator/CommonPropagator.scala diff --git a/tyck/src/main/scala/chester/utils/propagator/ProvideCellId.scala b/tyck-base/src/main/scala/chester/utils/propagator/ProvideCellId.scala similarity index 100% rename from tyck/src/main/scala/chester/utils/propagator/ProvideCellId.scala rename to tyck-base/src/main/scala/chester/utils/propagator/ProvideCellId.scala diff --git a/tyck/src/main/scala/chester/utils/propagator/ProvideImmutable.scala b/tyck-base/src/main/scala/chester/utils/propagator/ProvideImmutable.scala similarity index 100% rename from tyck/src/main/scala/chester/utils/propagator/ProvideImmutable.scala rename to tyck-base/src/main/scala/chester/utils/propagator/ProvideImmutable.scala diff --git a/tyck/src/main/scala/chester/utils/propagator/ProvideImpl.scala b/tyck-base/src/main/scala/chester/utils/propagator/ProvideImpl.scala similarity index 100% rename from tyck/src/main/scala/chester/utils/propagator/ProvideImpl.scala rename to tyck-base/src/main/scala/chester/utils/propagator/ProvideImpl.scala diff --git a/tyck/src/main/scala/chester/utils/propagator/ProvideMultithread.scala b/tyck-base/src/main/scala/chester/utils/propagator/ProvideMultithread.scala similarity index 100% rename from tyck/src/main/scala/chester/utils/propagator/ProvideMultithread.scala rename to tyck-base/src/main/scala/chester/utils/propagator/ProvideMultithread.scala diff --git a/tyck/src/main/scala/chester/utils/propagator/ProvideMutable.scala b/tyck-base/src/main/scala/chester/utils/propagator/ProvideMutable.scala similarity index 100% rename from tyck/src/main/scala/chester/utils/propagator/ProvideMutable.scala rename to tyck-base/src/main/scala/chester/utils/propagator/ProvideMutable.scala diff --git a/tyck/src/main/scala/chester/tyck/Elaborater.scala b/tyck/src/main/scala/chester/tyck/Elaborater.scala index dfb57f22d..9627b4e8d 100644 --- a/tyck/src/main/scala/chester/tyck/Elaborater.scala +++ b/tyck/src/main/scala/chester/tyck/Elaborater.scala @@ -12,8 +12,6 @@ import scala.language.implicitConversions import scala.util.boundary import scala.util.boundary.break -type Tyck = Get[TyckProblem, Unit] - trait Elaborater extends ProvideCtx with ElaboraterCommon { def checkType(expr: Expr)(using