[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[8074] move parsetexi directory
|
From: |
gavinsmith0123 |
|
Subject: |
[8074] move parsetexi directory |
|
Date: |
Wed, 15 Aug 2018 11:41:56 -0400 (EDT) |
Revision: 8074
http://svn.sv.gnu.org/viewvc/?view=rev&root=texinfo&revision=8074
Author: gavin
Date: 2018-08-15 11:41:55 -0400 (Wed, 15 Aug 2018)
Log Message:
-----------
move parsetexi directory
Modified Paths:
--------------
trunk/tp/Texinfo/ModulePath.pm.in
Added Paths:
-----------
trunk/tp/Texinfo/XS/parsetexi/
trunk/tp/Texinfo/XS/parsetexi/Parsetexi.pm
trunk/tp/Texinfo/XS/parsetexi/README
Removed Paths:
-------------
trunk/tp/Texinfo/XS/parsetexi/Parsetexi.pm
trunk/tp/Texinfo/XS/parsetexi/README
Modified: trunk/tp/Texinfo/ModulePath.pm.in
===================================================================
--- trunk/tp/Texinfo/ModulePath.pm.in 2018-08-15 15:22:08 UTC (rev 8073)
+++ trunk/tp/Texinfo/ModulePath.pm.in 2018-08-15 15:41:55 UTC (rev 8074)
@@ -76,7 +76,7 @@
$libexec_dir = File::Spec->catdir($ENV{'top_builddir'}, 'tp',
'Texinfo', 'XS');
}
- unshift @INC, (File::Spec->catdir($lib_dir, '..', 'parsetexi'));
+ unshift @INC, (File::Spec->catdir($lib_dir, '..', 'Texinfo', 'XS',
'parsetexi'));
}
if (defined($libexec_dir)) {
@@ -87,7 +87,7 @@
unshift @INC, sub {
my ($coderef, $filename) = @_;
if ($filename eq 'Texinfo/Parser.pm') {
- my $replacement = 'parsetexi/Parsetexi.pm';
+ my $replacement = 'Texinfo/XS/parsetexi/Parsetexi.pm';
foreach my $prefix (@INC) {
if (ref($prefix)) {
next;
Deleted: trunk/tp/Texinfo/XS/parsetexi/Parsetexi.pm
===================================================================
--- trunk/tp/parsetexi/Parsetexi.pm 2018-08-14 10:05:33 UTC (rev 8058)
+++ trunk/tp/Texinfo/XS/parsetexi/Parsetexi.pm 2018-08-15 15:41:55 UTC (rev
8074)
@@ -1,518 +0,0 @@
-# Copyright 2014, 2015, 2016, 2017, 2018 Free Software Foundation, Inc.
-#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 3 of the License,
-# or (at your option) any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program. If not, see <http://www.gnu.org/licenses/>.
-
-package Parsetexi;
-
-use Texinfo::XSLoader;
-
-# same as texi2any.pl, although I don't know what the real requirement
-# is for this module.
-use 5.00405;
-use strict;
-use warnings;
-
-require Exporter;
-
-use Texinfo::Report;
-use Texinfo::Common;
-use Texinfo::Encoding;
-use Texinfo::Convert::NodeNameNormalization;
-
-our @ISA = qw(Exporter DynaLoader Texinfo::Report);
-# Items to export into callers namespace by default. Note: do not export
-# 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(
- parser
- parse_texi_text
- parse_texi_line
- parse_texi_file
-) ] );
-
-our @EXPORT_OK = ( @{ $EXPORT_TAGS{'all'} } );
-
-our @EXPORT = qw(
-
-);
-
-sub get_conf($$)
-{
- my $self = shift;
- my $var = shift;
- return $self->{$var};
-}
-
-# Copied from Parser.pm
-# Customization variables obeyed by the Parser, and the default values.
-our %default_customization_values = (
- 'TEST' => 0,
- 'DEBUG' => 0, # if >= 10, tree is printed in texi2any.pl after parsing.
- # If >= 100 tree is printed every line.
- 'SHOW_MENU' => 1, # if false no menu error related.
- 'INLINE_INSERTCOPYING' => 0,
- 'IGNORE_BEFORE_SETFILENAME' => 1,
- 'MACRO_BODY_IGNORES_LEADING_SPACE' => 0,
- 'IGNORE_SPACE_AFTER_BRACED_COMMAND_NAME' => 1,
- 'INPUT_PERL_ENCODING' => undef, # input perl encoding name, set from
- # @documentencoding in the default case
- 'INPUT_ENCODING_NAME' => undef, # encoding name normalized as preferred
- # IANA, set from @documentencoding in the default
- # case
- 'CPP_LINE_DIRECTIVES' => 1, # handle cpp like synchronization lines
- 'MAX_MACRO_CALL_NESTING' => 100000, # max number of nested macro calls
- 'GLOBAL_COMMANDS' => [], # list of commands registered
- # This is not used directly, but passed to Convert::Text through
- # Texinfo::Common::_convert_text_options
- 'ENABLE_ENCODING' => 1, # output accented and special characters
- # based on @documentencoding
- # following are used in Texinfo::Structuring
- 'TOP_NODE_UP' => '(dir)', # up node of Top node
- 'SIMPLE_MENU' => 0, # not used in the parser but in structuring
- 'USE_UP_NODE_FOR_ELEMENT_UP' => 0, # Use node up for Up if there is no
- # section up.
-);
-
-my %parser_default_configuration =
- (%Texinfo::Common::default_parser_state_configuration,
- %default_customization_values);
-
-my %tree_informations;
-foreach my $tree_information ('values', 'macros', 'explained_commands',
'labels') {
- $tree_informations{$tree_information} = 1;
-}
-
-use Storable qw(dclone); # standard in 5.007003
-
-sub duplicate_parser {
- my $old_parser = shift;
-
- my $parser = dclone(\%parser_default_configuration);
-
- foreach my $key (keys(%parser_default_configuration)) {
- if ($tree_informations{$key}) {
- if (defined($old_parser->{$key})) {
- foreach my $info_key (keys(%{$old_parser->{$key}})) {
- $parser->{$key}->{$info_key}
- = $old_parser->{$key}->{$info_key};
- }
- }
- } elsif(ref($old_parser->{$key})) {
- $parser->{$key} = dclone($old_parser->{$key});
- } else {
- $parser->{$key} = $old_parser->{$key};
- }
- }
- bless $parser, ref($old_parser);
-
- $parser->Texinfo::Report::new;
- return $parser;
-}
-
-# Stub for Texinfo::Parser::parser (line 574)
-sub parser (;$$)
-{
- my $conf = shift;
-
- my $parser = dclone(\%parser_default_configuration);
-
- reset_parser ();
- # fixme: these are overwritten immediately after
- if (defined($conf)) {
- foreach my $key (keys (%$conf)) {
- if ($key ne 'values' and ref($conf->{$key})) {
- $parser->{$key} = dclone($conf->{$key});
- } else {
- $parser->{$key} = $conf->{$key};
- }
-
- if ($key eq 'include_directories') {
- foreach my $d (@{$conf->{'include_directories'}}) {
- add_include_directory ($d);
- }
- } elsif ($key eq 'values') {
- # This is used by Texinfo::Report::gdt for substituted values
- for my $v (keys %{$conf->{'values'}}) {
- if (!ref($conf->{'values'}->{$v})) {
- store_value ($v, $conf->{'values'}->{$v});
- } elsif (ref($conf->{'values'}->{$v}) eq 'HASH') {
- store_value ($v, "<<HASH VALUE>>");
- } elsif (ref($conf->{'values'}->{$v}) eq 'ARRAY') {
- store_value ($v, "<<ARRAY VALUE>>");
- } else {
- store_value ($v, "<<UNKNOWN VALUE>>");
- }
- }
- } elsif ($key eq 'expanded_formats') {
- clear_expanded_formats ();
-
- for my $f (@{$parser->{$key}}) {
- add_expanded_format ($f);
- }
- } elsif ($key eq 'documentlanguage') {
- if (defined ($conf->{$key})) {
- set_documentlanguage ($conf->{$key});
- }
- } elsif ($key eq 'SHOW_MENU') {
- conf_set_show_menu ($conf->{$key});
- } elsif ($key eq 'CPP_LINE_DIRECTIVES') {
- conf_set_CPP_LINE_DIRECTIVES($conf->{$key});
- } else {
- #warn "ignoring parser configuration value \"$key\"\n";
- }
- }
- }
-
- bless $parser;
-
- $parser->Texinfo::Report::new;
-
- return $parser;
-}
-
-# Record any @menu elements under $root in the 'menus' array of $node.
-sub _find_menus_of_node {
- my $node = shift;
- my $root = shift;
-
- if ($root->{'contents'}) {
- my $contents = $root->{'contents'};
- foreach my $child (@{$contents}) {
- if ($child->{'cmdname'} and $child->{'cmdname'} eq 'menu') {
- push @{$node->{'menus'}}, $child;
- }
- }
- }
-}
-
-# Set 'menus' array for each node. This accounts for malformed input where
-# the number of sectioning commands between @node and @menu is not exactly 1.
-sub _complete_node_menus {
- my $self = shift;
- my $root = shift;
-
- if (!defined $self->{'nodes'}) {
- $self->{'nodes'} = [];
- }
- my $node;
- foreach my $child (@{$root->{'contents'}}) {
- if ($child->{'cmdname'} and $child->{'cmdname'} eq 'node') {
- $node = $child;
- }
- _find_menus_of_node ($node, $child) unless !defined $node;
- }
-}
-
-sub get_parser_info {
- my $self = shift;
-
- my ($TARGETS, $INTL_XREFS, $FLOATS,
- $INDEX_NAMES, $ERRORS, $GLOBAL_INFO, $GLOBAL_INFO2);
-
- $TARGETS = build_label_list ();
- $INTL_XREFS = build_internal_xref_list ();
- $FLOATS = build_float_list ();
-
- $INDEX_NAMES = build_index_data ();
- $self->{'index_names'} = $INDEX_NAMES;
-
- $GLOBAL_INFO = build_global_info ();
- $GLOBAL_INFO2 = build_global_info2 ();
-
- $self->{'targets'} = $TARGETS;
- $self->{'labels'} = {};
- $self->{'internal_references'} = $INTL_XREFS;
- $self->{'floats'} = $FLOATS;
- $self->{'info'} = $GLOBAL_INFO;
- $self->{'extra'} = $GLOBAL_INFO2;
-
- _get_errors ($self);
- Texinfo::Common::complete_indices ($self);
-}
-
-use File::Basename; # for fileparse
-
-# Replacement for Texinfo::Parser::parse_texi_file (line 835)
-sub parse_texi_file ($$)
-{
- my $self = shift;
- my $file_name = shift;
- my $tree_stream;
-
- $self->{'info'}->{'input_file_name'} = $file_name;
-
- parse_file ($file_name);
- my $TREE = build_texinfo_tree ();
- get_parser_info ($self);
- _complete_node_menus ($self, $TREE);
-
- # line 899
- my $text_root;
- if ($TREE->{'type'} eq 'text_root') {
- $text_root = $TREE;
- } elsif ($TREE->{'contents'} and $TREE->{'contents'}->[0]
- and $TREE->{'contents'}->[0]->{'type'} eq 'text_root') {
- $text_root = $TREE->{'contents'}->[0];
- }
-
- # Put everything before @setfilename in a special type. This allows
- # ignoring everything before @setfilename.
- if ($self->{'IGNORE_BEFORE_SETFILENAME'} and $text_root
- and $self->{'extra'}->{'setfilename'}
- and $self->{'extra'}->{'setfilename'}->{'parent'} eq $text_root) {
- my $before_setfilename = {'type' => 'preamble_before_setfilename',
- 'parent' => $text_root,
- 'contents' => []};
- while (@{$text_root->{'contents'}}
- and (!$text_root->{'contents'}->[0]->{'cmdname'}
- or $text_root->{'contents'}->[0]->{'cmdname'} ne 'setfilename')) {
- my $content = shift @{$text_root->{'contents'}};
- $content->{'parent'} = $before_setfilename;
- push @{$before_setfilename->{'contents'}}, $content;
- }
- if (address@hidden>{'contents'}}) {
- # 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'}});
- }
- }
-
- ############################################################
-
- if (defined($self->{'info'}->{'input_encoding_name'})) {
- my ($texinfo_encoding, $perl_encoding, $input_encoding)
- = Texinfo::Encoding::encoding_alias(
- $self->{'info'}->{'input_encoding_name'});
- $self->{'info'}->{'input_encoding_name'} = $input_encoding;
- }
-
- 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;
-}
-
-# Copy the errors into the error list in Texinfo::Report.
-# TODO: Could we just access the error list directly instead of going
-# through Texinfo::Report line_error?
-sub _get_errors($)
-{
- my $self = shift;
- my $ERRORS;
- my $tree_stream = dump_errors();
- eval $tree_stream;
- for my $error (@{$ERRORS}) {
- if ($error->{'type'} eq 'error') {
- $self->line_error ($error->{'message'}, $error->{'line_nr'});
- } else {
- $self->line_warn ($error->{'message'}, $error->{'line_nr'});
- }
- }
-}
-
-# Replacement for Texinfo::Parser::parse_texi_text (line 757)
-#
-# Used in tests under tp/t.
-sub parse_texi_text($$;$$$$)
-{
- my $self = shift;
- my $text = shift;
- my $lines_nr = shift;
- my $file = shift;
- my $macro = shift;
- my $fixed_line_number = shift;
-
- return undef if (!defined($text));
-
- $self = parser() if (!defined($self));
-
- # make sure that internal byte buffer is in UTF-8 before we pass
- # it in to the XS code.
- utf8::upgrade($text);
-
- parse_text($text);
- my $tree = build_texinfo_tree ();
- my $INDEX_NAMES = build_index_data ();
- $self->{'index_names'} = $INDEX_NAMES;
-
- for my $index (keys %$INDEX_NAMES) {
- if ($INDEX_NAMES->{$index}->{'merged_in'}) {
- $self->{'merged_indices'}-> {$index}
- = $INDEX_NAMES->{$index}->{'merged_in'};
- }
- }
-
- get_parser_info($self);
- _complete_node_menus ($self, $tree);
- return $tree;
-}
-
-# Replacement for Texinfo::Parser::parse_texi_line (line 918)
-sub parse_texi_line($$;$$$$)
-{
- my $self = shift;
- my $text = shift;
- my $lines_nr = shift;
- my $file = shift;
- my $macro = shift;
- my $fixed_line_number = shift;
-
- return undef if (!defined($text));
-
- $self = parser() if (!defined($self));
- utf8::upgrade($text);
- parse_string($text);
- my $tree = build_texinfo_tree ();
- return $tree;
-}
-
-# Public interfaces of Texinfo::Parser (starting line 942)
-sub indices_information($)
-{
- my $self = shift;
-
- my $INDEX_NAMES;
- if (!$self->{'index_names'}) {
- $INDEX_NAMES = build_index_data ();
- $self->{'index_names'} = $INDEX_NAMES;
- }
- return $self->{'index_names'};
-}
-
-sub floats_information($)
-{
- my $self = shift;
- return $self->{'floats'};
-}
-
-sub internal_references_information($)
-{
- my $self = shift;
- return $self->{'internal_references'};
-}
-
-sub global_commands_information($)
-{
- my $self = shift;
- return $self->{'extra'};
-}
-
-sub global_informations($)
-{
- my $self = shift;
- return $self->{'info'};
-}
-
-# Setup labels and nodes info and return labels
-# FIXME : should share this with the non-XS code.
-sub labels_information($)
-{
- my $self = shift;
-
- if (defined $self->{'targets'}) {
- my %labels = ();
- for my $target (@{$self->{'targets'}}) {
- if ($target->{'cmdname'} eq 'node') {
- if ($target->{'extra'}->{'nodes_manuals'}) {
- for my $node_manual (@{$target->{'extra'}{'nodes_manuals'}}) {
- if (defined $node_manual
- and defined $node_manual->{'node_content'}) {
- my $normalized =
Texinfo::Convert::NodeNameNormalization::normalize_node({'contents' =>
$node_manual->{'node_content'}});
- $node_manual->{'normalized'} = $normalized;
- }
- }
- }
- }
- if (defined $target->{'extra'}
- and defined $target->{'extra'}->{'node_content'}) {
- my $normalized =
Texinfo::Convert::NodeNameNormalization::normalize_node({'contents' =>
$target->{'extra'}->{'node_content'}});
-
- if ($normalized !~ /[^-]/) {
- $self->line_error (sprintf(__("empty node name after expansion
`%s'"),
- Texinfo::Convert::Texinfo::convert({'contents'
- => $target->{'extra'}->{'node_content'}})),
- $target->{'line_nr'});
- delete $target->{'extra'}->{'node_content'};
- } else {
- if (defined $labels{$normalized}) {
- $self->line_error(
- sprintf(__("address@hidden `%s' previously defined"),
- $target->{'cmdname'},
- Texinfo::Convert::Texinfo::convert({'contents' =>
- $target->{'extra'}->{'node_content'}})),
- $target->{'line_nr'});
- $self->line_error(
- sprintf(__("here is the previous definition as address@hidden"),
- $labels{$normalized}->{'cmdname'}),
- $labels{$normalized}->{'line_nr'});
- delete $target->{'extra'}->{'node_content'};
- } else {
- $labels{$normalized} = $target;
- $target->{'extra'}->{'normalized'} = $normalized;
- if ($target->{'cmdname'} eq 'node') {
- if ($target->{'extra'}
- and $target->{'extra'}{'node_argument'}) {
- $target->{'extra'}{'node_argument'}{'normalized'}
- = $normalized;
- }
- push @{$self->{'nodes'}}, $target;
- }
- }
- }
- } else {
- if ($target->{'cmdname'} eq 'node') {
- $self->line_error (sprintf(__("empty argument in address@hidden"),
- $target->{'cmdname'}), $target->{'line_nr'});
- delete $target->{'extra'}->{'node_content'};
- }
- }
- }
- $self->{'labels'} = \%labels;
- delete $self->{'targets'};
- }
- return $self->{'labels'};
-}
-
-BEGIN {
- Texinfo::XSLoader::init (
- "Texinfo::Parser",
- "Parsetexi",
- undef,
- "Parsetexi",
- 1);
-
-} # end BEGIN
-
-# NB Don't add more functions down here, because this can cause an error
-# with some versions of Perl, connected with the typeglob assignment just
-# above. ("Can't call mro_method_changed_in() on anonymous symbol table").
-#
-# See
http://perl5.git.perl.org/perl.git/commitdiff/03d9f026ae253e9e69212a3cf6f1944437e9f070?hp=ac73ea1ec401df889d312b067f78b618f7ffecc3
-#
-# (change to Perl interpreter on 22 Oct 2011)
-
-
-1;
-__END__
Copied: trunk/tp/Texinfo/XS/parsetexi/Parsetexi.pm (from rev 8064,
trunk/tp/parsetexi/Parsetexi.pm)
===================================================================
--- trunk/tp/Texinfo/XS/parsetexi/Parsetexi.pm (rev 0)
+++ trunk/tp/Texinfo/XS/parsetexi/Parsetexi.pm 2018-08-15 15:41:55 UTC (rev
8074)
@@ -0,0 +1,532 @@
+# Copyright 2014, 2015, 2016, 2017, 2018 Free Software Foundation, Inc.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 3 of the License,
+# or (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program. If not, see <http://www.gnu.org/licenses/>.
+
+package Parsetexi;
+
+use Texinfo::XSLoader;
+
+# same as texi2any.pl, although I don't know what the real requirement
+# is for this module.
+use 5.00405;
+use strict;
+use warnings;
+
+require Exporter;
+
+use Texinfo::Common;
+use Texinfo::Encoding;
+use Texinfo::Convert::NodeNameNormalization;
+
+our @ISA = qw(Exporter DynaLoader Texinfo::Report);
+# Items to export into callers namespace by default. Note: do not export
+# 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(
+ parser
+ parse_texi_text
+ parse_texi_line
+ parse_texi_file
+) ] );
+
+our @EXPORT_OK = ( @{ $EXPORT_TAGS{'all'} } );
+
+our @EXPORT = qw(
+
+);
+
+sub get_conf($$)
+{
+ my $self = shift;
+ my $var = shift;
+ return $self->{$var};
+}
+
+# Copied from Parser.pm
+# Customization variables obeyed by the Parser, and the default values.
+our %default_customization_values = (
+ 'TEST' => 0,
+ 'DEBUG' => 0, # if >= 10, tree is printed in texi2any.pl after parsing.
+ # If >= 100 tree is printed every line.
+ 'SHOW_MENU' => 1, # if false no menu error related.
+ 'INLINE_INSERTCOPYING' => 0,
+ 'IGNORE_BEFORE_SETFILENAME' => 1,
+ 'MACRO_BODY_IGNORES_LEADING_SPACE' => 0,
+ 'IGNORE_SPACE_AFTER_BRACED_COMMAND_NAME' => 1,
+ 'INPUT_PERL_ENCODING' => undef, # input perl encoding name, set from
+ # @documentencoding in the default case
+ 'INPUT_ENCODING_NAME' => undef, # encoding name normalized as preferred
+ # IANA, set from @documentencoding in the default
+ # case
+ 'CPP_LINE_DIRECTIVES' => 1, # handle cpp like synchronization lines
+ 'MAX_MACRO_CALL_NESTING' => 100000, # max number of nested macro calls
+ 'GLOBAL_COMMANDS' => [], # list of commands registered
+ # This is not used directly, but passed to Convert::Text through
+ # Texinfo::Common::_convert_text_options
+ 'ENABLE_ENCODING' => 1, # output accented and special characters
+ # based on @documentencoding
+ # following are used in Texinfo::Structuring
+ 'TOP_NODE_UP' => '(dir)', # up node of Top node
+ 'SIMPLE_MENU' => 0, # not used in the parser but in structuring
+ 'USE_UP_NODE_FOR_ELEMENT_UP' => 0, # Use node up for Up if there is no
+ # section up.
+);
+
+my %parser_default_configuration =
+ (%Texinfo::Common::default_parser_state_configuration,
+ %default_customization_values);
+
+my %tree_informations;
+foreach my $tree_information ('values', 'macros', 'explained_commands',
'labels') {
+ $tree_informations{$tree_information} = 1;
+}
+
+use Storable qw(dclone); # standard in 5.007003
+
+sub duplicate_parser {
+ my $old_parser = shift;
+
+ my $parser = dclone(\%parser_default_configuration);
+
+ foreach my $key (keys(%parser_default_configuration)) {
+ if ($tree_informations{$key}) {
+ if (defined($old_parser->{$key})) {
+ foreach my $info_key (keys(%{$old_parser->{$key}})) {
+ $parser->{$key}->{$info_key}
+ = $old_parser->{$key}->{$info_key};
+ }
+ }
+ } elsif(ref($old_parser->{$key})) {
+ $parser->{$key} = dclone($old_parser->{$key});
+ } else {
+ $parser->{$key} = $old_parser->{$key};
+ }
+ }
+ bless $parser, ref($old_parser);
+
+ $parser->Texinfo::Report::new;
+ return $parser;
+}
+
+sub simple_parser {
+ goto &parser;
+}
+
+# Stub for Texinfo::Parser::parser (line 574)
+sub parser (;$$)
+{
+ my $conf = shift;
+
+ my $parser = dclone(\%parser_default_configuration);
+
+ reset_parser ();
+ # fixme: these are overwritten immediately after
+ if (defined($conf)) {
+ foreach my $key (keys (%$conf)) {
+ if ($key ne 'values' and ref($conf->{$key})) {
+ $parser->{$key} = dclone($conf->{$key});
+ } else {
+ $parser->{$key} = $conf->{$key};
+ }
+
+ if ($key eq 'include_directories') {
+ foreach my $d (@{$conf->{'include_directories'}}) {
+ add_include_directory ($d);
+ }
+ } elsif ($key eq 'values') {
+ # This is used by Texinfo::Report::gdt for substituted values
+ for my $v (keys %{$conf->{'values'}}) {
+ if (!ref($conf->{'values'}->{$v})) {
+ store_value ($v, $conf->{'values'}->{$v});
+ } elsif (ref($conf->{'values'}->{$v}) eq 'HASH') {
+ store_value ($v, "<<HASH VALUE>>");
+ } elsif (ref($conf->{'values'}->{$v}) eq 'ARRAY') {
+ store_value ($v, "<<ARRAY VALUE>>");
+ } else {
+ store_value ($v, "<<UNKNOWN VALUE>>");
+ }
+ }
+ } elsif ($key eq 'expanded_formats') {
+ clear_expanded_formats ();
+
+ for my $f (@{$parser->{$key}}) {
+ add_expanded_format ($f);
+ }
+ } elsif ($key eq 'documentlanguage') {
+ if (defined ($conf->{$key})) {
+ set_documentlanguage ($conf->{$key});
+ }
+ } elsif ($key eq 'SHOW_MENU') {
+ conf_set_show_menu ($conf->{$key});
+ } elsif ($key eq 'CPP_LINE_DIRECTIVES') {
+ conf_set_CPP_LINE_DIRECTIVES($conf->{$key});
+ } else {
+ #warn "ignoring parser configuration value \"$key\"\n";
+ }
+ }
+ }
+
+ bless $parser;
+
+ $parser->Texinfo::Report::new;
+
+ return $parser;
+}
+
+# Record any @menu elements under $root in the 'menus' array of $node.
+sub _find_menus_of_node {
+ my $node = shift;
+ my $root = shift;
+
+ if ($root->{'contents'}) {
+ my $contents = $root->{'contents'};
+ foreach my $child (@{$contents}) {
+ if ($child->{'cmdname'} and $child->{'cmdname'} eq 'menu') {
+ push @{$node->{'menus'}}, $child;
+ }
+ }
+ }
+}
+
+# Set 'menus' array for each node. This accounts for malformed input where
+# the number of sectioning commands between @node and @menu is not exactly 1.
+sub _complete_node_menus {
+ my $self = shift;
+ my $root = shift;
+
+ if (!defined $self->{'nodes'}) {
+ $self->{'nodes'} = [];
+ }
+ my $node;
+ foreach my $child (@{$root->{'contents'}}) {
+ if ($child->{'cmdname'} and $child->{'cmdname'} eq 'node') {
+ $node = $child;
+ }
+ _find_menus_of_node ($node, $child) unless !defined $node;
+ }
+}
+
+sub get_parser_info {
+ my $self = shift;
+
+ my ($TARGETS, $INTL_XREFS, $FLOATS,
+ $INDEX_NAMES, $ERRORS, $GLOBAL_INFO, $GLOBAL_INFO2);
+
+ $TARGETS = build_label_list ();
+ $INTL_XREFS = build_internal_xref_list ();
+ $FLOATS = build_float_list ();
+
+ $INDEX_NAMES = build_index_data ();
+ $self->{'index_names'} = $INDEX_NAMES;
+
+ $GLOBAL_INFO = build_global_info ();
+ $GLOBAL_INFO2 = build_global_info2 ();
+
+ $self->{'targets'} = $TARGETS;
+ $self->{'labels'} = {};
+ $self->{'internal_references'} = $INTL_XREFS;
+ $self->{'floats'} = $FLOATS;
+ $self->{'info'} = $GLOBAL_INFO;
+ $self->{'extra'} = $GLOBAL_INFO2;
+
+ _get_errors ($self);
+ Texinfo::Common::complete_indices ($self);
+}
+
+use File::Basename; # for fileparse
+
+# Replacement for Texinfo::Parser::parse_texi_file (line 835)
+sub parse_texi_file ($$)
+{
+ my $self = shift;
+ my $file_name = shift;
+ my $tree_stream;
+
+ $self->{'info'}->{'input_file_name'} = $file_name;
+
+ parse_file ($file_name);
+ my $TREE = build_texinfo_tree ();
+ get_parser_info ($self);
+ _complete_node_menus ($self, $TREE);
+
+ # line 899
+ my $text_root;
+ if ($TREE->{'type'} eq 'text_root') {
+ $text_root = $TREE;
+ } elsif ($TREE->{'contents'} and $TREE->{'contents'}->[0]
+ and $TREE->{'contents'}->[0]->{'type'} eq 'text_root') {
+ $text_root = $TREE->{'contents'}->[0];
+ }
+
+ # Put everything before @setfilename in a special type. This allows
+ # ignoring everything before @setfilename.
+ if ($self->{'IGNORE_BEFORE_SETFILENAME'} and $text_root
+ and $self->{'extra'}->{'setfilename'}
+ and $self->{'extra'}->{'setfilename'}->{'parent'} eq $text_root) {
+ my $before_setfilename = {'type' => 'preamble_before_setfilename',
+ 'parent' => $text_root,
+ 'contents' => []};
+ while (@{$text_root->{'contents'}}
+ and (!$text_root->{'contents'}->[0]->{'cmdname'}
+ or $text_root->{'contents'}->[0]->{'cmdname'} ne 'setfilename')) {
+ my $content = shift @{$text_root->{'contents'}};
+ $content->{'parent'} = $before_setfilename;
+ push @{$before_setfilename->{'contents'}}, $content;
+ }
+ if (address@hidden>{'contents'}}) {
+ # 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'}});
+ }
+ }
+
+ ############################################################
+
+ if (defined($self->{'info'}->{'input_encoding_name'})) {
+ my ($texinfo_encoding, $perl_encoding, $input_encoding)
+ = Texinfo::Encoding::encoding_alias(
+ $self->{'info'}->{'input_encoding_name'});
+ $self->{'info'}->{'input_encoding_name'} = $input_encoding;
+ }
+
+ 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;
+}
+
+# Copy the errors into the error list in Texinfo::Report.
+# TODO: Could we just access the error list directly instead of going
+# through Texinfo::Report line_error?
+sub _get_errors($)
+{
+ my $self = shift;
+ my $ERRORS;
+ my $tree_stream = dump_errors();
+ eval $tree_stream;
+ for my $error (@{$ERRORS}) {
+ if ($error->{'type'} eq 'error') {
+ $self->line_error ($error->{'message'}, $error->{'line_nr'});
+ } else {
+ $self->line_warn ($error->{'message'}, $error->{'line_nr'});
+ }
+ }
+}
+
+# Replacement for Texinfo::Parser::parse_texi_text (line 757)
+#
+# Used in tests under tp/t.
+sub parse_texi_text($$;$$$$)
+{
+ my $self = shift;
+ my $text = shift;
+ my $lines_nr = shift;
+ my $file = shift;
+ my $macro = shift;
+ my $fixed_line_number = shift;
+
+ return undef if (!defined($text));
+
+ $self = parser() if (!defined($self));
+
+ # make sure that internal byte buffer is in UTF-8 before we pass
+ # it in to the XS code.
+ utf8::upgrade($text);
+
+ parse_text($text);
+ my $tree = build_texinfo_tree ();
+ my $INDEX_NAMES = build_index_data ();
+ $self->{'index_names'} = $INDEX_NAMES;
+
+ for my $index (keys %$INDEX_NAMES) {
+ if ($INDEX_NAMES->{$index}->{'merged_in'}) {
+ $self->{'merged_indices'}-> {$index}
+ = $INDEX_NAMES->{$index}->{'merged_in'};
+ }
+ }
+
+ get_parser_info($self);
+ _complete_node_menus ($self, $tree);
+ return $tree;
+}
+
+# Replacement for Texinfo::Parser::parse_texi_line (line 918)
+sub parse_texi_line($$;$$$$)
+{
+ my $self = shift;
+ my $text = shift;
+ my $lines_nr = shift;
+ my $file = shift;
+ my $macro = shift;
+ my $fixed_line_number = shift;
+
+ return undef if (!defined($text));
+
+ $self = parser() if (!defined($self));
+ utf8::upgrade($text);
+ parse_string($text);
+ my $tree = build_texinfo_tree ();
+ return $tree;
+}
+
+# Public interfaces of Texinfo::Parser (starting line 942)
+sub indices_information($)
+{
+ my $self = shift;
+
+ my $INDEX_NAMES;
+ if (!$self->{'index_names'}) {
+ $INDEX_NAMES = build_index_data ();
+ $self->{'index_names'} = $INDEX_NAMES;
+ }
+ return $self->{'index_names'};
+}
+
+sub floats_information($)
+{
+ my $self = shift;
+ return $self->{'floats'};
+}
+
+sub internal_references_information($)
+{
+ my $self = shift;
+ return $self->{'internal_references'};
+}
+
+sub global_commands_information($)
+{
+ my $self = shift;
+ return $self->{'extra'};
+}
+
+sub global_informations($)
+{
+ my $self = shift;
+ return $self->{'info'};
+}
+
+# Setup labels and nodes info and return labels
+# FIXME : should share this with the non-XS code.
+sub labels_information($)
+{
+ my $self = shift;
+
+ if (defined $self->{'targets'}) {
+ my %labels = ();
+ for my $target (@{$self->{'targets'}}) {
+ if ($target->{'cmdname'} eq 'node') {
+ if ($target->{'extra'}->{'nodes_manuals'}) {
+ for my $node_manual (@{$target->{'extra'}{'nodes_manuals'}}) {
+ if (defined $node_manual
+ and defined $node_manual->{'node_content'}) {
+ my $normalized =
Texinfo::Convert::NodeNameNormalization::normalize_node({'contents' =>
$node_manual->{'node_content'}});
+ $node_manual->{'normalized'} = $normalized;
+ }
+ }
+ }
+ }
+ if (defined $target->{'extra'}
+ and defined $target->{'extra'}->{'node_content'}) {
+ my $normalized =
Texinfo::Convert::NodeNameNormalization::normalize_node({'contents' =>
$target->{'extra'}->{'node_content'}});
+
+ if ($normalized !~ /[^-]/) {
+ $self->line_error (sprintf(__("empty node name after expansion
`%s'"),
+ Texinfo::Convert::Texinfo::convert({'contents'
+ => $target->{'extra'}->{'node_content'}})),
+ $target->{'line_nr'});
+ delete $target->{'extra'}->{'node_content'};
+ } else {
+ if (defined $labels{$normalized}) {
+ $self->line_error(
+ sprintf(__("address@hidden `%s' previously defined"),
+ $target->{'cmdname'},
+ Texinfo::Convert::Texinfo::convert({'contents' =>
+ $target->{'extra'}->{'node_content'}})),
+ $target->{'line_nr'});
+ $self->line_error(
+ sprintf(__("here is the previous definition as address@hidden"),
+ $labels{$normalized}->{'cmdname'}),
+ $labels{$normalized}->{'line_nr'});
+ delete $target->{'extra'}->{'node_content'};
+ } else {
+ $labels{$normalized} = $target;
+ $target->{'extra'}->{'normalized'} = $normalized;
+ if ($target->{'cmdname'} eq 'node') {
+ if ($target->{'extra'}
+ and $target->{'extra'}{'node_argument'}) {
+ $target->{'extra'}{'node_argument'}{'normalized'}
+ = $normalized;
+ }
+ push @{$self->{'nodes'}}, $target;
+ }
+ }
+ }
+ } else {
+ if ($target->{'cmdname'} eq 'node') {
+ $self->line_error (sprintf(__("empty argument in address@hidden"),
+ $target->{'cmdname'}), $target->{'line_nr'});
+ delete $target->{'extra'}->{'node_content'};
+ }
+ }
+ }
+ $self->{'labels'} = \%labels;
+ delete $self->{'targets'};
+ }
+ return $self->{'labels'};
+}
+
+BEGIN {
+ Texinfo::XSLoader::init (
+ "Texinfo::Parser",
+ "Parsetexi",
+ undef,
+ "Parsetexi",
+ 1);
+} # end BEGIN
+
+# This "use" statement is all the way down here because Texinfo::Report
+# and Texinfo::Parser both "use" each other. If we "use Texinfo::Report"
+# at the top of the file, this has the problem that the symbol table
+# for the Texinfo::Parser namespace, %Texinfo::Parser::, is a different
+# hash (i.e. it has a different address) from what it ends up with by the
+# end of this module. Once the Perl interpreter has read in a module and
+# interpreted variables in terms of a given symbol table, it does not
+# do so them again. Hence, use of subroutines in the Texinfo::Parser
namespace
+# fails. This remains the case even if we arrange for the symbol table hash
+# to remain at the same address, because is empty while the file is being read.
+use Texinfo::Report;
+
+# NB Don't add more functions down here, because this can cause an error
+# with some versions of Perl, connected with the typeglob assignment just
+# above. ("Can't call mro_method_changed_in() on anonymous symbol table").
+#
+# See
http://perl5.git.perl.org/perl.git/commitdiff/03d9f026ae253e9e69212a3cf6f1944437e9f070?hp=ac73ea1ec401df889d312b067f78b618f7ffecc3
+#
+# (change to Perl interpreter on 22 Oct 2011)
+
+
+1;
+__END__
Deleted: trunk/tp/Texinfo/XS/parsetexi/README
===================================================================
--- trunk/tp/parsetexi/README 2018-08-14 10:05:33 UTC (rev 8058)
+++ trunk/tp/Texinfo/XS/parsetexi/README 2018-08-15 15:41:55 UTC (rev
8074)
@@ -1,42 +0,0 @@
-This is an experimental program intended to replicate the functionality
-in tp/Texinfo/Parser.pm.
-
-
-some modifications needed to run at the moment. diff in
-tp/diff-for-test-parsetexi.diff
-
-=====================================================================
-Notes -
-
-should be able to debug with gdb. Add
-
-./configure PERL_EXT_CFLAGS='-g -O0'
-
-For individual tests can do "gdb perl" followed by e.g.
-
-(gdb) r -w t/27float.t comment_space_comand_in_float
-
-After a single run can set breakpoints.
-
-How to debug with valgrind -
-export PERL5LIB to the value in the makeinfo script
-
-with alias VAL='valgrind --log-file=val.log', can do e.g.
-
-VAL perl ./texi2any-C.pl texinfo.texi
-
-also
-
-valgrind --vgdb-error=0 perl texi2any-C.pl texinfo.texi
-
-=====================================================================
-
-Can compare execution runs of parsetexi and Perl makeinfo with
-
-makeinfo -C DEBUG=1 node_structure.texi |& less
-
-vs.
-
-./parsetexi node_structure.texi |& less
-
-
Copied: trunk/tp/Texinfo/XS/parsetexi/README (from rev 8073,
trunk/tp/parsetexi/README)
===================================================================
--- trunk/tp/Texinfo/XS/parsetexi/README (rev 0)
+++ trunk/tp/Texinfo/XS/parsetexi/README 2018-08-15 15:41:55 UTC (rev
8074)
@@ -0,0 +1,41 @@
+This is an experimental program intended to replicate the functionality
+in tp/Texinfo/Parser.pm.
+
+
+Set TEXINFO_XS_PARSER in environment to use.
+
+=====================================================================
+Notes -
+
+should be able to debug with gdb. Add
+
+./configure PERL_EXT_CFLAGS='-g -O0'
+
+For individual tests can do "gdb perl" followed by e.g.
+
+(gdb) r -w t/27float.t comment_space_comand_in_float
+
+After a single run can set breakpoints.
+
+How to debug with valgrind -
+export PERL5LIB to the value in the makeinfo script
+
+with alias VAL='valgrind --log-file=val.log', can do e.g.
+
+VAL perl ./texi2any-C.pl texinfo.texi
+
+also
+
+valgrind --vgdb-error=0 perl texi2any-C.pl texinfo.texi
+
+=====================================================================
+
+Can compare execution runs of parsetexi and Perl makeinfo with
+
+makeinfo -C DEBUG=1 node_structure.texi |& less
+
+vs.
+
+./parsetexi node_structure.texi |& less
+
+
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [8074] move parsetexi directory,
gavinsmith0123 <=