Changeset 353719a for owl.h

Timestamp:

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

Author:

David Benjamin <davidben@mit.edu>

Branches:

master, release-1.10

Children:

5001a3d

Parents:

06e04a9

git-author:

David Benjamin <davidben@mit.edu> (06/09/12 16:07:20)

git-committer:

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

Message:

Start of perlvariables iteration N+1

New plan: the C <-> perl interface deals entirely with strings. Storage
is entirely perl-side. C does not know and doesn't care about the
underlying perl-side types. Note that this means an "int" variable in C
land and an "int" variable in perl land have no relation.

File:

• owl.h (modified) (3 diffs)

owl.h

@@ -235 +235 @@
   char *name;
   int   type;  /* OWL_VARIABLE_* */
-  GValue gval_default;
+  char *default_str;            /* the default value as a string */
   const char *validsettings;    /* documentation of valid settings */
   char *summary;                /* summary of usage */
   char *description;            /* detailed description */
   GValue val;                    /* current value */
-  GClosure *validate_fn;
-                                /* returns 1 if newval is valid */
-  GClosure *set_fn;
-                                /* sets the variable to a value
-                                 * of the appropriate type.
-                                 * unless documented, this 
-                                 * should make a copy. 
-                                 * returns 0 on success. */
   GClosure *set_fromstring_fn;
                                 /* sets the variable to a value
@@ -254 +246 @@
                                  * should make a copy. 
                                  * returns 0 on success. */
-  GClosure *get_fn;
+  GClosure *get_tostring_fn;
+                                /* converts val to a string;
+                                 * caller must free the result */
+
+  /* These are only valid for OWL_VARIABLE_{INT,BOOL,STRING} */
+  GCallback get_fn;
                                 /* returns a reference to the current value.
                                  * WARNING:  this approach is hard to make
                                  * thread-safe... */
-  GClosure *get_tostring_fn;
-                                /* converts val to a string;
-                                 * caller must free the result */
-  GClosure *delete_fn;
-                                /* frees val as needed */
-  GClosure *get_default_fn;
-                               /* return the default value, as set at creation time */
-  
+  GCallback validate_fn;
+                                /* returns 1 if newval is valid */
+  GCallback set_fn;
+                                /* sets the variable to a value
+                                 * of the appropriate type.
+                                 * unless documented, this 
+                                 * should make a copy. 
+                                 * returns 0 on success. */
 } owl_variable;
 
 typedef struct _owl_variable_init_params {
-  char *name;
+  const char *name;
   int   type;  /* OWL_VARIABLE_* */
-  void *pval_default;  /* for types other and string */
-  int   ival_default;  /* for types int and bool     */
+  const char *pval_default;     /* for string */
+  int   ival_default;           /* for types int and bool     */
   const char *validsettings;    /* documentation of valid settings */
-  char *summary;                /* summary of usage */
-  char *description;            /* detailed description */
+  const char *summary;          /* summary of usage */
+  const char *description;      /* detailed description */
   void *val;                    /* current value */
   GCallback validate_fn;
@@ -298 +295 @@
                                 /* converts val to a string;
                                  * caller must free the result */
-  GCallback delete_fn;
-                                /* frees val as needed */
-  GCallback get_default_fn;
-                                /* return the default value as set at creation time */
 } owl_variable_init_params;