fix

chester-lang · Dec 30, 2024 · 1762b92 · 1762b92
1 parent 8728195
commit 1762b92
Show file tree

Hide file tree

Showing 8 changed files with 26 additions and 13 deletions.
diff --git a/core/src/main/scala/chester/core/parseCheckTAST.scala b/core/src/main/scala/chester/core/parseCheckTAST.scala
@@ -28,7 +28,7 @@ def parseCheckTAST(
         module = DefaultModule,
         ast = BlockTerm(Vector.empty, UnitTerm_(meta = None), meta = None),
         ty = UnitType(meta = None),
-        effects = NoEffect,
+        effects = Effects.Empty,
         problems = SeverityMap.Empty.copy(error = true)
       )
   }

diff --git a/platform0/jvm-native/src/test/scala/chester/tyck/FilesTyckTest.scala b/platform0/jvm-native/src/test/scala/chester/tyck/FilesTyckTest.scala
@@ -27,8 +27,16 @@ class FilesTyckTest extends FunSuite {
             case TyckResult.Success(result, _, _) =>
               if (result.collectMeta.isEmpty) {
                 println(s"Testing read/write for $inputFile")
-                assertEquals(read[Judge](write[Judge](result)), result)
-                assertEquals(readBinary[Judge](writeBinary[Judge](result)), result)
+                assertEquals(StringPrinter.render(read[Judge](write[Judge](result)))(using
+                  PrettierOptions.Default
+                ), StringPrinter.render(result)(using
+                  PrettierOptions.Default
+                ))
+                assertEquals(StringPrinter.render(readBinary[Judge](writeBinary[Judge](result)))(using
+                  PrettierOptions.Default
+                ),  StringPrinter.render(result)(using
+                  PrettierOptions.Default
+                ))
                 assertEquals(
                   StringPrinter.render(convertToSimple(result.wellTyped))(using
                     PrettierOptions.Default

diff --git a/syntax/jvm/src/main/scala/chester/syntax/core/truffle.scala b/syntax/jvm/src/main/scala/chester/syntax/core/truffle.scala
@@ -250,7 +250,7 @@ object truffle {
   case class FunctionType(
       @const telescope: Vector[TelescopeTerm],
       @child var resultTy: Term,
-      @const effects: EffectsM = NoEffect,
+      @const effects: EffectsM = Effects.Empty,
       @const meta: OptionTermMeta
   ) extends WHNF
       with FunctionTypeC[Term] {
@@ -314,6 +314,9 @@ object truffle {
     override type ThisTree = Effects
     override def cons: EffectsF[Term, ThisTree] = this.copy
   }
+  object Effects {
+    val Empty = Effects(Map.empty, meta = None)
+  }
   case class ExceptionEffect(@const meta: OptionTermMeta) extends Effect with ExceptionEffectC[Term] {
     override type ThisTree = ExceptionEffect
     override def cons: ExceptionEffectF[Term, ThisTree] = this.copy

diff --git a/syntax/shared/src/main/scala/chester/syntax/core/Judge.scala b/syntax/shared/src/main/scala/chester/syntax/core/Judge.scala
@@ -1,8 +1,10 @@
 package chester.syntax.core
+import chester.doc.const.Docs
 import chester.uniqid.*
+import chester.utils.doc.*
 import upickle.default.*
 
-case class Judge(wellTyped: Term, ty: Term, effects: Effects = NoEffect) extends ContainsUniqid derives ReadWriter {
+case class Judge(wellTyped: Term, ty: Term, effects: Effects = Effects.Empty) extends ContainsUniqid with ToDoc derives ReadWriter {
   def substitute(from: TermWithUniqid, to: Term): Judge = Judge(
     wellTyped.substitute(from, to),
     ty.substitute(from, to),
@@ -27,4 +29,7 @@ case class Judge(wellTyped: Term, ty: Term, effects: Effects = NoEffect) extends
       effects.replaceU(reranger).asInstanceOf[Effects]
     )
   }
+
+  override def toDoc(using options: PrettierOptions): Doc =
+    Docs.`(` <> wellTyped.toDoc <> Docs.`,` <> ty.toDoc <> Docs.`,` <> effects.toDoc <> Docs.`)`
 }
diff --git a/syntax/shared/src/main/scala/chester/syntax/core/simple.scala b/syntax/shared/src/main/scala/chester/syntax/core/simple.scala
@@ -235,13 +235,16 @@ object simple {
   case class FunctionType(
       telescope: Vector[TelescopeTerm],
       resultTy: Term,
-      effects: EffectsM = NoEffect,
+      effects: EffectsM = Effects.Empty,
       meta: OptionTermMeta
   ) extends WHNF
       with FunctionTypeC[Term] {
     override type ThisTree = FunctionType
     override def cons: FunctionTypeF[Term, ThisTree] = FunctionType(_,_,_,_)
   }
+  object Effects {
+    val Empty = Effects(Map.empty, meta = None)
+  }
   case class ObjectClauseValueTerm(
       key: Term,
       value: Term,

diff --git a/syntax/shared/src/main/scala/chester/syntax/core/utils.scala b/syntax/shared/src/main/scala/chester/syntax/core/utils.scala
@@ -26,12 +26,6 @@ object UnitTerm_ {
 
 }
 
-object Effects_ {
-  val Empty: Effects = Effects(HashMap.empty, meta = None)
-}
-
-val NoEffect = Effects_.Empty
-
 object AbstractIntTerm_ {
   def from(value: BigInt, meta: OptionTermMeta): AbstractIntTerm =
     if (value.isValidInt) IntTerm(value.toInt, meta)

diff --git a/tests/tyck/wip.chester → tests/tyck/wip.chester.wip b/tests/tyck/wip.chester → tests/tyck/wip.chester.wip
diff --git a/tyck/src/main/scala/chester/tyck/Elaborater.scala b/tyck/src/main/scala/chester/tyck/Elaborater.scala
@@ -23,7 +23,7 @@ trait Elaborater extends ProvideCtx with ElaboraterCommon {
     // Create a new type cell representing the kind Typeω (the type of types)
     val kindType = literal(Typeω: Term)
 
-    elab(expr, kindType, toEffectsCell(NoEffect))
+    elab(expr, kindType, toEffectsCell(Effects.Empty))
   }
 
   def checkTypeId(expr: Expr)(using