Implement add_node and add_value methods

3 files changed, 32 insertions, 15 deletions

diff --git a/lib/Config/Tree.pm b/lib/Config/Tree.pm
index 39e0de9..f22d8e5 100644
--- a/lib/Config/Tree.pm
+++ b/lib/Config/Tree.pm
@@ -509,3 +509,3 @@ sub _get_section_synt {
 sub add_node {
-    my ($self, $path, $v, $locus) = @_;
+    my ($self, $path, $node) = @_;
 
@@ -516,5 +516,6 @@ sub add_node {
     my $kw = $self->{_parameters} // { '*' => '*' };
-    my $node = $self->tree;
+    my $tree = $self->tree;
     my $pn = $#{$path};
     my $name;
+    my $locus = $node->locus;
     for (my $i = 0; $i < $pn; $i++) {
@@ -522,3 +523,3 @@ sub add_node {
         
-        unless ($node->is_section) {
+        unless ($tree->is_section) {
             $self->error(join('.', @{$path}[0..$i]) . ": not a section");
@@ -535,6 +536,6 @@ sub add_node {
 
-        if (my $subtree = $node->subtree($name)) {
-            $node = $subtree;
+        if (my $subtree = $tree->subtree($name)) {
+            $tree = $subtree;
         } else {
-            $node = $node->subtree(
+            $tree = $tree->subtree(
                 $name => new Config::Tree::Node::Section(
@@ -555,2 +556,14 @@ sub add_node {
 
+    if ($node->is_section) {
+        if ($tree->has_key($name)) {
+            $tree->locus->add($locus);
+            $tree->subtree($name)->merge($node);
+        } else {
+            $tree->subtree($name => $node);
+        }
+        return $node;
+    }
+
+    my $v = $node->value;
+    
     if (ref($x) eq 'HASH') {
@@ -558,5 +571,5 @@ sub add_node {
         my $prev_val;
-        if ($node->has_key($name)) {
+        if ($tree->has_key($name)) {
             # FIXME: is_value?
-            $prev_val = $node->subtree($name)->value;
+            $prev_val = $tree->subtree($name)->value;
         }
@@ -587,11 +600,9 @@ sub add_node {
 
-    $node->locus->add($locus->clone);
+    $tree->locus->add($locus->clone);
 
     my $newnode;
-    if ($newnode = $node->subtree($name)) {
+    if ($newnode = $tree->subtree($name)) {
         $newnode->locus->add($locus);
     } else {
-        $newnode = $node->subtree(
-                    $name => new Config::Tree::Node::Value(locus => $locus)
-            );
+        $newnode = $tree->subtree($name => $node);
     }
@@ -602,2 +613,8 @@ sub add_node {
 
+sub add_value {
+    my ($self, $path, $value, $locus) = @_;
+    $self->add_node($path, new Config::Tree::Node::Value(value => $value,
+                                                         locus => $locus));
+}
+
 sub commit {
diff --git a/t/TestConfig.pm b/t/TestConfig.pm
index de1ade9..847ff0c 100644
--- a/t/TestConfig.pm
+++ b/t/TestConfig.pm
@@ -21,3 +21,3 @@ sub new {
 #    while (my ($k,$v) = each %$config) {
-        $self->add_node($k, $v, new Config::Tree::Locus('input', $i++));
+        $self->add_value($k, $v, new Config::Tree::Locus('input', $i++));
     }
diff --git a/t/conf11.t b/t/conf11.t
index 13516b8..07a94cf 100644
--- a/t/conf11.t
+++ b/t/conf11.t
@@ -14,3 +14,3 @@ my $cfg = new TestConfig(
     );
-ok(join(',', $cfg->getnode('core')->keys), 'retain-interval,tempdir');
+ok(join(',', sort $cfg->getnode('core')->keys), 'retain-interval,tempdir');
 ok($cfg->getnode('core')->keys, 2);