Changeset 836e6263

Timestamp:

Mar 23, 2007, 3:09:45 PM (18 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:

9729dba

Parents:

b547aa4

git-author:

Nelson Elhage <nelhage@mit.edu> (03/23/07 15:09:38)

git-committer:

Nelson Elhage <nelhage@mit.edu> (03/23/07 15:09:45)

Message:

Implement loading of unpacked modules, and module reloading.

Files:

• perl/lib/BarnOwl/ModuleLoader.pm (modified) (2 diffs)
• perlwrap.pm (modified) (1 diff)

perl/lib/BarnOwl/ModuleLoader.pm

@@ -15 +15 @@
                   $ENV{HOME} . "/.owl/modules" ) {
         opendir(my $dh, $dir) or next;
+        while(defined(my $f = readdir($dh))) {
+            next if $f =~ /^\./;
+            if(-f "$dir/$f" && $f =~ /^(.+)\.par$/) {
+                $modules{$1} = 1;
+            } elsif(-d "$dir/$f" && -d "$dir/$f/lib") {
+                push @INC, "$dir/$f/lib" unless grep m{^$dir/$f/lib$}, @INC;
+                $modules{$f} = 1;
+            }
+        }
         @modules = grep /\.par$/, readdir($dh);
         closedir($dh);
@@ -30 +39 @@
 }
 
+sub reload {
+    my $class = shift;
+    for my $m (keys %INC) {
+        delete $INC{$m} if $m =~ m{^BarnOwl/};
+    }
+    # Restore core modules from perlwrap.pm
+    $INC{$_} = 1 for (qw(BarnOwl.pm BarnOwl/Hooks.pm
+                         BarnOwl/Message.pm BarnOwl/Style.pm));
+
+    $BarnOwl::Hooks::startup->clear;
+    local $SIG{__WARN__} = \&squelch_redefine;
+    $class->load_all;
+    $BarnOwl::Hooks::startup->run(1);
+    BarnOwl::startup() if *BarnOwl::startup{CODE};
+}
+
+sub squelch_redefine {
+    my $warning = shift;
+    warn $warning unless $warning =~ /redefined/;
+}
+
 1;

perlwrap.pm

@@ -425 +425 @@
     }
     
-    $startup->run;
+    $startup->run(0);
     BarnOwl::startup() if *BarnOwl::startup{CODE};
 }