Changeset bc1d648

Timestamp:

Jul 3, 2011, 8:08:06 PM (13 years ago)

Author:

Jason Gross <jgross@mit.edu>

Branches:

master, release-1.10, release-1.8, release-1.9

Children:

ca54fd6

Parents:

82e93c9

git-author:

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

git-committer:

Jason Gross <jgross@mit.edu> (07/03/11 20:08:06)

Message:

Drop require_type

It's not doing much for us (and would do even less after the next
commit).

I'm not sure whether or not we should type-check owl_variable_get_*

Files:

• tester.c (modified) (3 diffs)
• variable.c (modified) (5 diffs)

tester.c

@@ -316 +316 @@
 
   owl_variable_dict_newvar_string(&vd, "stringvar", "", "", "testval");
-  FAIL_UNLESS("get new string var", NULL != (v = owl_variable_get(&vd, "stringvar", OWL_VARIABLE_STRING)));
+  FAIL_UNLESS("get new string var", NULL != (v = owl_variable_get(&vd, "stringvar")));
   FAIL_UNLESS("get new string val", !strcmp("testval", owl_variable_get_string(&vd, "stringvar")));
   owl_variable_set_string(&vd, "stringvar", "new val");
@@ -322 +322 @@
 
   owl_variable_dict_newvar_int(&vd, "intvar", "", "", 47);
-  FAIL_UNLESS("get new int var", NULL != (v = owl_variable_get(&vd, "intvar", OWL_VARIABLE_INT)));
+  FAIL_UNLESS("get new int var", NULL != (v = owl_variable_get(&vd, "intvar")));
   FAIL_UNLESS("get new int val", 47 == owl_variable_get_int(&vd, "intvar"));
   owl_variable_set_int(&vd, "intvar", 17);
@@ -328 +328 @@
 
   owl_variable_dict_newvar_bool(&vd, "boolvar", "", "", 1);
-  FAIL_UNLESS("get new bool var", NULL != (v = owl_variable_get(&vd, "boolvar", OWL_VARIABLE_BOOL)));
+  FAIL_UNLESS("get new bool var", NULL != (v = owl_variable_get(&vd, "boolvar")));
   FAIL_UNLESS("get new bool val", owl_variable_get_bool(&vd, "boolvar"));
   owl_variable_set_bool_off(&vd, "boolvar");

variable.c

@@ -662 +662 @@
 }
 
-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, OWL_VARIABLE_STRING);
-  if(old) {
+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 && old->type == OWL_VARIABLE_STRING) {
     owl_variable_update(old, summ, desc);
     g_free(old->pval_default);
@@ -682 +683 @@
 }
 
-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, OWL_VARIABLE_INT);
-  if(old) {
+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 && old->type == OWL_VARIABLE_INT) {
     owl_variable_update(old, summ, desc);
     old->ival_default = initval;
@@ -703 +705 @@
 }
 
-void owl_variable_dict_newvar_bool(owl_vardict * vd, const char *name, const char *summ, const char * desc, int initval) {
-  owl_variable *old = owl_variable_get_var(vd, name, OWL_VARIABLE_BOOL);
-  if(old) {
+void owl_variable_dict_newvar_bool(owl_vardict *vd, const char *name, const char *summ, const char *desc, bool initval)
+{
+  owl_variable *old = owl_variable_get_var(vd, name);
+  if (old && old->type == OWL_VARIABLE_BOOL) {
     owl_variable_update(old, summ, desc);
     old->ival_default = initval;
@@ -847 +850 @@
 }
 
-owl_variable *owl_variable_get_var(const owl_vardict *d, const char *name, int require_type) {
+owl_variable *owl_variable_get_var(const owl_vardict *d, const char *name)
+{
   owl_variable *v;
   if (!name) return(NULL);
   v = owl_dict_find_element(d, name);
-  if (v == NULL || !v->get_fn || v->type != require_type) return(NULL);
+  if (v == NULL || !v->get_fn) return NULL;
   return v;
 }
 
 /* returns a reference */
-const void *owl_variable_get(const owl_vardict *d, const char *name, int require_type) {
-  owl_variable *v = owl_variable_get_var(d, name, require_type);
+const void *owl_variable_get(const owl_vardict *d, const char *name)
+{
+  const owl_variable *v = owl_variable_get_var(d, name);
   if(v == NULL) return NULL;
   return v->get_fn(v);
@@ -864 +869 @@
 /* returns a reference */
 const char *owl_variable_get_string(const owl_vardict *d, const char *name) {
-  return owl_variable_get(d,name, OWL_VARIABLE_STRING);
+  /* TODO: (Decide whether or not to) type check? */
+  return owl_variable_get(d, name);
 }
 
 /* returns a reference */
 const void *owl_variable_get_other(const owl_vardict *d, const char *name) {
-  return owl_variable_get(d,name, OWL_VARIABLE_OTHER);
+  /* TODO: (Decide whether or not to) type check? */
+  return owl_variable_get(d, name);
 }
 
 int owl_variable_get_int(const owl_vardict *d, const char *name) {
-  const int *pi;
-  pi = owl_variable_get(d,name,OWL_VARIABLE_INT);
-  if (!pi) return(-1);
-  return(*pi);
+  /* TODO: (Decide whether or not to) type check? */
+  const int *pi = owl_variable_get(d, name);
+  if (!pi) return -1;
+  return *pi;
 }
 
 int owl_variable_get_bool(const owl_vardict *d, const char *name) {
-  const int *pi;
-  pi = owl_variable_get(d,name,OWL_VARIABLE_BOOL);
-  if (!pi) return(-1);
-  return(*pi);
+  /* TODO: (Decide whether or not to) type check? */
+  const int *pi = owl_variable_get(d, name);
+  if (!pi) return -1;
+  return *pi;
 }