diff options
| author | ยท๐๐ด๐๐๐ฉ๐ค | 2025-12-10 21:31:45 +0000 |
|---|---|---|
| committer | ยท๐๐ด๐๐๐ฉ๐ค | 2025-12-10 21:31:45 +0000 |
| commit | 62248406c512018dcdaa230c28ade5866577a9fc (patch) | |
| tree | f25045571470298bb51a3b4e9e8b571a58fa14ff | |
| parent | 6596fc3b69e06792753a92ff6538155741b2a55e (diff) | |
| download | nixtaml-62248406c512018dcdaa230c28ade5866577a9fc.tar nixtaml-62248406c512018dcdaa230c28ade5866577a9fc.tar.gz nixtaml-62248406c512018dcdaa230c28ade5866577a9fc.tar.bz2 nixtaml-62248406c512018dcdaa230c28ade5866577a9fc.tar.lz nixtaml-62248406c512018dcdaa230c28ade5866577a9fc.tar.xz nixtaml-62248406c512018dcdaa230c28ade5866577a9fc.tar.zst nixtaml-62248406c512018dcdaa230c28ade5866577a9fc.zip | |
Pijul fix reference
| -rw-r--r-- | lib/manifest.ml | 25 |
1 files changed, 11 insertions, 14 deletions
diff --git a/lib/manifest.ml b/lib/manifest.ml index 8b8c4f7..a61f921 100644 --- a/lib/manifest.ml +++ b/lib/manifest.ml @@ -299,21 +299,21 @@ module Pijul = struct type t = Input.Pijul.Reference.t [@@deriving show, eq, qcheck] - let codec : t Util.KDL.node_codec = { - to_node = (fun ref -> + let codec : t Util.KDL.codec = { + to_kdl = (fun ref -> let open Kdl in match ref with - | `Channel c -> Kdl.node "channel" ~args: [arg (`String c)] [] - | `State s -> Kdl.node "state" ~args: [arg (`String s)] [] - | `Change c -> Kdl.node "change" ~args: [arg (`String c)] [] + | `Channel c -> [Kdl.node "channel" ~args: [arg (`String c)] []] + | `State s -> [Kdl.node "state" ~args: [arg (`String s)] []] + | `Change c -> [Kdl.node "change" ~args: [arg (`String c)] []] ); - of_node = (fun kdl -> + of_kdl = (fun kdl -> let open Util.KDL.L in let open Util.KDL.Valid in let node_names = ["channel"; "state"; "change"] - and channel = ll @@ kdl.@(child "channel" // arg 0 // string_value) - and state = ll @@ kdl.@(child "state" // arg 0 // string_value) - and change = ll @@ kdl.@(child "change" // arg 0 // string_value) + and channel = ll @@ kdl.@(node "channel" // arg 0 // string_value) + and state = ll @@ kdl.@(node "state" // arg 0 // string_value) + and change = ll @@ kdl.@(node "change" // arg 0 // string_value) in match channel, state, change with | Ok c, Error _, Error _ -> Ok (`Channel c) @@ -344,10 +344,7 @@ module Pijul = struct let remote = node "remote" ~args: [Template.to_arg pijul.remote] [] and nodes = - match pijul.reference with - | `Channel c -> [Kdl.node "channel" ~args: [arg (`String c)] []] - | `State c -> [Kdl.node "state" ~args: [arg (`String c)] []] - | `Change c -> [Kdl.node "change" ~args: [arg (`String c)] []] + Reference.codec.to_kdl pijul.reference in let nodes = if List.is_empty pijul.mirrors then @@ -364,7 +361,7 @@ module Pijul = struct let* pijul = ll @@ kdl.@(node "pijul") in let+ remote = Template.of_child ~name: "remote" pijul and+ mirrors = Template.of_mirrors pijul - and+ reference = Reference.codec.of_node pijul + and+ reference = Reference.codec.of_kdl pijul.children in {remote; mirrors; reference} ); |