Changeset 5f784ec for variable.c

Timestamp:

Sep 30, 2011, 8:12:24 AM (13 years ago)

Author:

Jason Gross <jgross@mit.edu>

Children:

c0e728a

Parents:

7803326

git-author:

Jason Gross <jgross@mit.edu> (07/12/11 18:29:38)

git-committer:

Jason Gross <jgross@mit.edu> (09/30/11 08:12:24)

Message:

Refactored perl variable creation code in preparation for ambiguous types

When we allow enums in perl, we can't be sure that recreation of an int
isn't actually changing it into an enum (though, really, variables
should only be recreated when you reload module code).  This makes
BarnOwl reinitilize all the fields, but keep the current value, if there
is one.

File:

• variable.c (modified) (8 diffs)

variable.c

@@ -568 +568 @@
 int owl_variable_dict_add_from_list(owl_vardict *vd, owl_variable *variables_to_init)
 {
+  int ret;
   owl_variable *var, *cur;
   for (var = variables_to_init; var->name != NULL; var++) {
@@ -576 +577 @@
     cur->summary = g_strdup(var->summary);
     cur->description = g_strdup(var->description);
-    switch (cur->type) {
+    if (cur->type == OWL_VARIABLE_STRING)
+      cur->pval_default = g_strdup(var->pval_default);
+    ret = owl_variable_init_defaults(cur);
+    if (ret != 0) {
+      fprintf(stderr, "owl_variable_setup: invalid variable type\n");
+      return ret;
+    }
+    owl_dict_insert_element(vd, cur->name, cur, NULL);
+  }
+  return 0;
+}
+
+int owl_variable_init_defaults(owl_variable *cur)
+{
+  switch (cur->type) {
     case OWL_VARIABLE_OTHER:
       cur->set_fn(cur, cur->pval_default);
@@ -593 +608 @@
       if (!cur->delete_fn)
         cur->delete_fn = owl_variable_delete_default;
-      cur->pval_default = g_strdup(var->pval_default);
       cur->set_fn(cur, cur->pval_default);
       break;
@@ -629 +643 @@
       break;
     default:
-      fprintf(stderr, "owl_variable_setup: invalid variable type\n");
-      return(-2);
-    }
-    owl_dict_insert_element(vd, cur->name, cur, NULL);
+      return -2;
   }
   return 0;
@@ -642 +653 @@
 }
 
-CALLER_OWN owl_variable *owl_variable_newvar(const char *name, const char *summary, const char *description)
+CALLER_OWN owl_variable *owl_variable_newvar(const char *name, const char *summary, const char *description, const char *validsettings, int type)
 {
   owl_variable * var = g_new0(owl_variable, 1);
@@ -648 +659 @@
   var->summary = g_strdup(summary);
   var->description = g_strdup(description);
+  var->validsettings = validsettings;
+  var->type = type;
   return var;
 }
 
-void owl_variable_update(owl_variable *var, const char *summary, const char *desc) {
-  g_free(var->summary);
-  var->summary = g_strdup(summary);
-  g_free(var->description);
-  var->description = g_strdup(desc);
-}
-
 void owl_variable_dict_newvar_string(owl_vardict *vd, const char *name, const char *summ, const char *desc, const char *initval)
 {
   owl_variable *old = owl_variable_get_var(vd, name);
-  if (old && owl_variable_get_type(old) == OWL_VARIABLE_STRING) {
-    owl_variable_update(old, summ, desc);
-    g_free(old->pval_default);
-    old->pval_default = g_strdup(initval);
-  } else {
-    owl_variable * var = owl_variable_newvar(name, summ, desc);
-    var->type = OWL_VARIABLE_STRING;
-    var->validsettings = "<string>";
-    var->pval_default = g_strdup(initval);
-    var->set_fn = owl_variable_string_set_default;
-    var->set_fromstring_fn = owl_variable_string_set_fromstring_default;
-    var->get_fn = owl_variable_get_default;
-    var->get_tostring_fn = owl_variable_string_get_tostring_default;
-    var->delete_fn = owl_variable_delete_default;
-    var->set_fn(var, initval);
-    owl_variable_dict_add_variable(vd, var);
-  }
+  char *oldval = NULL;
+  if (old && owl_variable_get_type(old) == OWL_VARIABLE_STRING)
+    oldval = owl_variable_get_tostring(old);
+  owl_variable *var = owl_variable_newvar(name, summ, desc, "<string>", OWL_VARIABLE_STRING);
+  var->pval_default = g_strdup(initval);
+  owl_variable_init_defaults(var);
+  if (old && owl_variable_get_type(old) == OWL_VARIABLE_STRING)
+    var->set_fn(var, oldval);
+  g_free(oldval);
+  owl_variable_dict_add_variable(vd, var);
 }
 
