Changeset b67ab6b for perlwrap.pm

Timestamp:

Apr 29, 2008, 1:21:15 AM (16 years ago)

Author:

Nelson Elhage <nelhage@mit.edu>

Branches:

master, barnowl_perlaim, debian, release-1.10, release-1.4, release-1.5, release-1.6, release-1.7, release-1.8, release-1.9

Children:

52f8dd6

Parents:

864ed35

Message:

Implement back-compat with old-style owl::format_msg() styles

File:

• perlwrap.pm (modified) (6 diffs)

perlwrap.pm

@@ -153 +153 @@
 }
 $configfile ||= $ENV{HOME}."/.owlconf";
-
-# populate global variable space for legacy owlconf files
-sub _format_msg_legacy_wrap {
-    my ($m) = @_;
-    $m->legacy_populate_global();
-    return &BarnOwl::format_msg($m);
-}
 
 # populate global variable space for legacy owlconf files
@@ -702 +695 @@
         if(*BarnOwl::format_msg{CODE}) {
             # if the config defines a legacy formatting function, add 'perl' as a style 
-            # BarnOwl::_create_style("perl", "BarnOwl::_format_msg_legacy_wrap",
-            #                        "User-defined perl style that calls BarnOwl::format_msg"
-            #                        . " with legacy global variable support");
-            # BarnOwl::set("-q default_style perl");
+            BarnOwl::create_style("perl", BarnOwl::Style::Legacy->new(
+                "BarnOwl::format_msg",
+                "User-defined perl style that calls BarnOwl::format_msg"
+                . " with legacy global variable support",
+                1));
+             BarnOwl::set("-q default_style perl");
         }
     }
@@ -779 +774 @@
 sub description {"Default style";}
 
-BarnOwl::_create_style("default", "BarnOwl::Style::Default");
+BarnOwl::create_style("default", "BarnOwl::Style::Default");
 
 ################################################################################
@@ -869 +864 @@
 sub description {"Compatability alias for the default style";}
 
-BarnOwl::_create_style("basic", "BarnOwl::Style::Basic");
+BarnOwl::create_style("basic", "BarnOwl::Style::Basic");
 
 package BarnOwl::Style::OneLine;
@@ -896 +891 @@
 sub description {"Formats for one-line-per-message"}
 
-BarnOwl::_create_style("oneline", "BarnOwl::Style::OneLine");
+BarnOwl::create_style("oneline", "BarnOwl::Style::OneLine");
 
 ################################################################################
@@ -996 +991 @@
 }
 
+package BarnOwl::Style::Legacy;
+
+sub new {
+    my $class = shift;
+    my $func  = shift;
+    my $desc  = shift;
+    my $useglobals = shift;
+    $useglobals = 0 unless defined($useglobals);
+    return bless {function    => $func,
+                  description => $desc,
+                  useglobals  => $useglobals}, $class;
+}
+
+sub description {shift->{description}};
+
+sub format_message {
+    my $self = shift;
+    if($self->{useglobals}) {
+        $_[0]->legacy_populate_global();
+    }
+    no strict 'refs';
+    goto \&{$self->{function}};
+}
+
 
 # switch to package main when we're done