[7113] commit diff for testing parsetexi

[Gavin D. Smith]

Revision: 7113
          http://svn.sv.gnu.org/viewvc/?view=rev&root=texinfo&revision=7113
Author:   gavin
Date:     2016-04-09 16:01:31 +0000 (Sat, 09 Apr 2016)
Log Message:
-----------
commit diff for testing parsetexi

Modified Paths:
--------------
    trunk/tp/diff-for-test-parsetexi.diff

Modified: trunk/tp/diff-for-test-parsetexi.diff
===================================================================
--- trunk/tp/diff-for-test-parsetexi.diff       2016-04-09 15:54:48 UTC (rev 
7112)
+++ trunk/tp/diff-for-test-parsetexi.diff       2016-04-09 16:01:31 UTC (rev 
7113)
@@ -1,6 +1,6 @@
 Index: Texinfo/Convert/Converter.pm
 ===================================================================
---- Texinfo/Convert/Converter.pm       (revision 7025)
+--- Texinfo/Convert/Converter.pm       (revision 7110)
 +++ Texinfo/Convert/Converter.pm       (working copy)
 @@ -1134,6 +1134,8 @@ sub _collect_leading_trailing_spaces_arg($$)
    return @result;
@@ -44,14 +44,14 @@
    if (!$libexec_dir) {
 Index: Texinfo/Parser.pm
 ===================================================================
---- Texinfo/Parser.pm  (revision 7080)
+--- Texinfo/Parser.pm  (revision 7111)
 +++ Texinfo/Parser.pm  (working copy)
-@@ -32,6 +32,9 @@ package Texinfo::Parser;
+@@ -33,6 +33,9 @@ package Texinfo::Parser;
  use 5.006;
  use strict;
  
 +# make sure we don't load this module for testing XS
-+#die;
++die;
 +
  # debug
  use Carp qw(cluck);
@@ -84,15 +84,20 @@
 ===================================================================
 --- Texinfo/Structuring.pm     (revision 7080)
 +++ Texinfo/Structuring.pm     (working copy)
-@@ -578,7 +578,7 @@ sub nodes_tree($)
-   my $check_menu_entries = (!$self->{'novalidate'} and $self->{'SHOW_MENU'});
- 
+@@ -580,11 +580,11 @@ sub nodes_tree($)
    foreach my $node (@{$self->{'nodes'}}) {
--    if ($node->{'extra'}->{'normalized'} eq 'Top') {
-+    if (0 and $node->{'extra'}->{'normalized'} eq 'Top') {
+     if ($node->{'extra'}->{'normalized'} eq 'Top') {
        $top_node = $node;
-       my $top_node_up_content_tree = Texinfo::Parser::parse_texi_line($self, 
+-      my $top_node_up_content_tree = Texinfo::Parser::parse_texi_line($self, 
++      my $top_node_up_content_tree = Parsetexi::parse_texi_line($self, 
                                                      $self->{'TOP_NODE_UP'});
+       $top_node_up
+         = {'type' => 'top_node_up',
+-           'extra' => Texinfo::Parser::_parse_node_manual(
++           'extra' => Texinfo::Common::parse_node_manual(
+                 {'contents' => $top_node_up_content_tree->{'contents'}})};
+     }
+     if ($node->{'menus'}) {
 @@ -802,7 +802,7 @@ sub nodes_tree($)
                                                'extra' => $node_direction };
                $node->{'node_'.$direction}->{'extra'}->{'top_node_up'} 
@@ -102,6 +107,131 @@
                $self->line_error(sprintf($self->
                                    __("%s reference to nonexistent `%s'"),
                      $direction_texts{$direction},
+Index: diff-for-test-parsetexi.diff
+===================================================================
+--- diff-for-test-parsetexi.diff       (revision 7090)
++++ diff-for-test-parsetexi.diff       (working copy)
+@@ -1,6 +1,6 @@
+ Index: Texinfo/Convert/Converter.pm
+ ===================================================================
+---- Texinfo/Convert/Converter.pm      (revision 7025)
++--- Texinfo/Convert/Converter.pm      (revision 7110)
+ +++ Texinfo/Convert/Converter.pm      (working copy)
+ @@ -1134,6 +1134,8 @@ sub _collect_leading_trailing_spaces_arg($$)
+    return @result;
+@@ -44,14 +44,14 @@ Index: Texinfo/ModulePath.pm.in
+    if (!$libexec_dir) {
+ Index: Texinfo/Parser.pm
+ ===================================================================
+---- Texinfo/Parser.pm (revision 7080)
++--- Texinfo/Parser.pm (revision 7111)
+ +++ Texinfo/Parser.pm (working copy)
+-@@ -32,6 +32,9 @@ package Texinfo::Parser;
++@@ -33,6 +33,9 @@ package Texinfo::Parser;
+  use 5.006;
+  use strict;
+  
+ +# make sure we don't load this module for testing XS
+-+#die;
+++die;
+ +
+  # debug
+  use Carp qw(cluck);
+@@ -84,15 +84,20 @@ Index: Texinfo/Structuring.pm
+ ===================================================================
+ --- Texinfo/Structuring.pm    (revision 7080)
+ +++ Texinfo/Structuring.pm    (working copy)
+-@@ -578,7 +578,7 @@ sub nodes_tree($)
+-   my $check_menu_entries = (!$self->{'novalidate'} and $self->{'SHOW_MENU'});
+- 
++@@ -580,11 +580,11 @@ sub nodes_tree($)
+    foreach my $node (@{$self->{'nodes'}}) {
+--    if ($node->{'extra'}->{'normalized'} eq 'Top') {
+-+    if (0 and $node->{'extra'}->{'normalized'} eq 'Top') {
++     if ($node->{'extra'}->{'normalized'} eq 'Top') {
+        $top_node = $node;
+-       my $top_node_up_content_tree = Texinfo::Parser::parse_texi_line($self, 
++-      my $top_node_up_content_tree = Texinfo::Parser::parse_texi_line($self, 
+++      my $top_node_up_content_tree = Parsetexi::parse_texi_line($self, 
+                                                      $self->{'TOP_NODE_UP'});
++       $top_node_up
++         = {'type' => 'top_node_up',
++-           'extra' => Texinfo::Parser::_parse_node_manual(
+++           'extra' => Texinfo::Common::parse_node_manual(
++                 {'contents' => $top_node_up_content_tree->{'contents'}})};
++     }
++     if ($node->{'menus'}) {
+ @@ -802,7 +802,7 @@ sub nodes_tree($)
+                                                'extra' => $node_direction };
+                $node->{'node_'.$direction}->{'extra'}->{'top_node_up'} 
+@@ -102,67 +107,3 @@ Index: Texinfo/Structuring.pm
+                $self->line_error(sprintf($self->
+                                    __("%s reference to nonexistent `%s'"),
+                      $direction_texts{$direction},
+-Index: t/test_utils.pl
+-===================================================================
+---- t/test_utils.pl   (revision 7026)
+-+++ t/test_utils.pl   (working copy)
+-@@ -43,7 +43,8 @@ Texinfo::ModulePath::init();
+- 
+- use Test::More;
+- 
+--use Texinfo::Parser;
+-+#use Texinfo::Parser;
+-+use Parsetexi;
+- use Texinfo::Convert::Text;
+- use Texinfo::Convert::Texinfo;
+- use Texinfo::Structuring;
+-@@ -374,7 +375,7 @@ sub cmp_trimmed($$$$)
+-   my $test_name = shift;
+-   my $trimmed = remove_keys($compared, $deleted_keys);
+- no warnings 'recursion';
+--  cmp_deeply($trimmed, $reference, $test_name);
+-+  Test::Deep::cmp_deeply($trimmed, $reference, $test_name);
+- }
+- 
+- sub new_test($;$$$)
+-@@ -722,7 +723,8 @@ sub test($$)
+-   #  push @tested_formats, @{$self->{'test_formats'}};
+-   }
+- 
+--  my $parser = Texinfo::Parser->parser({'TEST' => 1,
+-+  #my $parser = Texinfo::Parser->parser({'TEST' => 1,
+-+  my $parser = Parsetexi::parser({'TEST' => 1,
+-                                         'include_directories' => [
+-                                           't/include_dir/',
+-                                           't/include/',
+-Index: texi2any.pl
+-===================================================================
+---- texi2any.pl       (revision 7033)
+-+++ texi2any.pl       (working copy)
+-@@ -275,8 +275,8 @@ if ($configured_version eq '@' . 'PACKAGE_VERSION@
+-   } else {
+-     # used in the standalone perl module, as $hardcoded_version is undef
+-     # and it should never be configured in that setup
+--    require Texinfo::Parser;
+--    $configured_version = $Texinfo::Parser::VERSION;
+-+    ## require Texinfo::Parser;
+-+    ## $configured_version = $Texinfo::Parser::VERSION;
+-   }
+- }
+- my $configured_package = '@PACKAGE@';
+-@@ -1071,7 +1071,14 @@ if ($call_texi2dvi) {
+-   document_warn(__('--Xopt option without printed output')); 
+- }
+- 
+--require Texinfo::Parser;
+-+#require Texinfo::Parser;
+-+BEGIN {
+-+require Parsetexi;
+-+*Texinfo::Parser:: = \%Parsetexi::;
+-+}
+-+
+-+print *Parsetexi::{PACKAGE};
+-+
+- require Texinfo::Structuring;
+- # Avoid loading these modules until down here to speed up the case
+- # when they are not needed.
 Index: t/test_utils.pl
 ===================================================================
 --- t/test_utils.pl    (revision 7026)