[no subject]

[Gavin D. Smith]

branch: master
commit e6535598ada97e69b16f971d4487f21aa19c02bd
Author: Gavin Smith <gavinsmith0123@gmail.com>
AuthorDate: Sat Feb 24 16:56:35 2024 +0000

    * tp/Texinfo/Parser.pm: Always call Texinfo::XSLoader::init with
    "Texinfo::Parser" as the first argument.  This is needed to call
    the import function loaded from Texinfo/ParserNonXS.pm.  Undef
    the "Parsetexi" argument if TEXINFO_XS_PARSER is 0.
    * tp/Texinfo/XSLoader.pm (init): Check if argument giving the name
    of the Libtool file is undefined.
    
    Running with TEXINFO_XS_PARSER=0 was broken.
---
 ChangeLog              | 11 +++++++++++
 tp/Texinfo/Parser.pm   |  8 ++++----
 tp/Texinfo/XSLoader.pm |  9 ++++-----
 3 files changed, 19 insertions(+), 9 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 80e2ad0003..18e49919c2 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,14 @@
+2024-02-24  Gavin Smith <gavinsmith0123@gmail.com>
+
+       * tp/Texinfo/Parser.pm: Always call Texinfo::XSLoader::init with
+       "Texinfo::Parser" as the first argument.  This is needed to call
+       the import function loaded from Texinfo/ParserNonXS.pm.  Undef
+       the "Parsetexi" argument if TEXINFO_XS_PARSER is 0.
+       * tp/Texinfo/XSLoader.pm (init): Check if argument giving the name
+       of the Libtool file is undefined.
+
+       Running with TEXINFO_XS_PARSER=0 was broken.
+
 2024-02-24  Patrice Dumas  <pertusus@free.fr>
 
        * tp/Texinfo/XS/parsetexi/input.c (input_push_file): use save_string
diff --git a/tp/Texinfo/Parser.pm b/tp/Texinfo/Parser.pm
index 0a08649039..7d60a147ed 100644
--- a/tp/Texinfo/Parser.pm
+++ b/tp/Texinfo/Parser.pm
@@ -25,16 +25,16 @@ our $VERSION = '7.1dev';
 use Texinfo::XSLoader;
 
 BEGIN {
-  my $xs_package = "Texinfo::Parser";
+  my $shared_library_name = "Parsetexi";
   if (defined $ENV{TEXINFO_XS_PARSER}
       and $ENV{TEXINFO_XS_PARSER} eq '0') {
-    undef $xs_package;
+    undef $shared_library_name;
   }
 
   my $package = Texinfo::XSLoader::init (
-      $xs_package,
+      "Texinfo::Parser",
       "Texinfo::ParserNonXS",
-      "Parsetexi",
+      $shared_library_name,
       "Texinfo::XS::parsetexi::Parsetexi",
       0,
   );
diff --git a/tp/Texinfo/XSLoader.pm b/tp/Texinfo/XSLoader.pm
index 5ecbd07f6c..e04ddd6db7 100644
--- a/tp/Texinfo/XSLoader.pm
+++ b/tp/Texinfo/XSLoader.pm
@@ -70,10 +70,9 @@ sub _find_file($) {
   return undef;
 }
 
-# Load either from XS implementation in $MODULE along with Perl file
-# $PERL_EXTRA_FILE, or non-XS implementation $FALLBACK_MODULE.
-# $MODULE_NAME is the name of a Libtool file used for
-# loading the XS subroutines.
+# Load module $module, either from XS implementation in
+# Libtool file $MODULE_NAME and Perl file $PERL_EXTRA_FILE,
+# or non-XS implementation $FALLBACK_MODULE.
 # $INTERFACE_VERSION is a module interface number, to be changed when the XS
 # interface changes.
 # The package loaded is returned or undef if there is no fallback and the
@@ -123,7 +122,7 @@ sub init {
     goto FALLBACK;
   }
 
-  if (!$module) {
+  if (!$module_name) {
     goto FALLBACK;
   }