Changeset c0e728a

Timestamp:

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

Author:

Jason Gross <jgross@mit.edu>

Children:

b54b06a

Parents:

5f784ec

git-author:

Jason Gross <jgross@mit.edu> (06/27/11 01:41:01)

git-committer:

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

Message:

Added functionality to create new enum variables from C

Files:

• owl.h (modified) (1 diff)
• variable.c (modified) (8 diffs)

owl.h

@@ -237 +237 @@
   void *pval_default;  /* for types other and string */
   int   ival_default;  /* for types int and bool     */
-  const char *validsettings;    /* documentation of valid settings */
+  char *validsettings;          /* documentation of valid settings */
   char *summary;                /* summary of usage */
   char *description;            /* detailed description */

variable.c

@@ -3 +3 @@
 
 #define OWLVAR_BOOL(name,default,summary,description) \
-        { g_strdup(name), OWL_VARIABLE_BOOL, NULL, default, "on,off", g_strdup(summary), g_strdup(description), NULL, \
+        { g_strdup(name), OWL_VARIABLE_BOOL, NULL, default, g_strdup("on,off"), g_strdup(summary), g_strdup(description), NULL, \
         NULL, NULL, NULL, NULL, NULL, NULL }
 
 #define OWLVAR_BOOL_FULL(name,default,summary,description,validate,set,get) \
-        { g_strdup(name), OWL_VARIABLE_BOOL, NULL, default, "on,off", g_strdup(summary), g_strdup(description), NULL, \
+        { g_strdup(name), OWL_VARIABLE_BOOL, NULL, default, g_strdup("on,off"), g_strdup(summary), g_strdup(description), NULL, \
         validate, set, NULL, get, NULL, NULL }
 
 #define OWLVAR_INT(name,default,summary,description) \
-        { g_strdup(name), OWL_VARIABLE_INT, NULL, default, "<int>", g_strdup(summary), g_strdup(description), NULL, \
+        { g_strdup(name), OWL_VARIABLE_INT, NULL, default, g_strdup("<int>"), g_strdup(summary), g_strdup(description), NULL, \
         NULL, NULL, NULL, NULL, NULL, NULL }
 
 #define OWLVAR_INT_FULL(name,default,summary,description,validset,validate,set,get) \
-        { g_strdup(name), OWL_VARIABLE_INT, NULL, default, validset, g_strdup(summary), g_strdup(description), NULL, \
+        { g_strdup(name), OWL_VARIABLE_INT, NULL, default, g_strdup(validset), g_strdup(summary), g_strdup(description), NULL, \
         validate, set, NULL, get, NULL, NULL }
 
 #define OWLVAR_PATH(name,default,summary,description) \
-        { g_strdup(name), OWL_VARIABLE_STRING, g_strdup(default), 0, "<path>", g_strdup(summary), g_strdup(description),  NULL, \
+        { g_strdup(name), OWL_VARIABLE_STRING, g_strdup(default), 0, g_strdup("<path>"), g_strdup(summary), g_strdup(description),  NULL, \
         NULL, NULL, NULL, NULL, NULL, NULL }
 
 #define OWLVAR_STRING(name,default,summary,description) \
-        { g_strdup(name), OWL_VARIABLE_STRING, g_strdup(default), 0, "<string>", g_strdup(summary), g_strdup(description), NULL, \
+        { g_strdup(name), OWL_VARIABLE_STRING, g_strdup(default), 0, g_strdup("<string>"), g_strdup(summary), g_strdup(description), NULL, \
         NULL, NULL, NULL, NULL, NULL, NULL }
 
 #define OWLVAR_STRING_FULL(name,default,validset,summary,description,validate,set,get) \
-        { g_strdup(name), OWL_VARIABLE_STRING, g_strdup(default), 0, validset, g_strdup(summary), g_strdup(description), NULL, \
+        { g_strdup(name), OWL_VARIABLE_STRING, g_strdup(default), 0, g_strdup(validset), g_strdup(summary), g_strdup(description), NULL, \
         validate, set, NULL, get, NULL, NULL }
 
@@ -34 +34 @@
  * correspond to the values that may be specified. */
 #define OWLVAR_ENUM(name,default,summary,description,validset) \
-        { g_strdup(name), OWL_VARIABLE_INT, NULL, default, validset, g_strdup(summary), g_strdup(description), NULL, \
+        { g_strdup(name), OWL_VARIABLE_INT, NULL, default, g_strdup(validset), g_strdup(summary), g_strdup(description), NULL, \
         owl_variable_enum_validate, \
         NULL, owl_variable_enum_set_fromstring, \
@@ -41 +41 @@
 
 #define OWLVAR_ENUM_FULL(name,default,summary,description,validset,validate, set, get) \
-        { g_strdup(name), OWL_VARIABLE_INT, NULL, default, validset, g_strdup(summary), g_strdup(description), NULL, \
+        { g_strdup(name), OWL_VARIABLE_INT, NULL, default, g_strdup(validset), g_strdup(summary), g_strdup(description), NULL, \
         validate, \
         set, owl_variable_enum_set_fromstring, \
@@ -577 +577 @@
     cur->summary = g_strdup(var->summary);
     cur->description = g_strdup(var->description);
+    cur->validsettings = g_strdup(var->validsettings);
     if (cur->type == OWL_VARIABLE_STRING)
       cur->pval_default = g_strdup(var->pval_default);
@@ -659 +660 @@
   var->summary = g_strdup(summary);
   var->description = g_strdup(description);
-  var->validsettings = validsettings;
+  var->validsettings = g_strdup(validsettings);
   var->type = type;
   return var;
@@ -696 +697 @@
 {
   owl_variable *old = owl_variable_get_var(vd, name);
-  bool oldval;
+  int oldval;
   if (old && owl_variable_get_type(old) == OWL_VARIABLE_BOOL)
     oldval = owl_variable_get_bool(old);
@@ -707 +708 @@
 }
 
+void owl_variable_dict_newvar_enum(owl_vardict *vd, const char *name, const char *summ, const char *desc, int initval, const char *validsettings)
+{
+  owl_variable *old = owl_variable_get_var(vd, name);
+  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, validsettings, OWL_VARIABLE_INT);
+  var->ival_default = initval;
+  var->validate_fn = owl_variable_enum_validate;
+  var->set_fromstring_fn = owl_variable_enum_set_fromstring;
+  var->get_tostring_fn = owl_variable_enum_get_tostring;
+  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);
+}
+
 void owl_variable_dict_cleanup(owl_vardict *d)
 {
@@ -722 +740 @@
   g_free(v->summary);
   g_free(v->description);
+  g_free(v->validsettings);
   if (v->type == OWL_VARIABLE_STRING)
     g_free(v->pval_default);