[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
texinfo/tp MANIFEST Makefile.am TODO Texinfo/Pa...
|
From: |
Patrice Dumas |
|
Subject: |
texinfo/tp MANIFEST Makefile.am TODO Texinfo/Pa... |
|
Date: |
Sat, 11 Feb 2012 22:35:53 +0000 |
CVSROOT: /sources/texinfo
Module name: texinfo
Changes by: Patrice Dumas <pertusus> 12/02/11 22:35:53
Modified files:
tp : MANIFEST Makefile.am TODO
tp/Texinfo : Parser.pm
tp/t : 80include.t
Added files:
tp/t/include : file_with_cpp_lines.texi
tp/t/input_files: cpp_lines.texi
tp/t/results/include: cpp_lines.pl
Log message:
Ignore cpp lines in raw environments.
CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/MANIFEST?cvsroot=texinfo&r1=1.31&r2=1.32
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/Makefile.am?cvsroot=texinfo&r1=1.39&r2=1.40
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/TODO?cvsroot=texinfo&r1=1.264&r2=1.265
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/Texinfo/Parser.pm?cvsroot=texinfo&r1=1.360&r2=1.361
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/80include.t?cvsroot=texinfo&r1=1.11&r2=1.12
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/include/file_with_cpp_lines.texi?cvsroot=texinfo&rev=1.1
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/input_files/cpp_lines.texi?cvsroot=texinfo&rev=1.1
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/include/cpp_lines.pl?cvsroot=texinfo&rev=1.1
Patches:
Index: MANIFEST
===================================================================
RCS file: /sources/texinfo/texinfo/tp/MANIFEST,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -b -r1.31 -r1.32
--- MANIFEST 9 Feb 2012 23:51:50 -0000 1.31
+++ MANIFEST 11 Feb 2012 22:35:52 -0000 1.32
@@ -90,6 +90,7 @@
t/include/fext.ext
t/include/fext.png
t/include/fext.txt
+t/include/file_with_cpp_lines.texi
t/include/file_with_xml_chars.texi
t/include/f.txt
t/include/image_encoded.txt
@@ -127,6 +128,7 @@
t/input_files/contents_at_end_document.texi
t/input_files/contents_in_document.texi
t/input_files/contents_no_section.texi
+t/input_files/cpp_lines.texi
t/input_files/delcomment.texi
t/input_files/empty_lines_at_beginning_no_setfilename_no_element.texi
t/input_files/empty_lines_at_beginning_no_setfilename.texi
@@ -488,6 +490,7 @@
t/results/html_tests/utf8_no_use_entity.pl
t/results/html_tests/verbatim_in_multitable_in_example.pl
t/results/html_tests/xml_protected_in_verb.pl
+t/results/include/cpp_lines.pl
t/results/include/double_include.pl
t/results/include/include_at_end_line.pl
t/results/include/include_comment.pl
Index: Makefile.am
===================================================================
RCS file: /sources/texinfo/texinfo/tp/Makefile.am,v
retrieving revision 1.39
retrieving revision 1.40
diff -u -b -r1.39 -r1.40
--- Makefile.am 9 Feb 2012 23:51:50 -0000 1.39
+++ Makefile.am 11 Feb 2012 22:35:52 -0000 1.40
@@ -1,4 +1,4 @@
-# $Id: Makefile.am,v 1.39 2012/02/09 23:51:50 pertusus Exp $
+# $Id: Makefile.am,v 1.40 2012/02/11 22:35:52 pertusus Exp $
# Makefile.am for texinfo/tp.
#
# Copyright 2011 Free Software Foundation, Inc.
@@ -103,6 +103,7 @@
t/include/fext.png \
t/include/fext.txt \
t/include/fextext \
+ t/include/file_with_cpp_lines.texi \
t/include/file_with_xml_chars.texi \
t/include/image.txt \
t/include/image_encoded.txt \
@@ -142,6 +143,7 @@
t/input_files/contents_at_end_document.texi \
t/input_files/contents_in_document.texi \
t/input_files/contents_no_section.texi \
+ t/input_files/cpp_lines.texi \
#
document_domain = $(PACKAGE)_document
Index: TODO
===================================================================
RCS file: /sources/texinfo/texinfo/tp/TODO,v
retrieving revision 1.264
retrieving revision 1.265
diff -u -b -r1.264 -r1.265
--- TODO 10 Feb 2012 10:45:32 -0000 1.264
+++ TODO 11 Feb 2012 22:35:52 -0000 1.265
@@ -63,8 +63,6 @@
Test no empty line before and after a sectioning command. With text, but
also commands.
-Test for the handling of #line.
-
In html test empty @top for title, with different cases for
setcontentsaftertit* and for anchors.
Index: Texinfo/Parser.pm
===================================================================
RCS file: /sources/texinfo/texinfo/tp/Texinfo/Parser.pm,v
retrieving revision 1.360
retrieving revision 1.361
diff -u -b -r1.360 -r1.361
--- Texinfo/Parser.pm 9 Feb 2012 00:05:54 -0000 1.360
+++ Texinfo/Parser.pm 11 Feb 2012 22:35:52 -0000 1.361
@@ -1738,15 +1738,16 @@
# returns next text fragment, be it pending from a macro expansion or
# text or file
-sub _next_text($$)
+sub _next_text($$$)
{
my $self = shift;
my $line_nr = shift;
+ my $current = shift;
while (@{$self->{'input'}}) {
- my $current = $self->{'input'}->[0];
- if (@{$current->{'pending'}}) {
- my $new_text = shift @{$current->{'pending'}};
+ my $input = $self->{'input'}->[0];
+ if (@{$input->{'pending'}}) {
+ my $new_text = shift @{$input->{'pending'}};
if ($new_text->[1] and $new_text->[1]->{'end_macro'}) {
delete $new_text->[1]->{'end_macro'};
my $top_macro = shift @{$self->{'macro_stack'}};
@@ -1754,22 +1755,33 @@
if ($self->{'DEBUG'});
}
return ($new_text->[0], $new_text->[1]);
- } elsif ($current->{'fh'}) {
- my $fh = $current->{'fh'};
+ } elsif ($input->{'fh'}) {
+ my $fh = $input->{'fh'};
my $line = <$fh>;
while (defined($line)) {
$line =~ s/\x{7F}.*\s*//;
if ($self->{'CPP_LINE_DIRECTIVES'}
+ # no cpp directives in ignored/macro/verbatim
+ and defined ($current)
+ and not
+ (($current->{'cmdname'}
+ and $block_commands{$current->{'cmdname'}}
+ and ($block_commands{$current->{'cmdname'}} eq 'raw'
+ or $block_commands{$current->{'cmdname'}} eq
'conditional'))
+ or
+ ($current->{'parent'} and $current->{'parent'}->{'cmdname'}
+ and $current->{'parent'}->{'cmdname'} eq 'verb')
+ )
and $line =~ /^\s*#\s*(line)? (\d+)( "([^"]+)")?(\s+\d+)*\s*$/) {
- $current->{'line_nr'} = $2;
+ $input->{'line_nr'} = $2;
if (defined($4)) {
- $current->{'name'} = $4;
+ $input->{'name'} = $4;
}
$line = <$fh>;
} else {
- $current->{'line_nr'}++;
- return ($line, {'line_nr' => $current->{'line_nr'},
- 'file_name' => $current->{'name'},
+ $input->{'line_nr'}++;
+ return ($line, {'line_nr' => $input->{'line_nr'},
+ 'file_name' => $input->{'name'},
'macro' => ''});
}
}
@@ -1789,15 +1801,16 @@
}
# collect text and line numbers until an end of line is found.
-sub _new_line ($$)
+sub _new_line ($$$)
{
my $self = shift;
my $line_nr = shift;
+ my $current = shift;
my $new_line = '';
while (1) {
my $new_text;
- ($new_text, $line_nr) = _next_text($self, $line_nr);
+ ($new_text, $line_nr) = _next_text($self, $line_nr, $current);
if (!defined($new_text)) {
$new_line = undef if ($new_line eq '');
last;
@@ -1871,7 +1884,7 @@
print STDERR "MACRO ARG end of line\n" if ($self->{'DEBUG'});
$arguments->[-1] .= $line;
- ($line, $line_nr) = _new_line($self, $line_nr);
+ ($line, $line_nr) = _new_line($self, $line_nr, $macro);
if (!defined($line)) {
$self->line_error (sprintf($self->__("address@hidden missing close
brace"),
$name), $line_nr_orig);
@@ -3332,7 +3345,7 @@
NEXT_LINE:
while (1) {
my $line;
- ($line, $line_nr) = _next_text($self, $line_nr);
+ ($line, $line_nr) = _next_text($self, $line_nr, $current);
last if (!defined($line));
if ($self->{'DEBUG'}) {
@@ -3457,7 +3470,7 @@
or $conditional->{'cmdname'} ne $end_command));
# Ignore until end of line
if ($line !~ /\n/) {
- ($line, $line_nr) = _new_line($self, $line_nr);
+ ($line, $line_nr) = _new_line($self, $line_nr, $conditional);
print STDERR "IGNORE CLOSE line: $line" if ($self->{'DEBUG'});
}
print STDERR "CLOSED conditional $end_command\n" if
($self->{'DEBUG'});
@@ -3513,7 +3526,7 @@
while ($line eq '') {
print STDERR "END OF TEXT not at end of line\n"
if ($self->{'DEBUG'});
- ($line, $line_nr) = _next_text($self, $line_nr);
+ ($line, $line_nr) = _next_text($self, $line_nr, $current);
if (!defined($line)) {
# end of the file
my $included_file;
@@ -3554,7 +3567,7 @@
if ($args_number >= 2);
} else {
if ($line !~ /\n/) {
- ($line, $line_nr) = _new_line($self, $line_nr);
+ ($line, $line_nr) = _new_line($self, $line_nr, $expanded_macro);
$line = '' if (!defined($line));
}
$line =~ s/^\s*// if ($line =~ /\S/);
@@ -3965,7 +3978,7 @@
or $arg_spec eq 'special') {
# complete the line if there was a user macro expansion
if ($line !~ /\n/) {
- my ($new_line, $new_line_nr) = _new_line($self, $line_nr);
+ my ($new_line, $new_line_nr) = _new_line($self, $line_nr, undef);
$line .= $new_line if (defined($new_line));
}
$misc = {'cmdname' => $command,
Index: t/80include.t
===================================================================
RCS file: /sources/texinfo/texinfo/tp/t/80include.t,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -b -r1.11 -r1.12
--- t/80include.t 7 Jan 2012 13:38:04 -0000 1.11
+++ t/80include.t 11 Feb 2012 22:35:52 -0000 1.12
@@ -158,6 +158,9 @@
@verbatiminclude verbatim_encoded_latin1.texi
', {'test_formats' => ['plaintext']}],
+['cpp_lines',
+undef, {'test_file' => 'cpp_lines.texi'}
+],
);
our ($arg_test_case, $arg_generate, $arg_debug);
Index: t/include/file_with_cpp_lines.texi
===================================================================
RCS file: t/include/file_with_cpp_lines.texi
diff -N t/include/file_with_cpp_lines.texi
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ t/include/file_with_cpp_lines.texi 11 Feb 2012 22:35:52 -0000 1.1
@@ -0,0 +1,6 @@
+
+#line 8 "inc"
+
address@hidden
+
+#line 78 "grrr"
Index: t/input_files/cpp_lines.texi
===================================================================
RCS file: t/input_files/cpp_lines.texi
diff -N t/input_files/cpp_lines.texi
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ t/input_files/cpp_lines.texi 11 Feb 2012 22:35:52 -0000 1.1
@@ -0,0 +1,37 @@
+\input texinfo
address@hidden cpp_lines.info
+
+#line 3 "a_file"
+ # 66 "g_f" 4
+
address@hidden top}.
+
address@hidden Top
+
+# 10 25 209
+
address@hidden
+
+ #line 5 "f"
address@hidden verbatim
+
address@hidden macr
+# line 7 "k"
address@hidden macro
+
address@hidden lacro def}
+
address@hidden
+
address@hidden macro call}.
+
address@hidden file_with_cpp_lines.texi
address@hidden inc}.
+
address@hidden:
+#line 5 "in verb"
+:}
+
address@hidden verb}
+
address@hidden
Index: t/results/include/cpp_lines.pl
===================================================================
RCS file: t/results/include/cpp_lines.pl
diff -N t/results/include/cpp_lines.pl
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ t/results/include/cpp_lines.pl 11 Feb 2012 22:35:53 -0000 1.1
@@ -0,0 +1,794 @@
+use vars qw(%result_texis %result_texts %result_trees %result_errors
+ %result_indices %result_sectioning %result_nodes %result_menus
+ %result_floats %result_converted %result_converted_errors
+ %result_elements %result_directions_text);
+
+use utf8;
+
+$result_trees{'cpp_lines'} = {
+ 'contents' => [
+ {
+ 'contents' => [
+ {
+ 'contents' => [
+ {
+ 'contents' => [
+ {
+ 'text' => '\\input texinfo
+',
+ 'type' => 'preamble_text'
+ }
+ ],
+ 'parent' => {},
+ 'type' => 'preamble'
+ }
+ ],
+ 'parent' => {},
+ 'type' => 'preamble_before_setfilename'
+ },
+ {
+ 'args' => [
+ {
+ 'contents' => [
+ {
+ 'extra' => {
+ 'command' => {}
+ },
+ 'parent' => {},
+ 'text' => ' ',
+ 'type' => 'empty_spaces_after_command'
+ },
+ {
+ 'parent' => {},
+ 'text' => 'cpp_lines.info'
+ },
+ {
+ 'parent' => {},
+ 'text' => '
+',
+ 'type' => 'spaces_at_end'
+ }
+ ],
+ 'parent' => {},
+ 'type' => 'misc_line_arg'
+ }
+ ],
+ 'cmdname' => 'setfilename',
+ 'extra' => {
+ 'text_arg' => 'cpp_lines.info'
+ },
+ 'line_nr' => {
+ 'file_name' => 'cpp_lines.texi',
+ 'line_nr' => 2,
+ 'macro' => ''
+ },
+ 'parent' => {}
+ },
+ {
+ 'parent' => {},
+ 'text' => '
+',
+ 'type' => 'empty_line'
+ },
+ {
+ 'parent' => {},
+ 'text' => '
+',
+ 'type' => 'empty_line'
+ },
+ {
+ 'contents' => [
+ {
+ 'args' => [
+ {
+ 'contents' => [
+ {
+ 'parent' => {},
+ 'text' => 'before top'
+ }
+ ],
+ 'parent' => {},
+ 'type' => 'brace_command_arg'
+ }
+ ],
+ 'cmdname' => 'email',
+ 'contents' => [],
+ 'extra' => {
+ 'brace_command_contents' => [
+ [
+ {}
+ ]
+ ]
+ },
+ 'line_nr' => {
+ 'file_name' => 'g_f',
+ 'line_nr' => '68',
+ 'macro' => ''
+ },
+ 'parent' => {}
+ },
+ {
+ 'parent' => {},
+ 'text' => '.
+'
+ }
+ ],
+ 'parent' => {},
+ 'type' => 'paragraph'
+ },
+ {
+ 'parent' => {},
+ 'text' => '
+',
+ 'type' => 'empty_line'
+ }
+ ],
+ 'parent' => {},
+ 'type' => 'text_root'
+ },
+ {
+ 'args' => [
+ {
+ 'contents' => [
+ {
+ 'extra' => {
+ 'command' => {}
+ },
+ 'parent' => {},
+ 'text' => ' ',
+ 'type' => 'empty_spaces_after_command'
+ },
+ {
+ 'parent' => {},
+ 'text' => 'Top'
+ },
+ {
+ 'parent' => {},
+ 'text' => '
+',
+ 'type' => 'spaces_at_end'
+ }
+ ],
+ 'parent' => {},
+ 'type' => 'misc_line_arg'
+ }
+ ],
+ 'cmdname' => 'node',
+ 'contents' => [
+ {
+ 'parent' => {},
+ 'text' => '
+',
+ 'type' => 'empty_line'
+ },
+ {
+ 'parent' => {},
+ 'text' => '
+',
+ 'type' => 'empty_line'
+ },
+ {
+ 'cmdname' => 'verbatim',
+ 'contents' => [
+ {
+ 'extra' => {
+ 'command' => {}
+ },
+ 'parent' => {},
+ 'text' => '
+',
+ 'type' => 'empty_line_after_command'
+ },
+ {
+ 'parent' => {},
+ 'text' => '
+',
+ 'type' => 'raw'
+ },
+ {
+ 'parent' => {},
+ 'text' => ' #line 5 "f"
+',
+ 'type' => 'raw'
+ }
+ ],
+ 'line_nr' => {
+ 'file_name' => 'g_f',
+ 'line_nr' => '12',
+ 'macro' => ''
+ },
+ 'parent' => {}
+ },
+ {
+ 'extra' => {
+ 'command' => {}
+ },
+ 'parent' => {},
+ 'text' => '
+',
+ 'type' => 'empty_line_after_command'
+ },
+ {
+ 'parent' => {},
+ 'text' => '
+',
+ 'type' => 'empty_line'
+ },
+ {
+ 'args' => [
+ {
+ 'parent' => {},
+ 'text' => 'macr',
+ 'type' => 'macro_name'
+ }
+ ],
+ 'cmdname' => 'macro',
+ 'contents' => [
+ {
+ 'parent' => {},
+ 'text' => '# line 7 "k"',
+ 'type' => 'raw'
+ },
+ {
+ 'parent' => {},
+ 'text' => '
+',
+ 'type' => 'last_raw_newline'
+ }
+ ],
+ 'extra' => {
+ 'arg_line' => ' macr
+',
+ 'macrobody' => '# line 7 "k"
+'
+ },
+ 'line_nr' => {
+ 'file_name' => 'g_f',
+ 'line_nr' => '17',
+ 'macro' => ''
+ },
+ 'parent' => {}
+ },
+ {
+ 'extra' => {
+ 'command' => {}
+ },
+ 'parent' => {},
+ 'text' => '
+',
+ 'type' => 'empty_line_after_command'
+ },
+ {
+ 'parent' => {},
+ 'text' => '
+',
+ 'type' => 'empty_line'
+ },
+ {
+ 'contents' => [
+ {
+ 'args' => [
+ {
+ 'contents' => [
+ {
+ 'parent' => {},
+ 'text' => 'after lacro def'
+ }
+ ],
+ 'parent' => {},
+ 'type' => 'brace_command_arg'
+ }
+ ],
+ 'cmdname' => 'email',
+ 'contents' => [],
+ 'extra' => {
+ 'brace_command_contents' => [
+ [
+ {}
+ ]
+ ]
+ },
+ 'line_nr' => {
+ 'file_name' => 'g_f',
+ 'line_nr' => '21',
+ 'macro' => ''
+ },
+ 'parent' => {}
+ },
+ {
+ 'parent' => {},
+ 'text' => '
+'
+ }
+ ],
+ 'parent' => {},
+ 'type' => 'paragraph'
+ },
+ {
+ 'parent' => {},
+ 'text' => '
+',
+ 'type' => 'empty_line'
+ },
+ {
+ 'contents' => [
+ {
+ 'parent' => {},
+ 'text' => '# line 7 "k"
+'
+ }
+ ],
+ 'parent' => {},
+ 'type' => 'paragraph'
+ },
+ {
+ 'parent' => {},
+ 'text' => '
+',
+ 'type' => 'empty_line'
+ },
+ {
+ 'contents' => [
+ {
+ 'args' => [
+ {
+ 'contents' => [
+ {
+ 'parent' => {},
+ 'text' => 'after macro call'
+ }
+ ],
+ 'parent' => {},
+ 'type' => 'brace_command_arg'
+ }
+ ],
+ 'cmdname' => 'email',
+ 'contents' => [],
+ 'extra' => {
+ 'brace_command_contents' => [
+ [
+ {}
+ ]
+ ]
+ },
+ 'line_nr' => {
+ 'file_name' => 'g_f',
+ 'line_nr' => '25',
+ 'macro' => ''
+ },
+ 'parent' => {}
+ },
+ {
+ 'parent' => {},
+ 'text' => '.
+'
+ }
+ ],
+ 'parent' => {},
+ 'type' => 'paragraph'
+ },
+ {
+ 'parent' => {},
+ 'text' => '
+',
+ 'type' => 'empty_line'
+ },
+ {
+ 'parent' => {},
+ 'text' => '
+',
+ 'type' => 'empty_line'
+ },
+ {
+ 'parent' => {},
+ 'text' => '
+',
+ 'type' => 'empty_line'
+ },
+ {
+ 'contents' => [
+ {
+ 'args' => [
+ {
+ 'contents' => [
+ {
+ 'parent' => {},
+ 'text' => 'in'
+ }
+ ],
+ 'parent' => {},
+ 'type' => 'brace_command_arg'
+ }
+ ],
+ 'cmdname' => 'email',
+ 'contents' => [],
+ 'extra' => {
+ 'brace_command_contents' => [
+ [
+ {}
+ ]
+ ]
+ },
+ 'line_nr' => {
+ 'file_name' => 'inc',
+ 'line_nr' => '10',
+ 'macro' => ''
+ },
+ 'parent' => {}
+ },
+ {
+ 'parent' => {},
+ 'text' => '
+'
+ }
+ ],
+ 'parent' => {},
+ 'type' => 'paragraph'
+ },
+ {
+ 'parent' => {},
+ 'text' => '
+',
+ 'type' => 'empty_line'
+ },
+ {
+ 'contents' => [
+ {
+ 'args' => [
+ {
+ 'contents' => [
+ {
+ 'parent' => {},
+ 'text' => 'after inc'
+ }
+ ],
+ 'parent' => {},
+ 'type' => 'brace_command_arg'
+ }
+ ],
+ 'cmdname' => 'email',
+ 'contents' => [],
+ 'extra' => {
+ 'brace_command_contents' => [
+ [
+ {}
+ ]
+ ]
+ },
+ 'line_nr' => {
+ 'file_name' => 'g_f',
+ 'line_nr' => '28',
+ 'macro' => ''
+ },
+ 'parent' => {}
+ },
+ {
+ 'parent' => {},
+ 'text' => '.
+'
+ }
+ ],
+ 'parent' => {},
+ 'type' => 'paragraph'
+ },
+ {
+ 'parent' => {},
+ 'text' => '
+',
+ 'type' => 'empty_line'
+ },
+ {
+ 'contents' => [
+ {
+ 'args' => [
+ {
+ 'contents' => [
+ {
+ 'parent' => {},
+ 'text' => '
+',
+ 'type' => 'raw'
+ },
+ {
+ 'parent' => {},
+ 'text' => '#line 5 "in verb"
+',
+ 'type' => 'raw'
+ }
+ ],
+ 'parent' => {},
+ 'type' => 'brace_command_arg'
+ }
+ ],
+ 'cmdname' => 'verb',
+ 'contents' => [],
+ 'line_nr' => {
+ 'file_name' => 'g_f',
+ 'line_nr' => '30',
+ 'macro' => ''
+ },
+ 'parent' => {},
+ 'type' => ':'
+ },
+ {
+ 'parent' => {},
+ 'text' => '
+'
+ }
+ ],
+ 'parent' => {},
+ 'type' => 'paragraph'
+ },
+ {
+ 'parent' => {},
+ 'text' => '
+',
+ 'type' => 'empty_line'
+ },
+ {
+ 'contents' => [
+ {
+ 'args' => [
+ {
+ 'contents' => [
+ {
+ 'parent' => {},
+ 'text' => 'after verb'
+ }
+ ],
+ 'parent' => {},
+ 'type' => 'brace_command_arg'
+ }
+ ],
+ 'cmdname' => 'email',
+ 'contents' => [],
+ 'extra' => {
+ 'brace_command_contents' => [
+ [
+ {}
+ ]
+ ]
+ },
+ 'line_nr' => {
+ 'file_name' => 'g_f',
+ 'line_nr' => '34',
+ 'macro' => ''
+ },
+ 'parent' => {}
+ },
+ {
+ 'parent' => {},
+ 'text' => '
+'
+ }
+ ],
+ 'parent' => {},
+ 'type' => 'paragraph'
+ },
+ {
+ 'parent' => {},
+ 'text' => '
+',
+ 'type' => 'empty_line'
+ }
+ ],
+ 'extra' => {
+ 'node_content' => [
+ {}
+ ],
+ 'nodes_manuals' => [
+ {
+ 'node_content' => [],
+ 'normalized' => 'Top'
+ }
+ ],
+ 'normalized' => 'Top'
+ },
+ 'line_nr' => {
+ 'file_name' => 'g_f',
+ 'line_nr' => '70',
+ 'macro' => ''
+ },
+ 'parent' => {}
+ },
+ {
+ 'cmdname' => 'bye',
+ 'parent' => {}
+ }
+ ],
+ 'type' => 'document_root'
+};
+$result_trees{'cpp_lines'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'parent'}
= $result_trees{'cpp_lines'}{'contents'}[0]{'contents'}[0];
+$result_trees{'cpp_lines'}{'contents'}[0]{'contents'}[0]{'parent'} =
$result_trees{'cpp_lines'}{'contents'}[0];
+$result_trees{'cpp_lines'}{'contents'}[0]{'contents'}[1]{'args'}[0]{'contents'}[0]{'extra'}{'command'}
= $result_trees{'cpp_lines'}{'contents'}[0]{'contents'}[1];
+$result_trees{'cpp_lines'}{'contents'}[0]{'contents'}[1]{'args'}[0]{'contents'}[0]{'parent'}
= $result_trees{'cpp_lines'}{'contents'}[0]{'contents'}[1]{'args'}[0];
+$result_trees{'cpp_lines'}{'contents'}[0]{'contents'}[1]{'args'}[0]{'contents'}[1]{'parent'}
= $result_trees{'cpp_lines'}{'contents'}[0]{'contents'}[1]{'args'}[0];
+$result_trees{'cpp_lines'}{'contents'}[0]{'contents'}[1]{'args'}[0]{'contents'}[2]{'parent'}
= $result_trees{'cpp_lines'}{'contents'}[0]{'contents'}[1]{'args'}[0];
+$result_trees{'cpp_lines'}{'contents'}[0]{'contents'}[1]{'args'}[0]{'parent'}
= $result_trees{'cpp_lines'}{'contents'}[0]{'contents'}[1];
+$result_trees{'cpp_lines'}{'contents'}[0]{'contents'}[1]{'parent'} =
$result_trees{'cpp_lines'}{'contents'}[0];
+$result_trees{'cpp_lines'}{'contents'}[0]{'contents'}[2]{'parent'} =
$result_trees{'cpp_lines'}{'contents'}[0];
+$result_trees{'cpp_lines'}{'contents'}[0]{'contents'}[3]{'parent'} =
$result_trees{'cpp_lines'}{'contents'}[0];
+$result_trees{'cpp_lines'}{'contents'}[0]{'contents'}[4]{'contents'}[0]{'args'}[0]{'contents'}[0]{'parent'}
=
$result_trees{'cpp_lines'}{'contents'}[0]{'contents'}[4]{'contents'}[0]{'args'}[0];
+$result_trees{'cpp_lines'}{'contents'}[0]{'contents'}[4]{'contents'}[0]{'args'}[0]{'parent'}
= $result_trees{'cpp_lines'}{'contents'}[0]{'contents'}[4]{'contents'}[0];
+$result_trees{'cpp_lines'}{'contents'}[0]{'contents'}[4]{'contents'}[0]{'extra'}{'brace_command_contents'}[0][0]
=
$result_trees{'cpp_lines'}{'contents'}[0]{'contents'}[4]{'contents'}[0]{'args'}[0]{'contents'}[0];
+$result_trees{'cpp_lines'}{'contents'}[0]{'contents'}[4]{'contents'}[0]{'parent'}
= $result_trees{'cpp_lines'}{'contents'}[0]{'contents'}[4];
+$result_trees{'cpp_lines'}{'contents'}[0]{'contents'}[4]{'contents'}[1]{'parent'}
= $result_trees{'cpp_lines'}{'contents'}[0]{'contents'}[4];
+$result_trees{'cpp_lines'}{'contents'}[0]{'contents'}[4]{'parent'} =
$result_trees{'cpp_lines'}{'contents'}[0];
+$result_trees{'cpp_lines'}{'contents'}[0]{'contents'}[5]{'parent'} =
$result_trees{'cpp_lines'}{'contents'}[0];
+$result_trees{'cpp_lines'}{'contents'}[0]{'parent'} =
$result_trees{'cpp_lines'};
+$result_trees{'cpp_lines'}{'contents'}[1]{'args'}[0]{'contents'}[0]{'extra'}{'command'}
= $result_trees{'cpp_lines'}{'contents'}[1];
+$result_trees{'cpp_lines'}{'contents'}[1]{'args'}[0]{'contents'}[0]{'parent'}
= $result_trees{'cpp_lines'}{'contents'}[1]{'args'}[0];
+$result_trees{'cpp_lines'}{'contents'}[1]{'args'}[0]{'contents'}[1]{'parent'}
= $result_trees{'cpp_lines'}{'contents'}[1]{'args'}[0];
+$result_trees{'cpp_lines'}{'contents'}[1]{'args'}[0]{'contents'}[2]{'parent'}
= $result_trees{'cpp_lines'}{'contents'}[1]{'args'}[0];
+$result_trees{'cpp_lines'}{'contents'}[1]{'args'}[0]{'parent'} =
$result_trees{'cpp_lines'}{'contents'}[1];
+$result_trees{'cpp_lines'}{'contents'}[1]{'contents'}[0]{'parent'} =
$result_trees{'cpp_lines'}{'contents'}[1];
+$result_trees{'cpp_lines'}{'contents'}[1]{'contents'}[1]{'parent'} =
$result_trees{'cpp_lines'}{'contents'}[1];
+$result_trees{'cpp_lines'}{'contents'}[1]{'contents'}[2]{'contents'}[0]{'extra'}{'command'}
= $result_trees{'cpp_lines'}{'contents'}[1]{'contents'}[2];
+$result_trees{'cpp_lines'}{'contents'}[1]{'contents'}[2]{'contents'}[0]{'parent'}
= $result_trees{'cpp_lines'}{'contents'}[1]{'contents'}[2];
+$result_trees{'cpp_lines'}{'contents'}[1]{'contents'}[2]{'contents'}[1]{'parent'}
= $result_trees{'cpp_lines'}{'contents'}[1]{'contents'}[2];
+$result_trees{'cpp_lines'}{'contents'}[1]{'contents'}[2]{'contents'}[2]{'parent'}
= $result_trees{'cpp_lines'}{'contents'}[1]{'contents'}[2];
+$result_trees{'cpp_lines'}{'contents'}[1]{'contents'}[2]{'parent'} =
$result_trees{'cpp_lines'}{'contents'}[1];
+$result_trees{'cpp_lines'}{'contents'}[1]{'contents'}[3]{'extra'}{'command'} =
$result_trees{'cpp_lines'}{'contents'}[1]{'contents'}[2];
+$result_trees{'cpp_lines'}{'contents'}[1]{'contents'}[3]{'parent'} =
$result_trees{'cpp_lines'}{'contents'}[1];
+$result_trees{'cpp_lines'}{'contents'}[1]{'contents'}[4]{'parent'} =
$result_trees{'cpp_lines'}{'contents'}[1];
+$result_trees{'cpp_lines'}{'contents'}[1]{'contents'}[5]{'args'}[0]{'parent'}
= $result_trees{'cpp_lines'}{'contents'}[1]{'contents'}[5];
+$result_trees{'cpp_lines'}{'contents'}[1]{'contents'}[5]{'contents'}[0]{'parent'}
= $result_trees{'cpp_lines'}{'contents'}[1]{'contents'}[5];
+$result_trees{'cpp_lines'}{'contents'}[1]{'contents'}[5]{'contents'}[1]{'parent'}
= $result_trees{'cpp_lines'}{'contents'}[1]{'contents'}[5];
+$result_trees{'cpp_lines'}{'contents'}[1]{'contents'}[5]{'parent'} =
$result_trees{'cpp_lines'}{'contents'}[1];
+$result_trees{'cpp_lines'}{'contents'}[1]{'contents'}[6]{'extra'}{'command'} =
$result_trees{'cpp_lines'}{'contents'}[1]{'contents'}[5];
+$result_trees{'cpp_lines'}{'contents'}[1]{'contents'}[6]{'parent'} =
$result_trees{'cpp_lines'}{'contents'}[1];
+$result_trees{'cpp_lines'}{'contents'}[1]{'contents'}[7]{'parent'} =
$result_trees{'cpp_lines'}{'contents'}[1];
+$result_trees{'cpp_lines'}{'contents'}[1]{'contents'}[8]{'contents'}[0]{'args'}[0]{'contents'}[0]{'parent'}
=
$result_trees{'cpp_lines'}{'contents'}[1]{'contents'}[8]{'contents'}[0]{'args'}[0];
+$result_trees{'cpp_lines'}{'contents'}[1]{'contents'}[8]{'contents'}[0]{'args'}[0]{'parent'}
= $result_trees{'cpp_lines'}{'contents'}[1]{'contents'}[8]{'contents'}[0];
+$result_trees{'cpp_lines'}{'contents'}[1]{'contents'}[8]{'contents'}[0]{'extra'}{'brace_command_contents'}[0][0]
=
$result_trees{'cpp_lines'}{'contents'}[1]{'contents'}[8]{'contents'}[0]{'args'}[0]{'contents'}[0];
+$result_trees{'cpp_lines'}{'contents'}[1]{'contents'}[8]{'contents'}[0]{'parent'}
= $result_trees{'cpp_lines'}{'contents'}[1]{'contents'}[8];
+$result_trees{'cpp_lines'}{'contents'}[1]{'contents'}[8]{'contents'}[1]{'parent'}
= $result_trees{'cpp_lines'}{'contents'}[1]{'contents'}[8];
+$result_trees{'cpp_lines'}{'contents'}[1]{'contents'}[8]{'parent'} =
$result_trees{'cpp_lines'}{'contents'}[1];
+$result_trees{'cpp_lines'}{'contents'}[1]{'contents'}[9]{'parent'} =
$result_trees{'cpp_lines'}{'contents'}[1];
+$result_trees{'cpp_lines'}{'contents'}[1]{'contents'}[10]{'contents'}[0]{'parent'}
= $result_trees{'cpp_lines'}{'contents'}[1]{'contents'}[10];
+$result_trees{'cpp_lines'}{'contents'}[1]{'contents'}[10]{'parent'} =
$result_trees{'cpp_lines'}{'contents'}[1];
+$result_trees{'cpp_lines'}{'contents'}[1]{'contents'}[11]{'parent'} =
$result_trees{'cpp_lines'}{'contents'}[1];
+$result_trees{'cpp_lines'}{'contents'}[1]{'contents'}[12]{'contents'}[0]{'args'}[0]{'contents'}[0]{'parent'}
=
$result_trees{'cpp_lines'}{'contents'}[1]{'contents'}[12]{'contents'}[0]{'args'}[0];
+$result_trees{'cpp_lines'}{'contents'}[1]{'contents'}[12]{'contents'}[0]{'args'}[0]{'parent'}
= $result_trees{'cpp_lines'}{'contents'}[1]{'contents'}[12]{'contents'}[0];
+$result_trees{'cpp_lines'}{'contents'}[1]{'contents'}[12]{'contents'}[0]{'extra'}{'brace_command_contents'}[0][0]
=
$result_trees{'cpp_lines'}{'contents'}[1]{'contents'}[12]{'contents'}[0]{'args'}[0]{'contents'}[0];
+$result_trees{'cpp_lines'}{'contents'}[1]{'contents'}[12]{'contents'}[0]{'parent'}
= $result_trees{'cpp_lines'}{'contents'}[1]{'contents'}[12];
+$result_trees{'cpp_lines'}{'contents'}[1]{'contents'}[12]{'contents'}[1]{'parent'}
= $result_trees{'cpp_lines'}{'contents'}[1]{'contents'}[12];
+$result_trees{'cpp_lines'}{'contents'}[1]{'contents'}[12]{'parent'} =
$result_trees{'cpp_lines'}{'contents'}[1];
+$result_trees{'cpp_lines'}{'contents'}[1]{'contents'}[13]{'parent'} =
$result_trees{'cpp_lines'}{'contents'}[1];
+$result_trees{'cpp_lines'}{'contents'}[1]{'contents'}[14]{'parent'} =
$result_trees{'cpp_lines'}{'contents'}[1];
+$result_trees{'cpp_lines'}{'contents'}[1]{'contents'}[15]{'parent'} =
$result_trees{'cpp_lines'}{'contents'}[1];
+$result_trees{'cpp_lines'}{'contents'}[1]{'contents'}[16]{'contents'}[0]{'args'}[0]{'contents'}[0]{'parent'}
=
$result_trees{'cpp_lines'}{'contents'}[1]{'contents'}[16]{'contents'}[0]{'args'}[0];
+$result_trees{'cpp_lines'}{'contents'}[1]{'contents'}[16]{'contents'}[0]{'args'}[0]{'parent'}
= $result_trees{'cpp_lines'}{'contents'}[1]{'contents'}[16]{'contents'}[0];
+$result_trees{'cpp_lines'}{'contents'}[1]{'contents'}[16]{'contents'}[0]{'extra'}{'brace_command_contents'}[0][0]
=
$result_trees{'cpp_lines'}{'contents'}[1]{'contents'}[16]{'contents'}[0]{'args'}[0]{'contents'}[0];
+$result_trees{'cpp_lines'}{'contents'}[1]{'contents'}[16]{'contents'}[0]{'parent'}
= $result_trees{'cpp_lines'}{'contents'}[1]{'contents'}[16];
+$result_trees{'cpp_lines'}{'contents'}[1]{'contents'}[16]{'contents'}[1]{'parent'}
= $result_trees{'cpp_lines'}{'contents'}[1]{'contents'}[16];
+$result_trees{'cpp_lines'}{'contents'}[1]{'contents'}[16]{'parent'} =
$result_trees{'cpp_lines'}{'contents'}[1];
+$result_trees{'cpp_lines'}{'contents'}[1]{'contents'}[17]{'parent'} =
$result_trees{'cpp_lines'}{'contents'}[1];
+$result_trees{'cpp_lines'}{'contents'}[1]{'contents'}[18]{'contents'}[0]{'args'}[0]{'contents'}[0]{'parent'}
=
$result_trees{'cpp_lines'}{'contents'}[1]{'contents'}[18]{'contents'}[0]{'args'}[0];
+$result_trees{'cpp_lines'}{'contents'}[1]{'contents'}[18]{'contents'}[0]{'args'}[0]{'parent'}
= $result_trees{'cpp_lines'}{'contents'}[1]{'contents'}[18]{'contents'}[0];
+$result_trees{'cpp_lines'}{'contents'}[1]{'contents'}[18]{'contents'}[0]{'extra'}{'brace_command_contents'}[0][0]
=
$result_trees{'cpp_lines'}{'contents'}[1]{'contents'}[18]{'contents'}[0]{'args'}[0]{'contents'}[0];
+$result_trees{'cpp_lines'}{'contents'}[1]{'contents'}[18]{'contents'}[0]{'parent'}
= $result_trees{'cpp_lines'}{'contents'}[1]{'contents'}[18];
+$result_trees{'cpp_lines'}{'contents'}[1]{'contents'}[18]{'contents'}[1]{'parent'}
= $result_trees{'cpp_lines'}{'contents'}[1]{'contents'}[18];
+$result_trees{'cpp_lines'}{'contents'}[1]{'contents'}[18]{'parent'} =
$result_trees{'cpp_lines'}{'contents'}[1];
+$result_trees{'cpp_lines'}{'contents'}[1]{'contents'}[19]{'parent'} =
$result_trees{'cpp_lines'}{'contents'}[1];
+$result_trees{'cpp_lines'}{'contents'}[1]{'contents'}[20]{'contents'}[0]{'args'}[0]{'contents'}[0]{'parent'}
=
$result_trees{'cpp_lines'}{'contents'}[1]{'contents'}[20]{'contents'}[0]{'args'}[0];
+$result_trees{'cpp_lines'}{'contents'}[1]{'contents'}[20]{'contents'}[0]{'args'}[0]{'contents'}[1]{'parent'}
=
$result_trees{'cpp_lines'}{'contents'}[1]{'contents'}[20]{'contents'}[0]{'args'}[0];
+$result_trees{'cpp_lines'}{'contents'}[1]{'contents'}[20]{'contents'}[0]{'args'}[0]{'parent'}
= $result_trees{'cpp_lines'}{'contents'}[1]{'contents'}[20]{'contents'}[0];
+$result_trees{'cpp_lines'}{'contents'}[1]{'contents'}[20]{'contents'}[0]{'parent'}
= $result_trees{'cpp_lines'}{'contents'}[1]{'contents'}[20];
+$result_trees{'cpp_lines'}{'contents'}[1]{'contents'}[20]{'contents'}[1]{'parent'}
= $result_trees{'cpp_lines'}{'contents'}[1]{'contents'}[20];
+$result_trees{'cpp_lines'}{'contents'}[1]{'contents'}[20]{'parent'} =
$result_trees{'cpp_lines'}{'contents'}[1];
+$result_trees{'cpp_lines'}{'contents'}[1]{'contents'}[21]{'parent'} =
$result_trees{'cpp_lines'}{'contents'}[1];
+$result_trees{'cpp_lines'}{'contents'}[1]{'contents'}[22]{'contents'}[0]{'args'}[0]{'contents'}[0]{'parent'}
=
$result_trees{'cpp_lines'}{'contents'}[1]{'contents'}[22]{'contents'}[0]{'args'}[0];
+$result_trees{'cpp_lines'}{'contents'}[1]{'contents'}[22]{'contents'}[0]{'args'}[0]{'parent'}
= $result_trees{'cpp_lines'}{'contents'}[1]{'contents'}[22]{'contents'}[0];
+$result_trees{'cpp_lines'}{'contents'}[1]{'contents'}[22]{'contents'}[0]{'extra'}{'brace_command_contents'}[0][0]
=
$result_trees{'cpp_lines'}{'contents'}[1]{'contents'}[22]{'contents'}[0]{'args'}[0]{'contents'}[0];
+$result_trees{'cpp_lines'}{'contents'}[1]{'contents'}[22]{'contents'}[0]{'parent'}
= $result_trees{'cpp_lines'}{'contents'}[1]{'contents'}[22];
+$result_trees{'cpp_lines'}{'contents'}[1]{'contents'}[22]{'contents'}[1]{'parent'}
= $result_trees{'cpp_lines'}{'contents'}[1]{'contents'}[22];
+$result_trees{'cpp_lines'}{'contents'}[1]{'contents'}[22]{'parent'} =
$result_trees{'cpp_lines'}{'contents'}[1];
+$result_trees{'cpp_lines'}{'contents'}[1]{'contents'}[23]{'parent'} =
$result_trees{'cpp_lines'}{'contents'}[1];
+$result_trees{'cpp_lines'}{'contents'}[1]{'extra'}{'node_content'}[0] =
$result_trees{'cpp_lines'}{'contents'}[1]{'args'}[0]{'contents'}[1];
+$result_trees{'cpp_lines'}{'contents'}[1]{'extra'}{'nodes_manuals'}[0]{'node_content'}
= $result_trees{'cpp_lines'}{'contents'}[1]{'extra'}{'node_content'};
+$result_trees{'cpp_lines'}{'contents'}[1]{'parent'} =
$result_trees{'cpp_lines'};
+$result_trees{'cpp_lines'}{'contents'}[2]{'parent'} =
$result_trees{'cpp_lines'};
+
+$result_texis{'cpp_lines'} = '\\input texinfo
address@hidden cpp_lines.info
+
+
address@hidden top}.
+
address@hidden Top
+
+
address@hidden
+
+ #line 5 "f"
address@hidden verbatim
+
address@hidden macr
+# line 7 "k"
address@hidden macro
+
address@hidden lacro def}
+
+# line 7 "k"
+
address@hidden macro call}.
+
+
+
address@hidden
+
address@hidden inc}.
+
address@hidden:
+#line 5 "in verb"
+:}
+
address@hidden verb}
+
address@hidden
+';
+
+
+$result_texts{'cpp_lines'} = '
+
+before top.
+
+
+
+
+ #line 5 "f"
+
+
+after lacro def
+
+# line 7 "k"
+
+after macro call.
+
+
+
+in
+
+after inc.
+
+
+#line 5 "in verb"
+
+
+after verb
+
+';
+
+$result_sectioning{'cpp_lines'} = {};
+
+$result_nodes{'cpp_lines'} = {
+ 'cmdname' => 'node',
+ 'extra' => {
+ 'normalized' => 'Top'
+ },
+ 'node_up' => {
+ 'extra' => {
+ 'manual_content' => [
+ {
+ 'text' => 'dir'
+ }
+ ],
+ 'top_node_up' => {}
+ },
+ 'type' => 'top_node_up'
+ }
+};
+$result_nodes{'cpp_lines'}{'node_up'}{'extra'}{'top_node_up'} =
$result_nodes{'cpp_lines'};
+
+$result_menus{'cpp_lines'} = {
+ 'cmdname' => 'node',
+ 'extra' => {
+ 'normalized' => 'Top'
+ }
+};
+
+$result_errors{'cpp_lines'} = [];
+
+
+1;
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- texinfo/tp MANIFEST Makefile.am TODO Texinfo/Pa...,
Patrice Dumas <=