digital-asset/daml
1
1
Fork 0
mirror of https://github.com/digital-asset/daml.git synced 2024-09-20 09:17:43 +03:00
Code Issues Projects Releases Wiki Activity

[LF] fix encoder for ELocation (#15070)

Browse Source 
* [LF] fix encoder for ELocation

CHANGELOG_BEGIN
CHANGELOG_END
This commit is contained in:
Remy 2022-09-23 12:28:21 +02:00 committed by GitHub
parent 39fe2eaca2
commit a1e92e539f
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 13 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
daml-lf/encoder/src/main/scala/com/digitalasset/daml/lf/archive/testing/EncodeV1.scala
View File

@ -525,8 +525,10 @@ private[daml] class EncodeV1(minor: LV.Minor) {
binder -> body
})
private def encodeExprBuilder(expr0: Expr): PLF.Expr.Builder = {
val builder = PLF.Expr.newBuilder()
private def encodeExprBuilder(
expr0: Expr,
builder: PLF.Expr.Builder = PLF.Expr.newBuilder(),
): PLF.Expr.Builder = {
// EAbss breaks the exhaustiveness checker.
(expr0: @unchecked) match {
@ -630,7 +632,7 @@ private[daml] class EncodeV1(minor: LV.Minor) {
case ESome(typ, x) =>
builder.setOptionalSome(PLF.Expr.OptionalSome.newBuilder().setType(typ).setBody(x))
case ELocation(loc, expr) =>
encodeExprBuilder(expr).setLocation(loc)
encodeExprBuilder(expr, builder).setLocation(loc)
case EUpdate(u) =>
builder.setUpdate(u)
case EScenario(s) =>

13
daml-lf/encoder/src/test/scala/com/digitalasset/daml/lf/archive/testing/EncodeV1Spec.scala
View File

@ -89,10 +89,10 @@ class EncodeV1Spec extends AnyWordSpec with Matchers with TableDrivenPropertyChe
record Tree.Node (a: *) = { value: a, left : Mod:Tree a, right : Mod:Tree a };
enum Color = Red | Green | Blue;
val unit: Unit = loc(Mod, unit, 92, 12, 92, 61) ();
val aVar: forall (a:*). a -> a = /\ (a: *). \ (x: a) -> x;
val aValue: forall (a:*). a -> a = Mod:aVar;
val aBuiltin : Int64 -> Int64 -> Int64 = ADD_INT64;
val unit: Unit = ();
val myFalse: Bool = False;
val myTrue: Bool = True;
val aInt: Int64 = 14;
@ -263,13 +263,16 @@ object EncodeV1Spec {
private def normalize(pkg: Package, hashCode: PackageId, selfPackageId: PackageId): Package = {
val replacePkId: PartialFunction[Identifier, Identifier] = {
val identifierRule: PartialFunction[Identifier, Identifier] = {
case Identifier(`hashCode`, name) => Identifier(selfPackageId, name)
}
lazy val dropEAbsRef: PartialFunction[Expr, Expr] = { case EAbs(binder, body, Some(_)) =>
EAbs(normalizer.apply(binder), normalizer.apply(body), None)
lazy val exprRule: PartialFunction[Expr, Expr] = {
case EAbs(binder, body, Some(_)) =>
EAbs(normalizer.apply(binder), normalizer.apply(body), None)
case ELocation(loc, expr) if loc.packageId == hashCode =>
ELocation(loc = loc.copy(packageId = pkgId), normalizer.apply(expr))
}
lazy val normalizer = new AstRewriter(exprRule = dropEAbsRef, identifierRule = replacePkId)
lazy val normalizer = new AstRewriter(exprRule = exprRule, identifierRule = identifierRule)
normalizer.apply(pkg)
}