Changeset 69f74c2 for perl/lib/BarnOwl.pm

Timestamp:

Feb 19, 2013, 8:29:34 PM (12 years ago)

Author:

David Benjamin <davidben@mit.edu>

Branches:

master, release-1.10

Children:

3b9ca71

Parents:

e5210c9

git-author:

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

git-committer:

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

Message:

And now... the moment you've all been waiting for...

Expose OWL_VARIABLE_OTHER variables to perl. Rewrite all perl variable
entry points to use that one. From now on, C only thinks of these
variables as strings.

(This has one regression to be fixed in a later commit: you can't
set/unset with no arguments since we don't know how to set from
boolean.)

File:

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

perl/lib/BarnOwl.pm

@@ -426 +426 @@
 
 sub new_variable_int {
-    unshift @_, \&BarnOwl::Internal::new_variable_int, 0;
+    unshift @_, 0, "<int>", sub { "$_[0]" }, # to string
+                            sub { $_[0] =~ /^-?[0-9]+$/ }, # validate
+                            sub { 0 + $_[0] }; # from string
     goto \&_new_variable;
 }
 
 sub new_variable_bool {
-    unshift @_, \&BarnOwl::Internal::new_variable_bool, 0;
+    unshift @_, 0, "on,off", 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 @_, \&BarnOwl::Internal::new_variable_string, "";
+    unshift @_, "", "<string>", sub { $_[0] }, # to string
+                                sub { 1 }, # validate
+                                sub { $_[0] }; # from string
     goto \&_new_variable;
 }
 
 sub _new_variable {
-    my $func = shift;
     my $default_default = shift;
+    my $validsettings = shift;
+    my $tostring_fn = shift;
+    my $validate_fn = shift;
+    my $fromstring_fn = shift;
+
     my $name = shift;
     my $args = shift || {};
@@ -450 +460 @@
         default     => $default_default,
         %{$args});
-    $func->($name, $args{default}, $args{summary}, $args{description});
+
+    # Store the value in a closure.
+    my $value = $args{default};
+
+    my $get_tostring_fn = sub { $tostring_fn->($value) };
+    my $set_fromstring_fn = sub {
+      my ($dummy, $newval) = @_;
+      return -1 unless $validate_fn->($newval);
+      $value = $fromstring_fn->($newval);
+      return 0;
+    };
+
+    BarnOwl::Internal::new_variable($name, $args{summary}, $args{description}, $validsettings,
+                                    $get_tostring_fn, $set_fromstring_fn, undef);
 }