Changeset 69f74c2 for variable.c

Timestamp:

Feb 19, 2013, 8:29:34 PM (11 years ago)

Author:

David Benjamin <davidben@mit.edu>

Branches:

master, release-1.10

Children:

3b9ca71

Parents:

e5210c9

git-author:

David Benjamin <davidben@mit.edu> (06/09/12 23:05:48)

git-committer:

David Benjamin <davidben@mit.edu> (02/19/13 20:29:34)

Message:

And now... the moment you've all been waiting for...

Expose OWL_VARIABLE_OTHER variables to perl. Rewrite all perl variable
entry points to use that one. From now on, C only thinks of these
variables as strings.

(This has one regression to be fixed in a later commit: you can't
set/unset with no arguments since we don't know how to set from
boolean.)

File:

• variable.c (modified) (2 diffs)

variable.c

@@ -680 +680 @@
 }
 
-CALLER_OWN owl_variable *owl_variable_newvar(const char *name, const char *summary, const char *description)
+void owl_variable_dict_newvar_other(owl_vardict *vd, const char *name, const char *summary, const char *description, const char *validsettings, GClosure *get_tostring_fn, GClosure *set_fromstring_fn)
 {
   owl_variable *var = g_new0(owl_variable, 1);
@@ -686 +686 @@
   var->summary = g_strdup(summary);
   var->description = g_strdup(description);
-  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);
-}
-
-#define OWL_VARIABLE_SETUP_DEFAULT_FUNCS(variable, type, gtype) do { \
-  variable->set_fn = G_CALLBACK(owl_variable_##type##_set_default); \
-  variable->get_fn = G_CALLBACK(owl_variable_##type##_get_default); \
-  variable->validate_fn = G_CALLBACK(owl_variable_##type##_validate_default); \
-  variable->set_fromstring_fn = owl_variable_make_closure(variable, \
-    G_CALLBACK(owl_variable_##type##_set_fromstring_default), \
-    g_cclosure_user_marshal_INT__STRING); \
-  variable->get_tostring_fn = owl_variable_make_closure(variable, \
-    G_CALLBACK(owl_variable_##type##_get_tostring_default), \
-    g_cclosure_user_marshal_STRING__VOID); \
-  } while(0)
-
-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_value_copy(default_gval, &(old->gval_default)); */
-    /* TODO: Resolve this after churn; this function is only called from perl
-     * anyway. */
-  } else {
-    owl_variable * var = owl_variable_newvar(name, summ, desc);
-    var->type = OWL_VARIABLE_STRING;
-    var->validsettings = g_strdup("<string>");
-    g_value_init(&var->val, G_TYPE_STRING);
-    OWL_VARIABLE_SETUP_DEFAULT_FUNCS(var, string, STRING);
-
-    owl_variable_set_string(var, initval);
-
-    /* record the initial value as a string */
-    var->default_str = owl_variable_get_tostring(var);
-
-    owl_variable_dict_add_variable(vd, var);
-  }
-}
-
-void owl_variable_dict_newvar_int(owl_vardict *vd, const char *name, const char *summ, const char *desc, int initval)
-{
-  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);
-    /* g_value_copy(default_gval, &(old->gval_default)); */
-    /* TODO: Resolve this after churn; this function is only called from perl
-     * anyway. */
-  } else {
-    owl_variable * var = owl_variable_newvar(name, summ, desc);
-    var->type = OWL_VARIABLE_INT;
-    var->validsettings = g_strdup("<int>");
-    g_value_init(&var->val, G_TYPE_INT);
-    OWL_VARIABLE_SETUP_DEFAULT_FUNCS(var, int, INT);
-
-    owl_variable_set_int(var, initval);
-
-    /* record the initial value as a string */
-    var->default_str = owl_variable_get_tostring(var);
-
-    owl_variable_dict_add_variable(vd, var);
-  }
-}
-
-void owl_variable_dict_newvar_bool(owl_vardict *vd, const char *name, const char *summ, const char *desc, gboolean initval)
-{
-  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);
-    /* g_value_copy(default_gval, &(old->gval_default)); */
-    /* TODO: Resolve this after churn; this function is only called from perl
-     * anyway. */
-  } else {
-    owl_variable * var = owl_variable_newvar(name, summ, desc);
-    var->type = OWL_VARIABLE_BOOL;
-    var->validsettings = g_strdup("on,off");
-    g_value_init(&var->val, G_TYPE_BOOLEAN);
-    OWL_VARIABLE_SETUP_DEFAULT_FUNCS(var, bool, BOOLEAN);
-
-    owl_variable_set_bool(var, initval);
-
-    /* record the initial value as a string */
-    var->default_str = owl_variable_get_tostring(var);
-
-    owl_variable_dict_add_variable(vd, var);
-  }
+  var->validsettings = g_strdup(validsettings);
+
+  var->get_tostring_fn = g_closure_ref(get_tostring_fn);
+  g_closure_sink(get_tostring_fn);
+
+  var->set_fromstring_fn = g_closure_ref(set_fromstring_fn);
+  g_closure_sink(set_fromstring_fn);
+
+  var->default_str = owl_variable_get_tostring(var);
+
+  /* Note: this'll overwrite any existing variable of that name, even a C one,
+     but it's consistent with previous behavior and commands. */
+  owl_variable_dict_add_variable(vd, var);
 }