From e31661e7fc10ab0ad2af684318fcede64aefb7b7 Mon Sep 17 00:00:00 2001 From: "nurda@desktop" Date: Mon, 7 Oct 2024 17:11:12 +0800 Subject: [PATCH] resolve merge confilct --- shared/src/main/scala/mlscript/TyperDatatypes.scala | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/shared/src/main/scala/mlscript/TyperDatatypes.scala b/shared/src/main/scala/mlscript/TyperDatatypes.scala index c944521ff..427cda455 100644 --- a/shared/src/main/scala/mlscript/TyperDatatypes.scala +++ b/shared/src/main/scala/mlscript/TyperDatatypes.scala @@ -741,7 +741,7 @@ abstract class TyperDatatypes extends TyperHelpers { Typer: Typer => } else N case (a: TupleType, b: RecordType) if pol => lcg(pol, a.toRecord, b) case (a: RecordType, b: RecordType) => - val default = FieldType(N, if (pol) TopType else BotType)(noProv) + val default = FieldType(N, if (pol) TopType else BotType, false)(noProv) if (b.fields.map(_._1).forall(a.fields.map(_._1).contains)) { val u = a.fields.map { case (v, f) => lcgField(pol, f, b.fields.find(_._1 === v).fold(default)(_._2))