diff --git a/dhall/common.dhall b/dhall/common.dhall index 432790a..0283bb6 100644 --- a/dhall/common.dhall +++ b/dhall/common.dhall @@ -90,17 +90,31 @@ let mRngYMD = let PartEntry = { _1 : T.AcntID, _2 : Double, _3 : Text } -let partN = +let partNFrom = \(ss : List PartEntry) -> let toEntry = \(x : PartEntry) -> - nullEntry - (T.EntryAcntGetter.ConstT x._1) - (T.EntryNumGetter.ConstN x._2) - // { eComment = x._3 } + T.FromEntryGetter::{ + , eAcnt = T.EntryAcntGetter.ConstT x._1 + , eValue = T.EntryNumGetter.ConstN x._2 + , eComment = x._3 + } in List/map PartEntry T.FromEntryGetter.Type toEntry ss +let partNTo = + \(ss : List PartEntry) -> + let toEntry = + \(x : PartEntry) -> + T.ToEntryGetter::{ + , eAcnt = T.EntryAcntGetter.ConstT x._1 + , eValue = + T.LinkedEntryNumGetter.Getter (T.EntryNumGetter.ConstN x._2) + , eComment = x._3 + } + + in List/map PartEntry T.ToEntryGetter.Type toEntry ss + let addDay = \(x : T.GregorianM) -> \(d : Natural) -> @@ -143,7 +157,8 @@ in { nullEntry , match1 , greg , gregM - , partN + , partNFrom + , partNTo , addDay , comma = 44 , tab = 9