Changeset ca54fd6 for stubgen.pl

Timestamp:

Jul 3, 2011, 8:42:55 PM (14 years ago)

Author:

Jason Gross <jgross@mit.edu>

Branches:

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

Children:

ca749a9

Parents:

bc1d648

git-author:

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

git-committer:

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

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.

The owl_variable_get_* functions type-check their arguments, and
owl_function_error if the argument is the wrong type (it's a programmer
error and we should make some noise).

File:

• stubgen.pl (modified) (1 diff)

stubgen.pl

@@ -14 +14 @@
     if ($vartype =~ /^BOOL/) {
         print "void owl_global_set_${altvarname}_on(owl_global *g) {\n";
-        print "  owl_variable_set_bool_on(&g->vars, \"$varname\");\n}\n";
+        print "  owl_variable_set_bool_on(owl_variable_get_var(&g->vars, \"$varname\"));\n}\n";
         print "void owl_global_set_${altvarname}_off(owl_global *g) {\n";
-        print "  owl_variable_set_bool_off(&g->vars, \"$varname\");\n}\n";
+        print "  owl_variable_set_bool_off(owl_variable_get_var(&g->vars, \"$varname\"));\n}\n";
         print "int owl_global_is_$altvarname(const owl_global *g) {\n";
-        print "  return owl_variable_get_bool(&g->vars, \"$varname\");\n}\n";
+        print "  return owl_variable_get_bool(owl_variable_get_var(&g->vars, \"$varname\"));\n}\n";
     } elsif ($vartype =~ /^PATH/ or $vartype =~ /^STRING/) {
         print "void owl_global_set_$altvarname(owl_global *g, const char *text) {\n";
-        print "  owl_variable_set_string(&g->vars, \"$varname\", text);\n}\n";
+        print "  owl_variable_set_string(owl_variable_get_var(&g->vars, \"$varname\"), text);\n}\n";
         print "const char *owl_global_get_$altvarname(const owl_global *g) {\n";
-        print "  return owl_variable_get_string(&g->vars, \"$varname\");\n}\n";
+        print "  return owl_variable_get_string(owl_variable_get_var(&g->vars, \"$varname\"));\n}\n";
     } elsif ($vartype =~ /^INT/ or $vartype =~ /^ENUM/) {
         print "void owl_global_set_$altvarname(owl_global *g, int n) {\n";
-        print "  owl_variable_set_int(&g->vars, \"$varname\", n);\n}\n";
+        print "  owl_variable_set_int(owl_variable_get_var(&g->vars, \"$varname\"), n);\n}\n";
         print "int owl_global_get_$altvarname(const owl_global *g) {\n";
-        print "  return owl_variable_get_int(&g->vars, \"$varname\");\n}\n";
+        print "  return owl_variable_get_int(owl_variable_get_var(&g->vars, \"$varname\"));\n}\n";
     } 
     }