Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

accept standard hlists as record/variant specs #14167

Merged
merged 15 commits into from
Jun 16, 2022
Merged

accept standard hlists as record/variant specs #14167

Changes from 1 commit
Commits
Show all changes
15 commits
Select commit Hold shift + click to select a range
132b6c0
prototype for accepting standard hlists as record/variant specs
S11001001 Jun 13, 2022
183e641
pass the field ValueAddends in
S11001001 Jun 13, 2022
aecd735
the steps themselves are internally consistent
S11001001 Jun 13, 2022
0072f9e
not quite so consistent
S11001001 Jun 13, 2022
0eee17a
replace RecVarSpec with new experimental example
S11001001 Jun 13, 2022
b2d1038
fix examples to work with new syntax
S11001001 Jun 13, 2022
b993be3
RNil alias for HNil; everything compiles
S11001001 Jun 13, 2022
20a7ff5
port to the record macro syntax
S11001001 Jun 13, 2022
43508c0
make HNil work, port remaining HashSpec records
S11001001 Jun 13, 2022
f21f1f3
a couple smaller specs
S11001001 Jun 13, 2022
6e596f9
better todo
S11001001 Jun 13, 2022
c267330
rename some variables to remove artifacts from old implementation
S11001001 Jun 15, 2022
7c2aa01
link to #14189
S11001001 Jun 15, 2022
5a2e1ce
Merge commit '7a4fc9f5fe9d028963bb697fdbae09684623d0c3' into 13356-tv…
S11001001 Jun 15, 2022
c5cf189
expand abbrev in example docs
S11001001 Jun 16, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
not quite so consistent
  • Loading branch information
