Changeset cce9369 for perl

Timestamp:

Sep 30, 2011, 8:14:50 AM (13 years ago)

Author:

Jason Gross <jgross@mit.edu>

Children:

e21b921

Parents:

b54b06a

git-author:

Jason Gross <jgross@mit.edu> (07/12/11 19:20:46)

git-committer:

Jason Gross <jgross@mit.edu> (09/30/11 08:14:50)

Message:

Allowed custom validsettings for other non-boolean perl variables.

File:

• perl/lib/BarnOwl.pm (modified) (3 diffs)

perl/lib/BarnOwl.pm

@@ -413 +413 @@
 =item valid_settings
 
-A listref of valid setttings for the enum variable.
-The settings must not contain any commas.
+A listref of valid setttings for the enum variable, or a string describing
+the valid settings for any other type of variable.  The settings for an enum
+variable may not contain any commas.  You should not specify valid settings
+for boolean variables.
 
 =back
@@ -421 +423 @@
 
 sub new_variable_int {
-    unshift @_, \&BarnOwl::Internal::new_variable_int, 0;
-    goto \&_new_variable;
+    _new_variable(\&BarnOwl::Internal::new_variable_int, 0, "<int>", @_);
 }
 
 sub new_variable_bool {
-    unshift @_, \&BarnOwl::Internal::new_variable_bool, 0;
-    goto \&_new_variable;
+    _new_variable(\&BarnOwl::Internal::new_variable_bool, 0, "on,off", @_);
 }
 
 sub new_variable_string {
-    unshift @_, \&BarnOwl::Internal::new_variable_string, "";
-    goto \&_new_variable;
+    _new_variable(\&BarnOwl::Internal::new_variable_string, "", "<string>", @_);
 }
 
@@ -457 +456 @@
     my $func = shift;
     my $default_default = shift;
+    my $default_valid_settings = shift;
     my $name = shift;
     my $args = shift || {};
     my %args = (
-        summary     => "",
-        description => "",
-        default     => $default_default,
+        summary        => "",
+        description    => "",
+        default        => $default_default,
+        valid_settings => $default_valid_settings,
         %{$args});
-    $func->($name, $args{default}, $args{summary}, $args{description});
+    $func->($name, $args{default}, $args{summary}, $args{description}, $args{valid_settings});
 }