@@ -683 +682 @@
 {
   owl_variable *old = owl_variable_get_var(vd, name);
-  if (old && owl_variable_get_type(old) == OWL_VARIABLE_INT) {
-    owl_variable_update(old, summ, desc);
-    old->ival_default = initval;
-  } else {
-    owl_variable * var = owl_variable_newvar(name, summ, desc);
-    var->type = OWL_VARIABLE_INT;
-    var->validsettings = "<int>";
-    var->ival_default = initval;
-    var->validate_fn = owl_variable_int_validate_default;
-    var->set_fn = owl_variable_int_set_default;
-    var->set_fromstring_fn = owl_variable_int_set_fromstring_default;
-    var->get_fn = owl_variable_get_default;
-    var->get_tostring_fn = owl_variable_int_get_tostring_default;
-    var->delete_fn = owl_variable_delete_default;
-    var->val = g_new(int, 1);
-    var->set_fn(var, &initval);
-    owl_variable_dict_add_variable(vd, var);
-  }
+  int oldval;
+  if (old && owl_variable_get_type(old) == OWL_VARIABLE_INT)
+    oldval = owl_variable_get_int(old);
+  owl_variable *var = owl_variable_newvar(name, summ, desc, "<int>", OWL_VARIABLE_INT);
+  var->ival_default = initval;
+  owl_variable_init_defaults(var);
+  if (old && owl_variable_get_type(old) == OWL_VARIABLE_INT)
+    var->set_fn(var, &oldval);
+  owl_variable_dict_add_variable(vd, var);
 }
 
@@ -706 +696 @@
 {
   owl_variable *old = owl_variable_get_var(vd, name);
-  if (old && owl_variable_get_type(old) == OWL_VARIABLE_BOOL) {
-    owl_variable_update(old, summ, desc);
-    old->ival_default = initval;
-  } else {
-    owl_variable * var = owl_variable_newvar(name, summ, desc);
-    var->type = OWL_VARIABLE_BOOL;
-    var->validsettings = "on,off";
-    var->ival_default = initval;
-    var->validate_fn = owl_variable_bool_validate_default;
-    var->set_fn = owl_variable_bool_set_default;
-    var->set_fromstring_fn = owl_variable_bool_set_fromstring_default;
-    var->get_fn = owl_variable_get_default;
-    var->get_tostring_fn = owl_variable_bool_get_tostring_default;
-    var->delete_fn = owl_variable_delete_default;
-    var->val = g_new(int, 1);
-    var->set_fn(var, &initval);
-    owl_variable_dict_add_variable(vd, var);
-  }
+  bool oldval;
+  if (old && owl_variable_get_type(old) == OWL_VARIABLE_BOOL)
+    oldval = owl_variable_get_bool(old);
+  owl_variable *var = owl_variable_newvar(name, summ, desc, "on,off", OWL_VARIABLE_BOOL);
+  var->ival_default = initval;
+  owl_variable_init_defaults(var);
+  if (old && owl_variable_get_type(old) == OWL_VARIABLE_BOOL)
+    var->set_fn(var, &oldval);
+  owl_variable_dict_add_variable(vd, var);
 }