use new error handling for XPath contexts

libxml-raku · May 31, 2024 · 2a64756 · 2a64756
1 parent f799ad9
commit 2a64756
Show file tree

Hide file tree

Showing 5 changed files with 22 additions and 18 deletions.
diff --git a/lib/LibXML/ErrorHandling.rakumod b/lib/LibXML/ErrorHandling.rakumod
@@ -232,8 +232,8 @@ role LibXML::ErrorHandling {
 
     # SAX External Callback
     sub structured-error-cb($ctx, xmlError:D $err) is export(:structured-error-cb) {
-        CATCH { default { note "error handling XML structured error: $_" } } 
-       $*XML-CONTEXT.structured-error($err);
+        CATCH { default { note "error handling XML structured error: $_" } }
+        $*XML-CONTEXT.structured-error($err);
     }
 
     # API Callback - structured

diff --git a/lib/LibXML/Raw.rakumod b/lib/LibXML/Raw.rakumod
@@ -853,6 +853,9 @@ class xmlXPathContext is repr('CStruct') is export {
     constant xmlXPathFunction = Pointer;
     method RegisterFuncLookup( &func4 (xmlXPathContext, xmlCharP $name, xmlCharP $ns-uri --> xmlXPathFunction), Pointer) is native($XML2) is symbol('xmlXPathRegisterFuncLookup') {*};
     method FunctionLookupNS(xmlCharP $name, xmlCharP $ns_uri --> xmlXPathFunction) is native($XML2) is symbol('xmlXPathFunctionLookupNS') {*};
+    # recommended libxml 2.13.0+
+    method SetErrorHandler(&error-func (xmlXIncludeCtxt $, xmlError $)) is native($XML2) is symbol('xmlXPathSetErrorHandler') {*};
+    # legacy
     method SetStructuredErrorFunc( &error-func (xmlXPathContext $, xmlError $)) is native($BIND-XML2) is symbol('domSetXPathCtxtErrorHandler') {*};
 }
 

diff --git a/lib/LibXML/SAX.rakumod b/lib/LibXML/SAX.rakumod
@@ -1,11 +1,11 @@
-use LibXML::Parser;
+unit class LibXML::SAX;
 
-class LibXML::SAX
-    is LibXML::Parser {
-    use LibXML::SAX::Handler::SAX2;
+use LibXML::Parser;
+also is LibXML::Parser;
 
-    submethod TWEAK {
-        self.sax-handler //= LibXML::SAX::Handler::SAX2;
-    }
+use LibXML::SAX::Handler::SAX2;
 
+submethod TWEAK {
+    self.sax-handler //= LibXML::SAX::Handler::SAX2;
 }
+
diff --git a/lib/LibXML/XPath/Context.rakumod b/lib/LibXML/XPath/Context.rakumod
@@ -148,6 +148,8 @@ proto submethod TWEAK (xmlXPathContext :$raw) {
   with $raw {
       .Reference with .node;
   }
+  self.init-local-error-handling
+      unless self.config.version < v2.13.00;
   {*}
 }
 
@@ -185,8 +187,11 @@ method !do(&action) is hidden-from-backtrace {
     my $rv;
 
     protected sub () is hidden-from-backtrace {
-        my $handlers = xml6_gbl::save-error-handlers();
-        self.SetGenericErrorFunc: &generic-error-cb;
+        my $handlers;
+        if self.global-error-handling {
+            $handlers = xml6_gbl::save-error-handlers();
+            self.SetGenericErrorFunc: &generic-error-cb;
+        }
         my $*XPATH-CONTEXT = self;
         my @prev = self.config.setup;
 
@@ -196,7 +201,8 @@ method !do(&action) is hidden-from-backtrace {
 
         LEAVE {
             self.config.restore(@prev);
-            xml6_gbl::restore-error-handlers($handlers);
+            xml6_gbl::restore-error-handlers($handlers)
+                if self.global-error-handling;
         }
     }
     $rv;

diff --git a/t/00errors.t b/t/00errors.t
@@ -1,10 +1,7 @@
 use v6;
 use Test;
-use LibXML::XPath::Context;
+plan 4;
 
-my $errors;
-LibXML::XPath::Context.SetGenericErrorFunc(-> |c { $errors++ });
-plan 5;
 {
     use LibXML::Pattern;
     my LibXML::Pattern $patt;
@@ -20,5 +17,3 @@ plan 5;
     lives-ok {$regexp.new(:regexp('a'))};
     throws-like { $regexp.new(:regexp('a[zz')) }, X::LibXML::OpFail, :message('XML RegExp Compile operation failed');
 }
-
-ok $errors, 'errors caught';