diff options
| author | John Estabrook <jestabro@vyos.io> | 2023-03-29 09:46:52 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-03-29 09:46:52 -0500 |
| commit | 137d7c3f977f6d1870feb1d99c02bedda151d819 (patch) | |
| tree | 760ce8e1a91ec67ae5fb8bba2d0397830f5c2767 | |
| parent | 020716d9823a76b674ff0c820b278e10e32d686f (diff) | |
| parent | d2f1a6514300bd946acc8ea89f23b15dc06c8bc0 (diff) | |
| download | libvyosconfig-137d7c3f977f6d1870feb1d99c02bedda151d819.tar.gz libvyosconfig-137d7c3f977f6d1870feb1d99c02bedda151d819.zip | |
Merge pull request #9 from jestabro/tree-union
T5089: bindings for configtree union and optional arg ord_val (ordered_values)
| -rw-r--r-- | lib/bindings.ml | 16 |
1 files changed, 13 insertions, 3 deletions
diff --git a/lib/bindings.ml b/lib/bindings.ml index 7f6cb76..37be3a2 100644 --- a/lib/bindings.ml +++ b/lib/bindings.ml @@ -37,8 +37,8 @@ let from_string s = let get_error () = !error_message -let render_config c_ptr = - CT.render_config (Root.get c_ptr) +let render_config c_ptr ord_val = + CT.render_config ~ord_val:ord_val (Root.get c_ptr) let render_json c_ptr = CT.render_json (Root.get c_ptr) @@ -201,6 +201,15 @@ let show_diff cmds path c_ptr_l c_ptr_r = | CD.Incommensurable -> error_message := "Incommensurable"; "#1@" | CD.Empty_comparison -> error_message := "Empty comparison"; "#1@" +let tree_union c_ptr_l c_ptr_r = + let ct_l = Root.get c_ptr_l in + let ct_r = Root.get c_ptr_r in + try + let ct_ret = CD.tree_union ct_l ct_r in + Ctypes.Root.create ct_ret + with + CD.Nonexistent_child -> error_message := "Nonexistent child"; Ctypes.null + module Stubs(I : Cstubs_inverted.INTERNAL) = struct @@ -208,7 +217,7 @@ struct let () = I.internal "destroy" ((ptr void) @-> returning void) destroy let () = I.internal "from_string" (string @-> returning (ptr void)) from_string let () = I.internal "get_error" (void @-> returning string) get_error - let () = I.internal "to_string" ((ptr void) @-> returning string) render_config + let () = I.internal "to_string" ((ptr void) @-> bool @-> returning string) render_config let () = I.internal "to_json" ((ptr void) @-> returning string) render_json let () = I.internal "to_json_ast" ((ptr void) @-> returning string) render_json_ast let () = I.internal "to_commands" ((ptr void) @-> string @-> returning string) render_commands @@ -229,4 +238,5 @@ struct let () = I.internal "diff_tree" (string @-> (ptr void) @-> (ptr void) @-> returning (ptr void)) diff_tree let () = I.internal "trim_tree" ((ptr void) @-> (ptr void) @-> returning (ptr void)) trim_tree let () = I.internal "show_diff" (bool @-> string @-> (ptr void) @-> (ptr void) @-> returning string) show_diff + let () = I.internal "tree_union" ((ptr void) @-> (ptr void) @-> returning (ptr void)) tree_union end |