3 files changed, 24 insertions, 24 deletions

diff --git a/src/vytree.ml b/src/vytree.ml
index 16cb379..8cc6fc5 100644
--- a/src/vytree.ml
+++ b/src/vytree.ml
@@ -12,16 +12,16 @@ exception Empty_path
 exception Duplicate_child
 exception Nonexistent_path
 
-let make name data = { name = name; data = data; children = [] }
+let make data name = { name = name; data = data; children = [] }
 
-let make_full name data children = { name = name; data = data; children = children }
+let make_full data name children = { name = name; data = data; children = children }
 
 let name_of_node node = node.name
 let data_of_node node = node.data
 let children_of_node node = node.children
 
 let insert_immediate node name data =
-    let new_node = make name data in
+    let new_node = make data name in
     let children' = new_node :: node.children in
     { node with children = children' }
 
@@ -77,7 +77,7 @@ let rec insert default_data node path data =
             let new_node = insert default_data next_child' names data in
             replace node new_node
         | None ->
-            let next_child' = make name default_data in
+            let next_child' = make default_data name in
             let new_node = insert default_data next_child' names data in
             adopt node new_node
 
diff --git a/src/vytree.mli b/src/vytree.mli
index fbe7ac1..e990d1d 100644
--- a/src/vytree.mli
+++ b/src/vytree.mli
@@ -4,8 +4,8 @@ exception Empty_path
 exception Duplicate_child
 exception Nonexistent_path
 
-val make : string -> 'a -> 'a t
-val make_full : string -> 'a -> ('a t) list -> 'a t
+val make : 'a -> string -> 'a t
+val make_full : 'a -> string -> ('a t) list -> 'a t
 
 val name_of_node : 'a t -> string
 val data_of_node : 'a t -> 'a
diff --git a/test/vyconf_tree_test.ml b/test/vyconf_tree_test.ml
index 3d8c52a..14dd14b 100644
--- a/test/vyconf_tree_test.ml
+++ b/test/vyconf_tree_test.ml
@@ -4,7 +4,7 @@ open Vytree
 (* Destructuting a freshly made node gives us what
    we made it from *)
 let test_make_node test_ctxt =
-    let node = make "root" () in
+    let node = make () "root" in
     assert_equal (name_of_node node) "root";
     assert_equal (data_of_node node) ();
     assert_equal (children_of_node node) []
@@ -16,53 +16,53 @@ let test_make_node test_ctxt =
 (* Inserting at single-item path adds a child to
    children list *)
 let test_insert_immediate_child test_ctxt =
-    let node = make "root" () in
+    let node = make () "root" in
     let node' = insert () node ["foo"] () in
     assert_equal (children_of_node node')
-                 [make "foo" ()]
+                 [make () "foo"]
 
 (* Inserting one child after another adds it to the
    end of the children list *)
 let test_insert_multiple_children test_ctxt =
-    let node = make "root" () in
+    let node = make () "root" in
     let node' = insert () node ["foo"] () in
     let node'' = insert () node' ["bar"] () in
     assert_equal (children_of_node node'')
-                 [make "bar" (); make "foo" ()]
+                 [make () "bar"; make () "foo"]
 
 (* Inserting a child at a two-item path creates a tree
    two levels deep *)
 let test_insert_multi_level test_ctxt =
-    let node = make "root" () in
+    let node = make () "root" in
     let node' = insert () node ["foo"; "bar"] () in
-    let bar = make "bar" () in
-    let foo = make_full "foo" () [bar] in
-    let root = make_full "root" () [foo] in
+    let bar = make () "bar" in
+    let foo = make_full () "foo" [bar] in
+    let root = make_full () "root" [foo] in
     assert_equal root node'
 
 (* Inserting duplicate child fails *)
 let test_insert_duplicate_child test_ctxt =
-    let node = make "root" () in
+    let node = make () "root" in
     let node' = insert () node ["foo"] () in
     assert_raises Duplicate_child (fun () -> insert () node' ["foo"] ())
 
 (* list_children correctly returns a list of children names *)
 let test_list_children test_ctxt =
-    let node = make "root" () in
+    let node = make () "root" in
     let node' = insert () node ["foo"] () in
     let node'' = insert () node' ["bar"] () in
     assert_equal (list_children node'') ["bar"; "foo"]
 
 (* Deleting a child, well, deletes it *)
 let test_delete_immediate_child test_ctxt =
-    let node = make "root" () in
+    let node = make () "root" in
     let node' = insert () node ["foo"] () in
     let node'' = delete node' ["foo"] in
     assert_equal node node''
 
 (* Deleting a child at multi-level path works *)
 let test_delete_multi_level test_ctxt =
-    let node = make "root" () in
+    let node = make () "root" in
     let node' = insert () node ["foo"; "bar"] () in
     let foo_node = insert () node ["foo"] () in
     let node'' = delete node' ["foo"; "bar"] in
@@ -70,29 +70,29 @@ let test_delete_multi_level test_ctxt =
 
 (* Attempt to delete a node at non-existent path raises an exception *)
 let test_delete_nonexistent test_ctxt =
-    let node = make "root" () in
+    let node = make () "root" in
     assert_raises Nonexistent_path (fun () -> delete node ["foo"; "bar"])
 
 (* get_child works with immediate children *)
 let test_get_immediate_child test_ctxt =
-    let node = make "root" () in
+    let node = make () "root" in
     let node' = insert () node ["foo"] () in
     assert_equal (name_of_node (get node' ["foo"])) "foo"
 
 (* get_child works with multi-level paths *)
 let test_get_child_multilevel test_ctxt =
-    let node = make "root" () in
+    let node = make () "root" in
     let node' = insert () node ["foo"; "bar"] () in
     assert_equal (name_of_node (get node' ["foo"; "bar"])) "bar"
 
 (* get_child raises Nonexistent_path for non-existent paths *)
 let test_get_child_nonexistent test_ctxt =
-    let node = make "root" () in
+    let node = make () "root" in
     assert_raises Nonexistent_path (fun () -> get node ["foo"; "bar"])
 
 (* update works *)
 let test_update test_ctxt =
-    let node = make "root" 0 in
+    let node = make 0 "root" in
     let node = insert 0 node ["foo"] 1 in
     assert_equal (data_of_node (get (update node ["foo"] 9) ["foo"])) 9