From d6be2bce0689b10f3964c277a939d198d0f4a2cb Mon Sep 17 00:00:00 2001
From: Daniil Baturin <daniil@baturin.org>
Date: Fri, 13 Feb 2015 21:56:14 +0600
Subject: Shorter vyconf tree module name.

---
 src/vyconf_tree.ml | 73 ------------------------------------------------------
 src/vytree.ml      | 73 ++++++++++++++++++++++++++++++++++++++++++++++++++++++
 2 files changed, 73 insertions(+), 73 deletions(-)
 delete mode 100644 src/vyconf_tree.ml
 create mode 100644 src/vytree.ml

diff --git a/src/vyconf_tree.ml b/src/vyconf_tree.ml
deleted file mode 100644
index 71a7272..0000000
--- a/src/vyconf_tree.ml
+++ /dev/null
@@ -1,73 +0,0 @@
-type 'a	vyconf_tree = {
-    name: string;
-    data: 'a;
-    children: 'a vyconf_tree list
-}
-
-exception Empty_path
-exception Duplicate_child
-exception Nonexistent_path
-
-let make name data = { name = name; data = data; children = [] }
-
-let rec find_child_in_list children name =
-    match children with
-    | [] -> None
-    | c :: cs -> if c.name = name then (Some c)
-                 else find_child_in_list cs name
-
-let rec remove_child_from_list children name =
-    match children with
-    | [] -> []
-    | c :: cs -> if c.name = name then cs
-                 else c :: (remove_child_from_list cs name)
-
-let rec replace_child_in_list children child =
-    match children with
-    | [] -> []
-    | c :: cs -> if c.name = child.name then child :: cs
-                 else replace_child_in_list cs child
-
-let extract_child children name =
-    find_child_in_list children name,
-    remove_child_from_list children name
-
-let insert_immediate_child node name data =
-    let new_node = make name data in
-    let children' = node.children @ [new_node] in
-    { node with children = children' }
-
-let adopt_child node child =
-    { node with children = (node.children @ [child]) }
-
-let replace_child node child =
-    let children = node.children in
-    let children' = replace_child_in_list children child in
-    { node with children = children' }
-
-let find_child node name =
-    find_child_in_list node.children name
-
-let rec extract_names children =
-    match children with
-    | [] -> []
-    | c :: cs -> c.name :: extract_names cs
-
-let list_children node =
-    extract_names node.children
-
-let rec insert_child default_data node path data =
-    match path with
-    | [] -> raise Empty_path
-    | [name] -> insert_immediate_child node name data
-    | name :: names ->
-        let next_child = find_child node name in
-        match next_child with
-        | Some next_child' ->
-            let new_node = insert_child default_data next_child' names data in
-            if names = [] then raise Duplicate_child
-            else replace_child node new_node
-        | None ->
-            let next_child' = make name default_data in
-            let new_node = insert_child default_data next_child' names data in
-            adopt_child node new_node
diff --git a/src/vytree.ml b/src/vytree.ml
new file mode 100644
index 0000000..71a7272
--- /dev/null
+++ b/src/vytree.ml
@@ -0,0 +1,73 @@
+type 'a	vyconf_tree = {
+    name: string;
+    data: 'a;
+    children: 'a vyconf_tree list
+}
+
+exception Empty_path
+exception Duplicate_child
+exception Nonexistent_path
+
+let make name data = { name = name; data = data; children = [] }
+
+let rec find_child_in_list children name =
+    match children with
+    | [] -> None
+    | c :: cs -> if c.name = name then (Some c)
+                 else find_child_in_list cs name
+
+let rec remove_child_from_list children name =
+    match children with
+    | [] -> []
+    | c :: cs -> if c.name = name then cs
+                 else c :: (remove_child_from_list cs name)
+
+let rec replace_child_in_list children child =
+    match children with
+    | [] -> []
+    | c :: cs -> if c.name = child.name then child :: cs
+                 else replace_child_in_list cs child
+
+let extract_child children name =
+    find_child_in_list children name,
+    remove_child_from_list children name
+
+let insert_immediate_child node name data =
+    let new_node = make name data in
+    let children' = node.children @ [new_node] in
+    { node with children = children' }
+
+let adopt_child node child =
+    { node with children = (node.children @ [child]) }
+
+let replace_child node child =
+    let children = node.children in
+    let children' = replace_child_in_list children child in
+    { node with children = children' }
+
+let find_child node name =
+    find_child_in_list node.children name
+
+let rec extract_names children =
+    match children with
+    | [] -> []
+    | c :: cs -> c.name :: extract_names cs
+
+let list_children node =
+    extract_names node.children
+
+let rec insert_child default_data node path data =
+    match path with
+    | [] -> raise Empty_path
+    | [name] -> insert_immediate_child node name data
+    | name :: names ->
+        let next_child = find_child node name in
+        match next_child with
+        | Some next_child' ->
+            let new_node = insert_child default_data next_child' names data in
+            if names = [] then raise Duplicate_child
+            else replace_child node new_node
+        | None ->
+            let next_child' = make name default_data in
+            let new_node = insert_child default_data next_child' names data in
+            adopt_child node new_node
-- 
cgit v1.2.3