@S11001001
S11001001 committed Jun 13, 2022
commit 0072f9e80b712196154f943660eb7993c4b01737
153 changes: 77 additions & 76 deletions daml-lf/transaction-test-lib/src/main/scala/lf/value/test/TypedValueGenerators.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -404,95 +404,96 @@ object TypedValueGenerators {
TL: RVS[Tl],
): Aux[(KS :->>: ValueAddend.Aux[
KT
]) :: Tl, (KS :->>: KT) :: TL.HRec, (KS :->>: KT) :+: TL.HVar] = new RVS {
type HRec = (KS :->>: KT) :: TL.HRec
type HVar = (KS :->>: KT) :+: TL.HVar
private[this] val fname = Ref.Name assertFromString ev.value.name
override def configure(in: (KS :->>: ValueAddend.Aux[KT]) :: Tl) = new Rules {
private[this] val h :: selfT = in
private[this] val self = TL configure selfT
type K = KS

override val t = (fname, h.t) :: self.t

override def injRec(v: HRec) =
h.inj(v.head) :: self.injRec(v.tail)

override def prjRec(v: ImmArray[(_, Value)]) = v match {
case ImmArrayCons(vh, vt) =>
for {
pvh <- h.prj(vh._2)
pvt <- self.prjRec(vt)
} yield field[K](pvh) :: pvt
case _ => None
}
]) :: Tl, (KS :->>: KT) :: TL.HRec, (KS :->>: KT) :+: TL.HVar] =
new RVS[(KS :->>: ValueAddend.Aux[KT]) :: Tl] {
type HRec = (KS :->>: KT) :: TL.HRec
type HVar = (KS :->>: KT) :+: TL.HVar
private[this] val fname = Ref.Name assertFromString ev.value.name
override def configure(in: (KS :->>: ValueAddend.Aux[KT]) :: Tl) = new Rules {
private[this] val h :: selfT = in
private[this] val self = TL configure selfT
type K = KS

override val t = (fname, h.t) :: self.t

override def injRec(v: HRec) =
h.inj(v.head) :: self.injRec(v.tail)

override def prjRec(v: ImmArray[(_, Value)]) = v match {
case ImmArrayCons(vh, vt) =>
for {
pvh <- h.prj(vh._2)
pvt <- self.prjRec(vt)
} yield field[K](pvh) :: pvt
case _ => None
}

override def record = {
import h.{injord => hord}, self.{record => tailord}
Order.orderBy { case ah :: at => (ah: h.Inj, at) }
}
override def record = {
import h.{injord => hord}, self.{record => tailord}
Order.orderBy { case ah :: at => (ah: h.Inj, at) }
}

override def recarb = {
import self.{recarb => tailarb}, h.{injarb => headarb}
Arbitrary(arbitrary[(h.Inj, self.HRec)] map { case (vh, vt) =>
field[K](vh) :: vt
})
}
override def recarb = {
import self.{recarb => tailarb}, h.{injarb => headarb}
Arbitrary(arbitrary[(h.Inj, TL.HRec)] map { case (vh, vt) =>
field[K](vh) :: vt
})
}

override def recshrink: Shrink[HRec] = {
import h.{injshrink => hshrink}, self.{recshrink => tshrink}
Shrink { case vh :: vt =>
(Shrink.shrink(vh: h.Inj) zip Shrink.shrink(vt)) map { case (nh, nt) =>
field[K](nh) :: nt
override def recshrink: Shrink[HRec] = {
import h.{injshrink => hshrink}, self.{recshrink => tshrink}
Shrink { case vh :: vt =>
(Shrink.shrink(vh: h.Inj) zip Shrink.shrink(vt)) map { case (nh, nt) =>
field[K](nh) :: nt
}
}
}
}

override def injVar(v: HVar) = v match {
case Inl(hv) => (fname, h.inj(hv))
case Inr(tl) => self.injVar(tl)
}
override def injVar(v: HVar) = v match {
case Inl(hv) => (fname, h.inj(hv))
case Inr(tl) => self.injVar(tl)
}

override val prjVar = {
val r = self.prjVar transform { (_, tf) => tv: Value => tf(tv) map (Inr(_)) }
r.updated(
fname,
(hv: Value) => h.prj(hv) map (pv => Inl(field[K](pv))),
)
}
override val prjVar: Map[Ref.Name, Value => PrjResult] = {
val r = self.prjVar transform { (_, tf) => tv: Value => tf(tv) map (Inr(_)) }
r.updated(
fname,
(hv: Value) => h.prj(hv) map (pv => Inl(field[K](pv))),
)
}

override def varord =
(a, b) =>
(a, b) match {
case (Inr(at), Inr(bt)) => self.varord.order(at, bt)
case (Inl(_), Inr(_)) => Ordering.LT
case (Inr(_), Inl(_)) => Ordering.GT
case (Inl(ah), Inl(bh)) => h.injord.order(ah, bh)
}
override def varord =
(a, b) =>
(a, b) match {
case (Inr(at), Inr(bt)) => self.varord.order(at, bt)
case (Inl(_), Inr(_)) => Ordering.LT
case (Inr(_), Inl(_)) => Ordering.GT
case (Inl(ah), Inl(bh)) => h.injord.order(ah, bh)
}

override def vararb: Map[Ref.Name, Gen[HVar]] = {
val r =
self.vararb transform { (_, ta) =>
ta map (Inr(_))
}
r.updated(
fname, {
import h.{injarb => harb}
arbitrary[h.Inj] map (hv => Inl(field[K](hv)))
},
)
}

override def vararb = {
val r =
self.vararb transform { (_, ta) =>
ta map (Inr(_))
override def varshrink = {
val lshr: Shrink[h.Inj] = h.injshrink
val rshr: Shrink[TL.HVar] = self.varshrink
Shrink {
case Inl(hv) => lshr shrink hv map (shv => Inl(field[K](shv)))
case Inr(tl) => rshr shrink tl map (Inr(_))
}
r.updated(
fname, {
import h.{injarb => harb}
arbitrary[h.Inj] map (hv => Inl(field[K](hv)))
},
)
}

override def varshrink = {
val lshr: Shrink[h.Inj] = h.injshrink
val rshr: Shrink[self.HVar] = self.varshrink
Shrink {
case Inl(hv) => lshr shrink hv map (shv => Inl(field[K](shv)))
case Inr(tl) => rshr shrink tl map (Inr(_))
}
}
}
}
}
}

Expand Down