Changeset 3b9ca71

Timestamp:

Feb 19, 2013, 8:29:38 PM (10 years ago)

Author:

David Benjamin <davidben@mit.edu>

Branches:

master

Children:

4584d1f

Parents:

69f74c2

git-author:

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

git-committer:

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

Message:

Allow perl variables to participate in argumentless set/unset

Files:

• commands.c (modified) (2 diffs)
• owl.h (modified) (1 diff)
• perl/lib/BarnOwl.pm (modified) (3 diffs)
• perlglue.xs (modified) (2 diffs)
• variable.c (modified) (3 diffs)

commands.c

@@ -1604 +1604 @@
   if (v == NULL) {
     if (!silent) owl_function_error("Unknown variable '%s'", var);
-  } else if (requirebool && owl_variable_get_type(v) != OWL_VARIABLE_BOOL) {
-    // FIXME: The above won't work when we make perl variables OWL_VARIABLE_SV
+  } else if (requirebool && !v->takes_on_off) {
     if (!silent) owl_function_error("Variable '%s' is not a boolean", var);
   } else {
@@ -1634 +1633 @@
   if (v == NULL) {
     if (!silent) owl_function_error("Unknown variable '%s'", var);
-  } else if (owl_variable_get_type(v) != OWL_VARIABLE_BOOL) {
-    // FIXME: The above won't work when we make perl variables OWL_VARIABLE_SV
+  } else if (!v->takes_on_off) {
     if (!silent) owl_function_error("Variable '%s' is not a boolean", var);
   } else {

owl.h

@@ -239 +239 @@
   char *summary;                /* summary of usage */
   char *description;            /* detailed description */
+  bool takes_on_off;            /* allow passing on/off in argument-less set/unset */
   GClosure *set_fromstring_fn;
                                 /* sets the variable to a value

perl/lib/BarnOwl.pm

@@ -426 +426 @@
 
 sub new_variable_int {
-    unshift @_, 0, "<int>", sub { "$_[0]" }, # to string
-                            sub { $_[0] =~ /^-?[0-9]+$/ }, # validate
-                            sub { 0 + $_[0] }; # from string
+    unshift @_, 0, "<int>", 0, sub { "$_[0]" }, # to string
+                               sub { $_[0] =~ /^-?[0-9]+$/ }, # validate
+                               sub { 0 + $_[0] }; # from string
     goto \&_new_variable;
 }
 
 sub new_variable_bool {
-    unshift @_, 0, "on,off", sub { $_[0] ? "on" : "off" }, # to string
-                             sub { $_[0] eq "on" || $_[0] eq "off" }, # validate
-                             sub { $_[0] eq "on" }; # from string
+    unshift @_, 0, "on,off", 1, sub { $_[0] ? "on" : "off" }, # to string
+                                sub { $_[0] eq "on" || $_[0] eq "off" }, # validate
+                                sub { $_[0] eq "on" }; # from string
     goto \&_new_variable;
 }
 
 sub new_variable_string {
-    unshift @_, "", "<string>", sub { $_[0] }, # to string
-                                sub { 1 }, # validate
-                                sub { $_[0] }; # from string
+    unshift @_, "", "<string>", 0, sub { $_[0] }, # to string
+                                   sub { 1 }, # validate
+                                   sub { $_[0] }; # from string
     goto \&_new_variable;
 }
@@ -449 +449 @@
     my $default_default = shift;
     my $validsettings = shift;
+    my $takes_on_off = shift;
     my $tostring_fn = shift;
     my $validate_fn = shift;
@@ -473 +474 @@
 
     BarnOwl::Internal::new_variable($name, $args{summary}, $args{description}, $validsettings,
-                                    $get_tostring_fn, $set_fromstring_fn, undef);
+                                    $takes_on_off, $get_tostring_fn, $set_fromstring_fn, undef);
 }
 

perlglue.xs

@@ -406 +406 @@
 
 void
-new_variable(name, summary, description, validsettings, get_tostring_fn, set_fromstring_fn, data)
+new_variable(name, summary, description, validsettings, takes_on_off, get_tostring_fn, set_fromstring_fn, data)
     const char *name
     const char *summary
     const char *description
     const char *validsettings
+    int takes_on_off
     SV *get_tostring_fn
     SV *set_fromstring_fn
@@ -426 +427 @@
 
         owl_variable_dict_newvar_other(owl_global_get_vardict(&g),
-                                       name, summary, description, validsettings,
+                                       name, summary, description, validsettings, takes_on_off,
                                        perl_closure_new(get_tostring_fn, data, false),
                                        perl_closure_new(set_fromstring_fn, data, false));

variable.c

@@ -619 +619 @@
     newvar = g_new0(owl_variable, 1);
     newvar->type = init_params->type;
+    newvar->takes_on_off = (newvar->type == OWL_VARIABLE_BOOL);
     /* strdup all the strings so we can delete them consistently. */
     newvar->name = g_strdup(init_params->name);
@@ -680 +681 @@
 }
 
-void owl_variable_dict_newvar_other(owl_vardict *vd, const char *name, const char *summary, const char *description, const char *validsettings, GClosure *get_tostring_fn, GClosure *set_fromstring_fn)
+void owl_variable_dict_newvar_other(owl_vardict *vd, const char *name, const char *summary, const char *description, const char *validsettings, bool takes_on_off, GClosure *get_tostring_fn, GClosure *set_fromstring_fn)
 {
   owl_variable *var = g_new0(owl_variable, 1);
@@ -687 +688 @@
   var->description = g_strdup(description);
   var->validsettings = g_strdup(validsettings);
+  var->takes_on_off = takes_on_off;
 
   var->get_tostring_fn = g_closure_ref(get_tostring_fn);