comment this up the arseholes

[catagits/Web-Simple.git] / lib / XML / Tags.pm

diff --git a/lib/XML/Tags.pm b/lib/XML/Tags.pm
index 4acc852..40f6926 100644 (file)
--- a/lib/XML/Tags.pm
+++ b/lib/XML/Tags.pm
@@ -14,7 +14,6 @@ sub import {
   my $opts = shift(@args) if ref($args[0]) eq 'HASH';
   my $target = $class->_find_target(0, $opts);
   my @tags = $class->_find_tags(@args);
-  $class->_setup_glob_override;
   my $unex = $class->_export_tags_into($target => @tags);
   $class->_install_unexporter($unex);
   $IN_SCOPE = 1;
@@ -39,21 +38,15 @@ sub _find_target {
   return (caller($level))[0];
 }
 
-{
-  my $setup;
-
-  sub _setup_glob_override {
-    return if $setup;
-    $setup = 1;
-    no warnings 'redefine';
-    *CORE::GLOBAL::glob = sub {
-      for ($_[0]) {
-        # unless it smells like </foo> or <foo bar="baz">
-        return File::Glob::glob($_[0]) unless (/^\/\w+$/ || /^\w+\s+\w+="/);
-      }
-      return \('<'.$_[0].'>');
-    };
-  }
+sub _set_glob {
+  # stupid insanity. delete anything already there so we disassociated
+  # the *CORE::GLOBAL::glob typeglob. Then the compilation of the eval
+  # revivifies it - i.e. creates us a new glob, which we get a reference
+  # to, which we can then assign to.
+  # doing it without the eval doesn't - it binds to the version in scope
+  # at compile time, which means after a delete you get a nice warm segv.
+  delete ${CORE::GLOBAL::}{glob};
+  *{eval '\*CORE::GLOBAL::glob'} = $_[0];
 }
 
 sub _export_tags_into {
@@ -62,11 +55,13 @@ sub _export_tags_into {
     no strict 'refs';
     tie *{"${into}::${tag}"}, 'XML::Tags::TIEHANDLE', \"<${tag}>";
   }
+  _set_glob(sub { \('<'.$_[0].'>'); });
   return sub {
     foreach my $tag (@tags) {
       no strict 'refs';
       delete ${"${into}::"}{$tag}
     }
+    _set_glob(\&File::Glob::glob);
     $IN_SCOPE = 0;
   };
 }