[6774] TestXS.pm

[Gavin D. Smith]

Revision: 6774
          http://svn.sv.gnu.org/viewvc/?view=rev&root=texinfo&revision=6774
Author:   gavin
Date:     2015-11-09 22:57:45 +0000 (Mon, 09 Nov 2015)
Log Message:
-----------
TestXS.pm

Modified Paths:
--------------
    trunk/ChangeLog
    trunk/tp/Texinfo/Convert/XSParagraph/TestXS.pm

Modified: trunk/ChangeLog
===================================================================
--- trunk/ChangeLog     2015-11-09 22:47:01 UTC (rev 6773)
+++ trunk/ChangeLog     2015-11-09 22:57:45 UTC (rev 6774)
@@ -1,5 +1,11 @@
 2015-11-09  Gavin Smith  <address@hidden>
 
+       * tp/Texinfo/Convert/XSParagraph/TestXS.pm: Remove mentions of 
+       "XSParagraph" in comments and messages.  Comment out line for 
+       debugging output.
+
+2015-11-09  Gavin Smith  <address@hidden>
+
        * tp/texi2any.pl: Use srcdir as well as builddir to set module 
        search path.
        * man/Makefile.am (MAKEINFO_ENVIRONMENT): Set value of 

Modified: trunk/tp/Texinfo/Convert/XSParagraph/TestXS.pm
===================================================================
--- trunk/tp/Texinfo/Convert/XSParagraph/TestXS.pm      2015-11-09 22:47:01 UTC 
(rev 6773)
+++ trunk/tp/Texinfo/Convert/XSParagraph/TestXS.pm      2015-11-09 22:57:45 UTC 
(rev 6774)
@@ -29,9 +29,6 @@
 # names by default without a very good reason. Use EXPORT_OK instead.
 # Do not simply export all your public functions/methods/constants.
 
-# This allows declaration      use XSParagraph ':all';
-# If you do not need this, moving things directly into @EXPORT or @EXPORT_OK
-# will save memory.
 our %EXPORT_TAGS = ( 'all' => [ qw(
 
 ) ] );
@@ -53,7 +50,7 @@
 #
 # Other values are treated at the moment as 'default'.
 
-my $TEXINFO_XS = 'debug';
+#my $TEXINFO_XS = 'debug';
 if (!defined($TEXINFO_XS)) {
   $TEXINFO_XS = '';
 }
@@ -103,18 +100,18 @@
 
 my ($libtool_dir, $libtool_archive) = _find_file("TestXS.la");
 if (!$libtool_archive) {
-  _fatal "XSParagraph: couldn't find Libtool archive file";
+  _fatal "couldn't find Libtool archive file";
   goto FALLBACK;
 }
 
 my $fh;
 open $fh, $libtool_archive;
 if (!$fh) {
-  _fatal "XSParagraph: couldn't open Libtool archive file";
+  _fatal "couldn't open Libtool archive file";
   goto FALLBACK;
 }
 
-# Look for the line in XSParagraph.la giving the name of the loadable object.
+# Look for the line in TestXS.la giving the name of the loadable object.
 my $dlname = undef;
 while (my $line = <$fh>) {
   if ($line =~ /^\s*dlname\s*=\s*'([^']+)'\s$/) {
@@ -123,7 +120,7 @@
   }
 }
 if (!$dlname) {
-  _fatal "XSParagraph: couldn't find name of shared object";
+  _fatal "couldn't find name of shared object";
   goto FALLBACK;
 }
 
@@ -133,7 +130,7 @@
 
 my $dlpath = DynaLoader::dl_findfile($dlname);
 if (!$dlpath) {
-  _fatal "XSParagraph: couldn't find $dlname";
+  _fatal "couldn't find $dlname";
   goto FALLBACK;
 }
 
@@ -142,35 +139,28 @@
 my $module = "TestXS";
 our $module_version = '6.0';
 
-# Following steps under "bootstrap" in "man DynaLoader".
-#bootstrap XSParagraph $VERSION;
-
-# TODO: Execute blib/arch/auto/XSParagraph/XSParagraph.bs ?
-# That file is empty.
-
-#my $flags = dl_load_flags $module; # This is 0 in DynaLoader
 my $flags = 0;
 my $libref = DynaLoader::dl_load_file($dlpath, $flags);
 if (!$libref) {
-  _fatal "XSParagraph: couldn't load file $dlpath";
+  _fatal "couldn't load file $dlpath";
   goto FALLBACK;
 }
 my @undefined_symbols = DynaLoader::dl_undef_symbols();
 if ($#undefined_symbols+1 != 0) {
-  _fatal "XSParagraph: still have undefined symbols after dl_load_file";
+  _fatal "still have undefined symbols after dl_load_file";
 }
 my $bootname = "boot_$module";
 $bootname =~ s/:/_/g;
 my $symref = DynaLoader::dl_find_symbol($libref, $bootname);
 if (!$symref) {
-  _fatal "XSParagraph: couldn't find boot_$module symbol";
+  _fatal "couldn't find boot_$module symbol";
   goto FALLBACK;
 }
 my $boot_fn = DynaLoader::dl_install_xsub("${module}::bootstrap",
                                                 $symref, $dlname);
 
 if (!$boot_fn) {
-  _fatal "XSParagraph: couldn't bootstrap";
+  _fatal "couldn't bootstrap";
   goto FALLBACK;
 }
 
@@ -182,7 +172,7 @@
 &$boot_fn($module, $module_version);
 
 if (!TestXS::init ()) {
-  _fatal "XSParagraph: error initializing";
+  _fatal "error initializing";
   goto FALLBACK;
 }
 goto DONTFALLBACK;