Changeset e428a36

Timestamp:

Jun 14, 2013, 7:39:41 PM (11 years ago)

Author:

David Benjamin <davidben@mit.edu>

Parents:

80c0fc7 (diff), 9d4dfdc (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge 9d4dfdcd2d49dbcc22eb7c50544376042b61a6ba into 80c0fc7442dbbcdb248b6b588246470d35b6f8ec

Files:

• t/variable.t (modified) (5 diffs)
• variable.c (modified) (2 diffs)

t/variable.t

@@ -17 +17 @@
 BarnOwl::unset("-q", "intvar");
 is(BarnOwl::getvar("intvar"), "24", "intvar unset bogus");
+BarnOwl::new_variable_int("intvar", { default => 7 });
+isnt(BarnOwl::getvar("intvar"), "7", "intvar reinit shouldn't override preexisting value");
 
 BarnOwl::new_variable_bool("boolvar", { default => 1 });
@@ -28 +30 @@
 BarnOwl::unset("-q", "boolvar");
 is(BarnOwl::getvar("boolvar"), "off", "boolvar unset");
+BarnOwl::new_variable_bool("boolvar", { default => 1 });
+isnt(BarnOwl::getvar("boolvar"), "on", "boolvar reinit shouldn't override preexisting value");
 
 BarnOwl::new_variable_string("strvar", { default => "monkey" });
@@ -37 +41 @@
 BarnOwl::unset("-q", "strvar");
 is(BarnOwl::getvar("strvar"), "cuttlefish", "strvar unset bogus");
+BarnOwl::new_variable_string("strvar", { default => "monkey" });
+isnt(BarnOwl::getvar("strvar"), "monkey", "strvar reinit shouldn't override value");
 
 BarnOwl::new_variable_enum("enumvar", { validsettings => [qw/foo bar baz/], default => "bar" });
@@ -46 +52 @@
 BarnOwl::unset("-q", "enumvar");
 is(BarnOwl::getvar("enumvar"), "baz", "enumvar unset bogus");
+BarnOwl::new_variable_enum("enumvar", { validsettings => [qw/foo bar baz/], default => "bar" });
+isnt(BarnOwl::getvar("enumvar"), "bar", "enumvar reinit shouldn't override value");
 
 BarnOwl::new_variable_int("intvar2");
@@ -60 +68 @@
 BarnOwl::new_variable_full("fullvar", {
     validsettings => '<short-words>',
-    get_tostring => sub { "value is " . $value },
+    get_tostring => sub { $value },
     set_fromstring => sub {
-        die "Too long" unless $_[0] =~ /^...?$/;
-        $value = $_[0];
+        die "Too long" unless $_[0] =~ /^...?$/;
+        $value = lc($_[0]);
     },
     takes_on_off => 1
 });
-is(BarnOwl::getvar("fullvar"), "value is foo", "fullvar get");
-BarnOwl::set("-q", "fullvar", "bar");
-is(BarnOwl::getvar("fullvar"), "value is bar", "fullvar set");
+is(BarnOwl::getvar("fullvar"), "foo", "fullvar get");
+BarnOwl::set("-q", "fullvar", "Bar");
+is(BarnOwl::getvar("fullvar"), "bar", "fullvar set");
 BarnOwl::set("-q", "fullvar");
-is(BarnOwl::getvar("fullvar"), "value is on", "fullvar set2");
+is(BarnOwl::getvar("fullvar"), "on", "fullvar set2");
 BarnOwl::unset("-q", "fullvar");
-is(BarnOwl::getvar("fullvar"), "value is off", "fullvar unset");
+is(BarnOwl::getvar("fullvar"), "off", "fullvar unset");
 BarnOwl::set("-q", "fullvar", "bogus");
-is(BarnOwl::getvar("fullvar"), "value is off", "fullvar set bogus");
-$value = "something really long";
-is(BarnOwl::getvar("fullvar"), "value is something really long", "fullvar set out-of-band");
+is(BarnOwl::getvar("fullvar"), "off", "fullvar set bogus");
+$value = "xyz";
+is(BarnOwl::getvar("fullvar"), "xyz", "fullvar set out-of-band");
+# Kinda verbose, but better to test all forms
+my $newvalue = "foo";
+BarnOwl::new_variable_full("fullvar", {
+    validsettings => '<short-words>',
+    get_tostring => sub { $newvalue },
+    set_fromstring => sub {
+        die "Too long" unless $_[0] =~ /^...?$/;
+        $newvalue = lc($_[0]);
+    },
+    takes_on_off => 1
+});
+is(BarnOwl::getvar("fullvar"), "xyz", "fullvar reinit doesn't override value");
+$newvalue = "abc";
+is(BarnOwl::getvar("fullvar"), "abc", "fullvar reinit changed setters");
 
 1;

variable.c

@@ -612 +612 @@
 void owl_variable_dict_add_variable(owl_vardict * vardict,
                                     owl_variable * var) {
+  char *oldvalue = NULL;
+  owl_variable *oldvar = owl_variable_get_var(vardict, var->name);
+  /* Save the old value as a string. */
+  if (oldvar) {
+    oldvalue = owl_variable_get_tostring(oldvar);
+  }
   owl_dict_insert_element(vardict, var->name, var, (void (*)(void *))owl_variable_delete);
+  /* Restore the old value. */
+  if (oldvalue) {
+    owl_variable_set_fromstring(var, oldvalue, 0);
+    g_free(oldvalue);
+  }
 }
 
@@ -777 +788 @@
   g_free(v->default_str);
   g_free(v->validsettings);
-  g_value_unset(&(v->val));
+  if (v->type != OWL_VARIABLE_OTHER)
+    g_value_unset(&(v->val));
   g_closure_unref(v->get_tostring_fn);
   g_closure_unref(v->set_fromstring_fn);