Changeset 0d935a1 for functions.c

Timestamp:

Jun 27, 2011, 4:28:51 AM (13 years ago)

Author:

Jason Gross <jgross@mit.edu>

Children:

b75a8ac

Parents:

f4e857f

git-author:

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

git-committer:

Jason Gross <jgross@mit.edu> (06/27/11 04:28:51)

Message:

Pass owl_variable * around instead of owl_vardict *.

This allows (forces) functions to do their own NULL- and type- checking
on variables.  The functions in varsubs.c get less checking, but if
these auto-generated functions are failing, something more serious is
probably wrong.

File:

• functions.c (modified) (5 diffs)

functions.c

@@ -1572 +1572 @@
 void owl_function_printallvars(void)
 {
+  const owl_variable *v;
   const char *name;
   char *var;
@@ -1585 +1586 @@
     if (name && name[0]!='_') {
       g_string_append_printf(str, "\n%-20s = ", name);
-      var = owl_variable_get_tostring(owl_global_get_vardict(&g), name);
+      v = owl_variable_get_var(owl_global_get_vardict(&g), name);
+      var = owl_variable_get_tostring(v);
       if (var) {
         g_string_append(str, var);
         g_free(var);
+      } else {
+        g_string_append(str, "<null>");
       }
     }
@@ -1601 +1605 @@
 void owl_function_show_variables(void)
 {
+  const owl_variable *v;
   GPtrArray *varnames;
   owl_fmtext fm;  
@@ -1613 +1618 @@
     varname = varnames->pdata[i];
     if (varname && varname[0]!='_') {
-      owl_variable_describe(owl_global_get_vardict(&g), varname, &fm);
+      v = owl_variable_get_var(owl_global_get_vardict(&g), varname);
+      owl_variable_describe(v, &fm);
     }
   }
@@ -1623 +1629 @@
 void owl_function_show_variable(const char *name)
 {
+  const owl_variable *v;
   owl_fmtext fm;  
 
   owl_fmtext_init_null(&fm);
-  owl_variable_get_help(owl_global_get_vardict(&g), name, &fm);
+  v = owl_variable_get_var(owl_global_get_vardict(&g), name);
+  if (v)
+    owl_variable_get_help(v, &fm);
+  else
+    owl_fmtext_append_normal(&fm, "No such variable...\n");
   owl_function_popless_fmtext(&fm);
   owl_fmtext_cleanup(&fm);