[7883] parsetexi fileparse for input_file_name

[gavinsmith0123]

Revision: 7883
          http://svn.sv.gnu.org/viewvc/?view=rev&root=texinfo&revision=7883
Author:   gavin
Date:     2017-06-29 15:11:08 -0400 (Thu, 29 Jun 2017)
Log Message:
-----------
parsetexi fileparse for input_file_name

Modified Paths:
--------------
    trunk/tp/parsetexi/Parsetexi.pm

Modified: trunk/tp/parsetexi/Parsetexi.pm
===================================================================
--- trunk/tp/parsetexi/Parsetexi.pm     2017-06-29 18:04:08 UTC (rev 7882)
+++ trunk/tp/parsetexi/Parsetexi.pm     2017-06-29 19:11:08 UTC (rev 7883)
@@ -285,6 +285,8 @@
   Texinfo::Common::complete_indices ($self);
 }
 
+use File::Basename; # for fileparse
+
 # Replacement for Texinfo::Parser::parse_texi_file (line 835)
 sub parse_texi_file ($$)
 {
@@ -310,9 +312,6 @@
 
   # Put everything before @setfilename in a special type.  This allows
   # ignoring everything before @setfilename.
-
-  # The non-XS Perl code checks $self->{'extra'}->{'setfilename'}, which
-  # would be set in _register_global_command.
   if ($self->{'IGNORE_BEFORE_SETFILENAME'} and $text_root
       and $self->{'extra'}->{'setfilename'}
       and $self->{'extra'}->{'setfilename'}->{'parent'} eq $text_root) {
@@ -330,11 +329,10 @@
       # not found
       #splice @{$text_root->{'contents'}}, 0, 0, @$before_setfilename;
       $text_root->{'contents'} = $before_setfilename->{'contents'};
+    } else {
+      unshift (@{$text_root->{'contents'}}, $before_setfilename)
+        if (@{$before_setfilename->{'contents'}});
     }
-    else {
-    unshift (@{$text_root->{'contents'}}, $before_setfilename)
-      if (@{$before_setfilename->{'contents'}});
-    }
   }
 
   ############################################################
@@ -345,8 +343,14 @@
             $self->{'info'}->{'input_encoding_name'});
     $self->{'info'}->{'input_encoding_name'} = $input_encoding;
   }
-  $self->{'info'}->{'input_file_name'} = $file_name;
 
+  if (!$self->{'TEST'}) {
+    $self->{'info'}->{'input_file_name'} = $file_name;
+  } else {
+    my ($filename, $directories, $suffix) = fileparse($file_name);
+    $self->{'info'}->{'input_file_name'} = $filename;
+  }
+
   return $TREE;
 }