[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
texinfo/tp Texinfo/Parser.pm t/02coverage.t t/1...
|
From: |
Patrice Dumas |
|
Subject: |
texinfo/tp Texinfo/Parser.pm t/02coverage.t t/1... |
|
Date: |
Thu, 11 Nov 2010 15:15:42 +0000 |
CVSROOT: /sources/texinfo
Module name: texinfo
Changes by: Patrice Dumas <pertusus> 10/11/11 15:15:42
Modified files:
tp/Texinfo : Parser.pm
tp/t : 02coverage.t 19def.t test_utils.pl
Added files:
tp/t/results/coverage: accents_errors.pl
lettered_accent_and_spaces.pl
tp/t/results/def: protected_brace.pl
Removed files:
tp/t/results/coverage: accents.pl
Log message:
Add an entry point for a line parsing.
CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/Texinfo/Parser.pm?cvsroot=texinfo&r1=1.146&r2=1.147
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/02coverage.t?cvsroot=texinfo&r1=1.23&r2=1.24
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/19def.t?cvsroot=texinfo&r1=1.6&r2=1.7
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/test_utils.pl?cvsroot=texinfo&r1=1.47&r2=1.48
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/coverage/accents_errors.pl?cvsroot=texinfo&rev=1.1
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/coverage/lettered_accent_and_spaces.pl?cvsroot=texinfo&rev=1.1
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/coverage/accents.pl?cvsroot=texinfo&r1=1.15&r2=0
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/def/protected_brace.pl?cvsroot=texinfo&rev=1.1
Patches:
Index: Texinfo/Parser.pm
===================================================================
RCS file: /sources/texinfo/texinfo/tp/Texinfo/Parser.pm,v
retrieving revision 1.146
retrieving revision 1.147
diff -u -b -r1.146 -r1.147
--- Texinfo/Parser.pm 10 Nov 2010 18:21:20 -0000 1.146
+++ Texinfo/Parser.pm 11 Nov 2010 15:15:40 -0000 1.147
@@ -58,6 +58,7 @@
%EXPORT_TAGS = ( 'all' => [ qw(
parser
parse_texi_text
+ parse_texi_line
parse_texi_file
errors
indices_information
@@ -529,12 +530,11 @@
my $macro = shift;
my $fixed_line_number = shift;
- return if (!defined($first_line));
-
$macro = '' if (!defined($macro));
$file = '' if (!defined($file));
my $new_lines = [];
+ if (defined($first_line)) {
my $line_index = $first_line;
foreach my $index(0..scalar(@$lines)-1) {
$line_index = $index+$first_line if (!$fixed_line_number);
@@ -542,6 +542,11 @@
{ 'line_nr' => $line_index,
'file_name' => $file, 'macro' => $macro } ];
}
+ } else {
+ foreach my $line (@$lines) {
+ push @$new_lines, [ $line ];
+ }
+ }
return $new_lines;
}
@@ -592,6 +597,12 @@
last;
}
}
+ my $root = { 'contents' => [], 'type' => 'text_root' };
+ foreach my $line (@first_lines) {
+ push @{$root->{'contents'}}, { 'text' => $line,
+ 'type' => 'preamble' };
+ }
+
$self->{'input'} = [{
'pending' => [ [$line, { 'line_nr' => $line_nr,
'file_name' => $file_name, 'macro' => '' }] ],
@@ -599,7 +610,25 @@
'line_nr' => $line_nr,
'fh' => $filehandle
}];
- return $self->_parse_texi(address@hidden);
+ return $self->_parse_texi($root);
+}
+
+sub parse_texi_line($$;$)
+{
+ my $self = shift;
+ my $text = shift;
+ my $lines_nr = shift;
+
+ return undef if (!defined($text));
+
+ if (!ref($text)) {
+ $text = _text_to_lines($text);
+ }
+ my $lines_array = _complete_line_nr($text, $lines_nr);
+
+ $self = parser() if (!defined($self));
+ $self->{'input'} = [{'pending' => $lines_array}];
+ return $self->_parse_texi({'contents' => [], 'type' => 'root_line'});
}
# return the errors and warnings
@@ -2037,19 +2066,15 @@
#special for @verb, type is the character
# the main subroutine
-sub _parse_texi($$;$)
+sub _parse_texi($;$)
{
my $self = shift;
- my $first_lines = shift;
+# my $first_lines = shift;
- my $root = { 'contents' => [], 'type' => 'text_root' };
+# my $root = { 'contents' => [], 'type' => 'text_root' };
+ my $root = shift;
+ $root = { 'contents' => [], 'type' => 'text_root' } if (!defined($root));
my $current = $root;
- if ($first_lines) {
- foreach my $line (@$first_lines) {
- push @{$current->{'contents'}}, { 'text' => $line,
- 'type' => 'preamble' };
- }
- }
$self->{'conditionals_stack'} = [];
Index: t/02coverage.t
===================================================================
RCS file: /sources/texinfo/texinfo/tp/t/02coverage.t,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -b -r1.23 -r1.24
--- t/02coverage.t 6 Nov 2010 00:41:28 -0000 1.23
+++ t/02coverage.t 11 Nov 2010 15:15:42 -0000 1.24
@@ -15,10 +15,11 @@
['arg_in_brace_no_arg_command',
'@TeX{in tex}
'],
-['accents',
+['lettered_accent_and_spaces',
'@ringaccent a
-
-accent at end of line @ringaccent
+'],
+['accents_errors',
+'accent at end of line @ringaccent
accent at end of line and spaces @ringaccent
accent followed by @@ @address@hidden
Index: t/19def.t
===================================================================
RCS file: /sources/texinfo/texinfo/tp/t/19def.t,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -b -r1.6 -r1.7
--- t/19def.t 23 Oct 2010 22:37:42 -0000 1.6
+++ t/19def.t 11 Nov 2010 15:15:42 -0000 1.7
@@ -335,6 +335,10 @@
deffn with @}
@end deffn
'],
+['protected_brace',
+'@deffn @{
address@hidden deffn
+'],
['empty_def_arguments',
'@deffn fset @var{i} a g
@deffnx @b{id @samp{i} ule}
Index: t/test_utils.pl
===================================================================
RCS file: /sources/texinfo/texinfo/tp/t/test_utils.pl,v
retrieving revision 1.47
retrieving revision 1.48
diff -u -b -r1.47 -r1.48
--- t/test_utils.pl 10 Nov 2010 18:21:21 -0000 1.47
+++ t/test_utils.pl 11 Nov 2010 15:15:42 -0000 1.48
@@ -156,6 +156,16 @@
sub filter_floats_keys { [grep {!$avoided_keys_floats{$_}}
( sort keys %{$_[0]} )] }
+sub convert_to_plaintext($)
+{
+ my $tree = shift;
+ my $converter = Texinfo::Convert::Plaintext::new();
+ return $converter->convert($tree);
+}
+
+my %formats = (
+ 'plaintext' => \&convert_to_plaintext,
+);
sub test($$)
{
@@ -172,6 +182,10 @@
} else {
$test_name = basename($test_case, '.texi');
}
+ my @tested_formats;
+ if ($parser_options and $parser_options->{'test_formats'}) {
+ push @tested_formats, @{$parser_options->{'test_formats'}};
+ }
my $parser = Texinfo::Parser->parser({'test' => 1,
'include_directories' =>
['t/include/'],
@@ -206,6 +220,11 @@
my $converted_text = Texinfo::Convert::Text::convert($result);
+ my %converted;
+ foreach my $format (@tested_formats) {
+ $converted{$format} = &{$formats{$format}}($result);
+ }
+
my $file = "t/results/$self->{'name'}/$test_name.pl";
my $new_file = $file.'.new';
Index: t/results/coverage/accents_errors.pl
===================================================================
RCS file: t/results/coverage/accents_errors.pl
diff -N t/results/coverage/accents_errors.pl
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ t/results/coverage/accents_errors.pl 11 Nov 2010 15:15:42 -0000
1.1
@@ -0,0 +1,334 @@
+use vars qw(%result_texis %result_texts %result_trees %result_errors
+ %result_indices %result_sectioning %result_nodes %result_menus
+ %result_floats);
+
+$result_trees{'accents_errors'} = {
+ 'contents' => [
+ {
+ 'contents' => [
+ {
+ 'parent' => {},
+ 'text' => 'accent at end of line '
+ },
+ {
+ 'cmdname' => 'ringaccent',
+ 'contents' => [],
+ 'parent' => {}
+ },
+ {
+ 'parent' => {},
+ 'text' => '
+'
+ },
+ {
+ 'parent' => {},
+ 'text' => 'accent at end of line and spaces '
+ },
+ {
+ 'cmdname' => 'ringaccent',
+ 'contents' => [],
+ 'extra' => {
+ 'spaces' => ' '
+ },
+ 'parent' => {}
+ },
+ {
+ 'parent' => {},
+ 'text' => '
+'
+ },
+ {
+ 'parent' => {},
+ 'text' => 'accent followed by '
+ },
+ {
+ 'cmdname' => '@',
+ 'parent' => {}
+ },
+ {
+ 'parent' => {},
+ 'text' => ' '
+ },
+ {
+ 'cmdname' => 'ringaccent',
+ 'contents' => [],
+ 'parent' => {}
+ },
+ {
+ 'cmdname' => '.',
+ 'parent' => {}
+ },
+ {
+ 'parent' => {},
+ 'text' => '
+'
+ }
+ ],
+ 'parent' => {},
+ 'type' => 'paragraph'
+ },
+ {
+ 'parent' => {},
+ 'text' => '
+',
+ 'type' => 'empty_line'
+ },
+ {
+ 'contents' => [
+ {
+ 'parent' => {},
+ 'text' => 'accent character with spaces '
+ },
+ {
+ 'cmdname' => '~',
+ 'contents' => [],
+ 'parent' => {}
+ },
+ {
+ 'parent' => {},
+ 'text' => ' following.
+'
+ },
+ {
+ 'parent' => {},
+ 'text' => 'accent character at end of line '
+ },
+ {
+ 'cmdname' => '~',
+ 'contents' => [],
+ 'parent' => {}
+ },
+ {
+ 'parent' => {},
+ 'text' => '
+'
+ },
+ {
+ 'parent' => {},
+ 'text' => 'accent character followed by '
+ },
+ {
+ 'cmdname' => '@',
+ 'parent' => {}
+ },
+ {
+ 'parent' => {},
+ 'text' => ' '
+ },
+ {
+ 'cmdname' => '~',
+ 'contents' => [],
+ 'parent' => {}
+ },
+ {
+ 'cmdname' => '.',
+ 'parent' => {}
+ },
+ {
+ 'parent' => {},
+ 'text' => '
+'
+ }
+ ],
+ 'parent' => {},
+ 'type' => 'paragraph'
+ },
+ {
+ 'parent' => {},
+ 'text' => '
+',
+ 'type' => 'empty_line'
+ },
+ {
+ 'contents' => [
+ {
+ 'parent' => {},
+ 'text' => 'With '
+ },
+ {
+ 'cmdname' => '@',
+ 'parent' => {}
+ },
+ {
+ 'parent' => {},
+ 'text' => ':
+'
+ },
+ {
+ 'cmdname' => 'ringaccent',
+ 'contents' => [],
+ 'extra' => {
+ 'spaces' => ' '
+ },
+ 'parent' => {}
+ },
+ {
+ 'cmdname' => '@',
+ 'parent' => {}
+ },
+ {
+ 'parent' => {},
+ 'text' => '. '
+ },
+ {
+ 'cmdname' => '^',
+ 'contents' => [],
+ 'parent' => {}
+ },
+ {
+ 'cmdname' => '@',
+ 'parent' => {}
+ },
+ {
+ 'parent' => {},
+ 'text' => '.
+'
+ }
+ ],
+ 'parent' => {},
+ 'type' => 'paragraph'
+ }
+ ],
+ 'type' => 'text_root'
+};
+$result_trees{'accents_errors'}{'contents'}[0]{'contents'}[0]{'parent'} =
$result_trees{'accents_errors'}{'contents'}[0];
+$result_trees{'accents_errors'}{'contents'}[0]{'contents'}[1]{'parent'} =
$result_trees{'accents_errors'}{'contents'}[0];
+$result_trees{'accents_errors'}{'contents'}[0]{'contents'}[2]{'parent'} =
$result_trees{'accents_errors'}{'contents'}[0];
+$result_trees{'accents_errors'}{'contents'}[0]{'contents'}[3]{'parent'} =
$result_trees{'accents_errors'}{'contents'}[0];
+$result_trees{'accents_errors'}{'contents'}[0]{'contents'}[4]{'parent'} =
$result_trees{'accents_errors'}{'contents'}[0];
+$result_trees{'accents_errors'}{'contents'}[0]{'contents'}[5]{'parent'} =
$result_trees{'accents_errors'}{'contents'}[0];
+$result_trees{'accents_errors'}{'contents'}[0]{'contents'}[6]{'parent'} =
$result_trees{'accents_errors'}{'contents'}[0];
+$result_trees{'accents_errors'}{'contents'}[0]{'contents'}[7]{'parent'} =
$result_trees{'accents_errors'}{'contents'}[0];
+$result_trees{'accents_errors'}{'contents'}[0]{'contents'}[8]{'parent'} =
$result_trees{'accents_errors'}{'contents'}[0];
+$result_trees{'accents_errors'}{'contents'}[0]{'contents'}[9]{'parent'} =
$result_trees{'accents_errors'}{'contents'}[0];
+$result_trees{'accents_errors'}{'contents'}[0]{'contents'}[10]{'parent'} =
$result_trees{'accents_errors'}{'contents'}[0];
+$result_trees{'accents_errors'}{'contents'}[0]{'contents'}[11]{'parent'} =
$result_trees{'accents_errors'}{'contents'}[0];
+$result_trees{'accents_errors'}{'contents'}[0]{'parent'} =
$result_trees{'accents_errors'};
+$result_trees{'accents_errors'}{'contents'}[1]{'parent'} =
$result_trees{'accents_errors'};
+$result_trees{'accents_errors'}{'contents'}[2]{'contents'}[0]{'parent'} =
$result_trees{'accents_errors'}{'contents'}[2];
+$result_trees{'accents_errors'}{'contents'}[2]{'contents'}[1]{'parent'} =
$result_trees{'accents_errors'}{'contents'}[2];
+$result_trees{'accents_errors'}{'contents'}[2]{'contents'}[2]{'parent'} =
$result_trees{'accents_errors'}{'contents'}[2];
+$result_trees{'accents_errors'}{'contents'}[2]{'contents'}[3]{'parent'} =
$result_trees{'accents_errors'}{'contents'}[2];
+$result_trees{'accents_errors'}{'contents'}[2]{'contents'}[4]{'parent'} =
$result_trees{'accents_errors'}{'contents'}[2];
+$result_trees{'accents_errors'}{'contents'}[2]{'contents'}[5]{'parent'} =
$result_trees{'accents_errors'}{'contents'}[2];
+$result_trees{'accents_errors'}{'contents'}[2]{'contents'}[6]{'parent'} =
$result_trees{'accents_errors'}{'contents'}[2];
+$result_trees{'accents_errors'}{'contents'}[2]{'contents'}[7]{'parent'} =
$result_trees{'accents_errors'}{'contents'}[2];
+$result_trees{'accents_errors'}{'contents'}[2]{'contents'}[8]{'parent'} =
$result_trees{'accents_errors'}{'contents'}[2];
+$result_trees{'accents_errors'}{'contents'}[2]{'contents'}[9]{'parent'} =
$result_trees{'accents_errors'}{'contents'}[2];
+$result_trees{'accents_errors'}{'contents'}[2]{'contents'}[10]{'parent'} =
$result_trees{'accents_errors'}{'contents'}[2];
+$result_trees{'accents_errors'}{'contents'}[2]{'contents'}[11]{'parent'} =
$result_trees{'accents_errors'}{'contents'}[2];
+$result_trees{'accents_errors'}{'contents'}[2]{'parent'} =
$result_trees{'accents_errors'};
+$result_trees{'accents_errors'}{'contents'}[3]{'parent'} =
$result_trees{'accents_errors'};
+$result_trees{'accents_errors'}{'contents'}[4]{'contents'}[0]{'parent'} =
$result_trees{'accents_errors'}{'contents'}[4];
+$result_trees{'accents_errors'}{'contents'}[4]{'contents'}[1]{'parent'} =
$result_trees{'accents_errors'}{'contents'}[4];
+$result_trees{'accents_errors'}{'contents'}[4]{'contents'}[2]{'parent'} =
$result_trees{'accents_errors'}{'contents'}[4];
+$result_trees{'accents_errors'}{'contents'}[4]{'contents'}[3]{'parent'} =
$result_trees{'accents_errors'}{'contents'}[4];
+$result_trees{'accents_errors'}{'contents'}[4]{'contents'}[4]{'parent'} =
$result_trees{'accents_errors'}{'contents'}[4];
+$result_trees{'accents_errors'}{'contents'}[4]{'contents'}[5]{'parent'} =
$result_trees{'accents_errors'}{'contents'}[4];
+$result_trees{'accents_errors'}{'contents'}[4]{'contents'}[6]{'parent'} =
$result_trees{'accents_errors'}{'contents'}[4];
+$result_trees{'accents_errors'}{'contents'}[4]{'contents'}[7]{'parent'} =
$result_trees{'accents_errors'}{'contents'}[4];
+$result_trees{'accents_errors'}{'contents'}[4]{'contents'}[8]{'parent'} =
$result_trees{'accents_errors'}{'contents'}[4];
+$result_trees{'accents_errors'}{'contents'}[4]{'parent'} =
$result_trees{'accents_errors'};
+
+$result_texis{'accents_errors'} = 'accent at end of line @ringaccent
+accent at end of line and spaces @ringaccent
+accent followed by @@ @address@hidden
+
+accent character with spaces @~ following.
+accent character at end of line @~
+accent character followed by @@ @address@hidden
+
+With @@:
address@hidden@@. @^@@.
+';
+
+
+$result_texts{'accents_errors'} = 'accent at end of line
+accent at end of line and spaces
+accent followed by @ .
+
+accent character with spaces following.
+accent character at end of line
+accent character followed by @ .
+
+With @:
address@hidden @.
+';
+
+$result_errors{'accents_errors'} = [
+ {
+ 'error_line' => ':1: warning: Accent command address@hidden' must not be
followed by new line
+',
+ 'file_name' => '',
+ 'line_nr' => 1,
+ 'macro' => '',
+ 'text' => 'Accent command address@hidden' must not be followed by new
line',
+ 'type' => 'warning'
+ },
+ {
+ 'error_line' => ':2: warning: Accent command address@hidden' must not be
followed by new line
+',
+ 'file_name' => '',
+ 'line_nr' => 2,
+ 'macro' => '',
+ 'text' => 'Accent command address@hidden' must not be followed by new
line',
+ 'type' => 'warning'
+ },
+ {
+ 'error_line' => ':3: Use braces to give a command as an argument to
@ringaccent
+',
+ 'file_name' => '',
+ 'line_nr' => 3,
+ 'macro' => '',
+ 'text' => 'Use braces to give a command as an argument to @ringaccent',
+ 'type' => 'error'
+ },
+ {
+ 'error_line' => ':5: warning: Accent command address@hidden' must not be
followed by whitespace
+',
+ 'file_name' => '',
+ 'line_nr' => 5,
+ 'macro' => '',
+ 'text' => 'Accent command address@hidden' must not be followed by
whitespace',
+ 'type' => 'warning'
+ },
+ {
+ 'error_line' => ':6: warning: Accent command address@hidden' must not be
followed by new line
+',
+ 'file_name' => '',
+ 'line_nr' => 6,
+ 'macro' => '',
+ 'text' => 'Accent command address@hidden' must not be followed by new
line',
+ 'type' => 'warning'
+ },
+ {
+ 'error_line' => ':7: Use braces to give a command as an argument to @~
+',
+ 'file_name' => '',
+ 'line_nr' => 7,
+ 'macro' => '',
+ 'text' => 'Use braces to give a command as an argument to @~',
+ 'type' => 'error'
+ },
+ {
+ 'error_line' => ':10: Use braces to give a command as an argument to
@ringaccent
+',
+ 'file_name' => '',
+ 'line_nr' => 10,
+ 'macro' => '',
+ 'text' => 'Use braces to give a command as an argument to @ringaccent',
+ 'type' => 'error'
+ },
+ {
+ 'error_line' => ':10: Use braces to give a command as an argument to @^
+',
+ 'file_name' => '',
+ 'line_nr' => 10,
+ 'macro' => '',
+ 'text' => 'Use braces to give a command as an argument to @^',
+ 'type' => 'error'
+ }
+];
+
+
+1;
Index: t/results/coverage/lettered_accent_and_spaces.pl
===================================================================
RCS file: t/results/coverage/lettered_accent_and_spaces.pl
diff -N t/results/coverage/lettered_accent_and_spaces.pl
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ t/results/coverage/lettered_accent_and_spaces.pl 11 Nov 2010 15:15:42
-0000 1.1
@@ -0,0 +1,50 @@
+use vars qw(%result_texis %result_texts %result_trees %result_errors
+ %result_indices %result_sectioning %result_nodes %result_menus
+ %result_floats);
+
+$result_trees{'lettered_accent_and_spaces'} = {
+ 'contents' => [
+ {
+ 'contents' => [
+ {
+ 'args' => [
+ {
+ 'parent' => {},
+ 'text' => 'a',
+ 'type' => 'space_command_arg'
+ }
+ ],
+ 'cmdname' => 'ringaccent',
+ 'extra' => {
+ 'spaces' => ' '
+ },
+ 'parent' => {}
+ },
+ {
+ 'parent' => {},
+ 'text' => '
+'
+ }
+ ],
+ 'parent' => {},
+ 'type' => 'paragraph'
+ }
+ ],
+ 'type' => 'text_root'
+};
+$result_trees{'lettered_accent_and_spaces'}{'contents'}[0]{'contents'}[0]{'args'}[0]{'parent'}
= $result_trees{'lettered_accent_and_spaces'}{'contents'}[0]{'contents'}[0];
+$result_trees{'lettered_accent_and_spaces'}{'contents'}[0]{'contents'}[0]{'parent'}
= $result_trees{'lettered_accent_and_spaces'}{'contents'}[0];
+$result_trees{'lettered_accent_and_spaces'}{'contents'}[0]{'contents'}[1]{'parent'}
= $result_trees{'lettered_accent_and_spaces'}{'contents'}[0];
+$result_trees{'lettered_accent_and_spaces'}{'contents'}[0]{'parent'} =
$result_trees{'lettered_accent_and_spaces'};
+
+$result_texis{'lettered_accent_and_spaces'} = '@ringaccent a
+';
+
+
+$result_texts{'lettered_accent_and_spaces'} = 'a*
+';
+
+$result_errors{'lettered_accent_and_spaces'} = [];
+
+
+1;
Index: t/results/def/protected_brace.pl
===================================================================
RCS file: t/results/def/protected_brace.pl
diff -N t/results/def/protected_brace.pl
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ t/results/def/protected_brace.pl 11 Nov 2010 15:15:42 -0000 1.1
@@ -0,0 +1,87 @@
+use vars qw(%result_texis %result_texts %result_trees %result_errors
+ %result_indices %result_sectioning %result_nodes %result_menus
+ %result_floats);
+
+$result_trees{'protected_brace'} = {
+ 'contents' => [
+ {
+ 'cmdname' => 'deffn',
+ 'contents' => [
+ {
+ 'args' => [
+ {
+ 'contents' => [
+ {
+ 'parent' => {},
+ 'text' => ' ',
+ 'type' => 'empty_spaces_after_command'
+ },
+ {
+ 'cmdname' => '{',
+ 'parent' => {}
+ },
+ {
+ 'parent' => {},
+ 'text' => '
+'
+ }
+ ],
+ 'parent' => {},
+ 'type' => 'block_line_arg'
+ }
+ ],
+ 'extra' => {
+ 'def_args' => [
+ [
+ 'category',
+ {}
+ ]
+ ],
+ 'def_command' => 'deffn',
+ 'index_entry' => {
+ 'command' => {},
+ 'content' => [],
+ 'def' => 1,
+ 'index_at_command' => 'deffn',
+ 'index_name' => 'fn',
+ 'index_prefix' => 'f'
+ }
+ },
+ 'parent' => {},
+ 'type' => 'def_line'
+ }
+ ],
+ 'parent' => {}
+ },
+ {
+ 'parent' => {},
+ 'text' => '
+',
+ 'type' => 'empty_line_after_command'
+ }
+ ],
+ 'type' => 'text_root'
+};
+$result_trees{'protected_brace'}{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[0]{'parent'}
= $result_trees{'protected_brace'}{'contents'}[0]{'contents'}[0]{'args'}[0];
+$result_trees{'protected_brace'}{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[1]{'parent'}
= $result_trees{'protected_brace'}{'contents'}[0]{'contents'}[0]{'args'}[0];
+$result_trees{'protected_brace'}{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[2]{'parent'}
= $result_trees{'protected_brace'}{'contents'}[0]{'contents'}[0]{'args'}[0];
+$result_trees{'protected_brace'}{'contents'}[0]{'contents'}[0]{'args'}[0]{'parent'}
= $result_trees{'protected_brace'}{'contents'}[0]{'contents'}[0];
+$result_trees{'protected_brace'}{'contents'}[0]{'contents'}[0]{'extra'}{'def_args'}[0][1]
=
$result_trees{'protected_brace'}{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[1];
+$result_trees{'protected_brace'}{'contents'}[0]{'contents'}[0]{'extra'}{'index_entry'}{'command'}
= $result_trees{'protected_brace'}{'contents'}[0]{'contents'}[0];
+$result_trees{'protected_brace'}{'contents'}[0]{'contents'}[0]{'extra'}{'index_entry'}{'content'}
=
$result_trees{'protected_brace'}{'contents'}[0]{'contents'}[0]{'extra'}{'def_args'};
+$result_trees{'protected_brace'}{'contents'}[0]{'contents'}[0]{'parent'} =
$result_trees{'protected_brace'}{'contents'}[0];
+$result_trees{'protected_brace'}{'contents'}[0]{'parent'} =
$result_trees{'protected_brace'};
+$result_trees{'protected_brace'}{'contents'}[1]{'parent'} =
$result_trees{'protected_brace'};
+
+$result_texis{'protected_brace'} = '@deffn @{
address@hidden deffn
+';
+
+
+$result_texts{'protected_brace'} = '{
+';
+
+$result_errors{'protected_brace'} = [];
+
+
+1;
Index: t/results/coverage/accents.pl
===================================================================
RCS file: t/results/coverage/accents.pl
diff -N t/results/coverage/accents.pl
--- t/results/coverage/accents.pl 1 Nov 2010 09:01:02 -0000 1.15
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,374 +0,0 @@
-use vars qw(%result_texis %result_texts %result_trees %result_errors
- %result_indices %result_sectioning %result_nodes %result_menus
- %result_floats);
-
-$result_trees{'accents'} = {
- 'contents' => [
- {
- 'contents' => [
- {
- 'args' => [
- {
- 'parent' => {},
- 'text' => 'a',
- 'type' => 'space_command_arg'
- }
- ],
- 'cmdname' => 'ringaccent',
- 'extra' => {
- 'spaces' => ' '
- },
- 'parent' => {}
- },
- {
- 'parent' => {},
- 'text' => '
-'
- }
- ],
- 'parent' => {},
- 'type' => 'paragraph'
- },
- {
- 'parent' => {},
- 'text' => '
-',
- 'type' => 'empty_line'
- },
- {
- 'contents' => [
- {
- 'parent' => {},
- 'text' => 'accent at end of line '
- },
- {
- 'cmdname' => 'ringaccent',
- 'contents' => [],
- 'parent' => {}
- },
- {
- 'parent' => {},
- 'text' => '
-'
- },
- {
- 'parent' => {},
- 'text' => 'accent at end of line and spaces '
- },
- {
- 'cmdname' => 'ringaccent',
- 'contents' => [],
- 'extra' => {
- 'spaces' => ' '
- },
- 'parent' => {}
- },
- {
- 'parent' => {},
- 'text' => '
-'
- },
- {
- 'parent' => {},
- 'text' => 'accent followed by '
- },
- {
- 'cmdname' => '@',
- 'parent' => {}
- },
- {
- 'parent' => {},
- 'text' => ' '
- },
- {
- 'cmdname' => 'ringaccent',
- 'contents' => [],
- 'parent' => {}
- },
- {
- 'cmdname' => '.',
- 'parent' => {}
- },
- {
- 'parent' => {},
- 'text' => '
-'
- }
- ],
- 'parent' => {},
- 'type' => 'paragraph'
- },
- {
- 'parent' => {},
- 'text' => '
-',
- 'type' => 'empty_line'
- },
- {
- 'contents' => [
- {
- 'parent' => {},
- 'text' => 'accent character with spaces '
- },
- {
- 'cmdname' => '~',
- 'contents' => [],
- 'parent' => {}
- },
- {
- 'parent' => {},
- 'text' => ' following.
-'
- },
- {
- 'parent' => {},
- 'text' => 'accent character at end of line '
- },
- {
- 'cmdname' => '~',
- 'contents' => [],
- 'parent' => {}
- },
- {
- 'parent' => {},
- 'text' => '
-'
- },
- {
- 'parent' => {},
- 'text' => 'accent character followed by '
- },
- {
- 'cmdname' => '@',
- 'parent' => {}
- },
- {
- 'parent' => {},
- 'text' => ' '
- },
- {
- 'cmdname' => '~',
- 'contents' => [],
- 'parent' => {}
- },
- {
- 'cmdname' => '.',
- 'parent' => {}
- },
- {
- 'parent' => {},
- 'text' => '
-'
- }
- ],
- 'parent' => {},
- 'type' => 'paragraph'
- },
- {
- 'parent' => {},
- 'text' => '
-',
- 'type' => 'empty_line'
- },
- {
- 'contents' => [
- {
- 'parent' => {},
- 'text' => 'With '
- },
- {
- 'cmdname' => '@',
- 'parent' => {}
- },
- {
- 'parent' => {},
- 'text' => ':
-'
- },
- {
- 'cmdname' => 'ringaccent',
- 'contents' => [],
- 'extra' => {
- 'spaces' => ' '
- },
- 'parent' => {}
- },
- {
- 'cmdname' => '@',
- 'parent' => {}
- },
- {
- 'parent' => {},
- 'text' => '. '
- },
- {
- 'cmdname' => '^',
- 'contents' => [],
- 'parent' => {}
- },
- {
- 'cmdname' => '@',
- 'parent' => {}
- },
- {
- 'parent' => {},
- 'text' => '.
-'
- }
- ],
- 'parent' => {},
- 'type' => 'paragraph'
- }
- ],
- 'type' => 'text_root'
-};
-$result_trees{'accents'}{'contents'}[0]{'contents'}[0]{'args'}[0]{'parent'} =
$result_trees{'accents'}{'contents'}[0]{'contents'}[0];
-$result_trees{'accents'}{'contents'}[0]{'contents'}[0]{'parent'} =
$result_trees{'accents'}{'contents'}[0];
-$result_trees{'accents'}{'contents'}[0]{'contents'}[1]{'parent'} =
$result_trees{'accents'}{'contents'}[0];
-$result_trees{'accents'}{'contents'}[0]{'parent'} = $result_trees{'accents'};
-$result_trees{'accents'}{'contents'}[1]{'parent'} = $result_trees{'accents'};
-$result_trees{'accents'}{'contents'}[2]{'contents'}[0]{'parent'} =
$result_trees{'accents'}{'contents'}[2];
-$result_trees{'accents'}{'contents'}[2]{'contents'}[1]{'parent'} =
$result_trees{'accents'}{'contents'}[2];
-$result_trees{'accents'}{'contents'}[2]{'contents'}[2]{'parent'} =
$result_trees{'accents'}{'contents'}[2];
-$result_trees{'accents'}{'contents'}[2]{'contents'}[3]{'parent'} =
$result_trees{'accents'}{'contents'}[2];
-$result_trees{'accents'}{'contents'}[2]{'contents'}[4]{'parent'} =
$result_trees{'accents'}{'contents'}[2];
-$result_trees{'accents'}{'contents'}[2]{'contents'}[5]{'parent'} =
$result_trees{'accents'}{'contents'}[2];
-$result_trees{'accents'}{'contents'}[2]{'contents'}[6]{'parent'} =
$result_trees{'accents'}{'contents'}[2];
-$result_trees{'accents'}{'contents'}[2]{'contents'}[7]{'parent'} =
$result_trees{'accents'}{'contents'}[2];
-$result_trees{'accents'}{'contents'}[2]{'contents'}[8]{'parent'} =
$result_trees{'accents'}{'contents'}[2];
-$result_trees{'accents'}{'contents'}[2]{'contents'}[9]{'parent'} =
$result_trees{'accents'}{'contents'}[2];
-$result_trees{'accents'}{'contents'}[2]{'contents'}[10]{'parent'} =
$result_trees{'accents'}{'contents'}[2];
-$result_trees{'accents'}{'contents'}[2]{'contents'}[11]{'parent'} =
$result_trees{'accents'}{'contents'}[2];
-$result_trees{'accents'}{'contents'}[2]{'parent'} = $result_trees{'accents'};
-$result_trees{'accents'}{'contents'}[3]{'parent'} = $result_trees{'accents'};
-$result_trees{'accents'}{'contents'}[4]{'contents'}[0]{'parent'} =
$result_trees{'accents'}{'contents'}[4];
-$result_trees{'accents'}{'contents'}[4]{'contents'}[1]{'parent'} =
$result_trees{'accents'}{'contents'}[4];
-$result_trees{'accents'}{'contents'}[4]{'contents'}[2]{'parent'} =
$result_trees{'accents'}{'contents'}[4];
-$result_trees{'accents'}{'contents'}[4]{'contents'}[3]{'parent'} =
$result_trees{'accents'}{'contents'}[4];
-$result_trees{'accents'}{'contents'}[4]{'contents'}[4]{'parent'} =
$result_trees{'accents'}{'contents'}[4];
-$result_trees{'accents'}{'contents'}[4]{'contents'}[5]{'parent'} =
$result_trees{'accents'}{'contents'}[4];
-$result_trees{'accents'}{'contents'}[4]{'contents'}[6]{'parent'} =
$result_trees{'accents'}{'contents'}[4];
-$result_trees{'accents'}{'contents'}[4]{'contents'}[7]{'parent'} =
$result_trees{'accents'}{'contents'}[4];
-$result_trees{'accents'}{'contents'}[4]{'contents'}[8]{'parent'} =
$result_trees{'accents'}{'contents'}[4];
-$result_trees{'accents'}{'contents'}[4]{'contents'}[9]{'parent'} =
$result_trees{'accents'}{'contents'}[4];
-$result_trees{'accents'}{'contents'}[4]{'contents'}[10]{'parent'} =
$result_trees{'accents'}{'contents'}[4];
-$result_trees{'accents'}{'contents'}[4]{'contents'}[11]{'parent'} =
$result_trees{'accents'}{'contents'}[4];
-$result_trees{'accents'}{'contents'}[4]{'parent'} = $result_trees{'accents'};
-$result_trees{'accents'}{'contents'}[5]{'parent'} = $result_trees{'accents'};
-$result_trees{'accents'}{'contents'}[6]{'contents'}[0]{'parent'} =
$result_trees{'accents'}{'contents'}[6];
-$result_trees{'accents'}{'contents'}[6]{'contents'}[1]{'parent'} =
$result_trees{'accents'}{'contents'}[6];
-$result_trees{'accents'}{'contents'}[6]{'contents'}[2]{'parent'} =
$result_trees{'accents'}{'contents'}[6];
-$result_trees{'accents'}{'contents'}[6]{'contents'}[3]{'parent'} =
$result_trees{'accents'}{'contents'}[6];
-$result_trees{'accents'}{'contents'}[6]{'contents'}[4]{'parent'} =
$result_trees{'accents'}{'contents'}[6];
-$result_trees{'accents'}{'contents'}[6]{'contents'}[5]{'parent'} =
$result_trees{'accents'}{'contents'}[6];
-$result_trees{'accents'}{'contents'}[6]{'contents'}[6]{'parent'} =
$result_trees{'accents'}{'contents'}[6];
-$result_trees{'accents'}{'contents'}[6]{'contents'}[7]{'parent'} =
$result_trees{'accents'}{'contents'}[6];
-$result_trees{'accents'}{'contents'}[6]{'contents'}[8]{'parent'} =
$result_trees{'accents'}{'contents'}[6];
-$result_trees{'accents'}{'contents'}[6]{'parent'} = $result_trees{'accents'};
-
-$result_texis{'accents'} = '@ringaccent a
-
-accent at end of line @ringaccent
-accent at end of line and spaces @ringaccent
-accent followed by @@ @address@hidden
-
-accent character with spaces @~ following.
-accent character at end of line @~
-accent character followed by @@ @address@hidden
-
-With @@:
address@hidden@@. @^@@.
-';
-
-
-$result_texts{'accents'} = 'a*
-
-accent at end of line
-accent at end of line and spaces
-accent followed by @ .
-
-accent character with spaces following.
-accent character at end of line
-accent character followed by @ .
-
-With @:
address@hidden @.
-';
-
-$result_errors{'accents'} = [
- {
- 'error_line' => ':3: warning: Accent command address@hidden' must not be
followed by new line
-',
- 'file_name' => '',
- 'line_nr' => 3,
- 'macro' => '',
- 'text' => 'Accent command address@hidden' must not be followed by new
line',
- 'type' => 'warning'
- },
- {
- 'error_line' => ':4: warning: Accent command address@hidden' must not be
followed by new line
-',
- 'file_name' => '',
- 'line_nr' => 4,
- 'macro' => '',
- 'text' => 'Accent command address@hidden' must not be followed by new
line',
- 'type' => 'warning'
- },
- {
- 'error_line' => ':5: Use braces to give a command as an argument to
@ringaccent
-',
- 'file_name' => '',
- 'line_nr' => 5,
- 'macro' => '',
- 'text' => 'Use braces to give a command as an argument to @ringaccent',
- 'type' => 'error'
- },
- {
- 'error_line' => ':7: warning: Accent command address@hidden' must not be
followed by whitespace
-',
- 'file_name' => '',
- 'line_nr' => 7,
- 'macro' => '',
- 'text' => 'Accent command address@hidden' must not be followed by
whitespace',
- 'type' => 'warning'
- },
- {
- 'error_line' => ':8: warning: Accent command address@hidden' must not be
followed by new line
-',
- 'file_name' => '',
- 'line_nr' => 8,
- 'macro' => '',
- 'text' => 'Accent command address@hidden' must not be followed by new
line',
- 'type' => 'warning'
- },
- {
- 'error_line' => ':9: Use braces to give a command as an argument to @~
-',
- 'file_name' => '',
- 'line_nr' => 9,
- 'macro' => '',
- 'text' => 'Use braces to give a command as an argument to @~',
- 'type' => 'error'
- },
- {
- 'error_line' => ':12: Use braces to give a command as an argument to
@ringaccent
-',
- 'file_name' => '',
- 'line_nr' => 12,
- 'macro' => '',
- 'text' => 'Use braces to give a command as an argument to @ringaccent',
- 'type' => 'error'
- },
- {
- 'error_line' => ':12: Use braces to give a command as an argument to @^
-',
- 'file_name' => '',
- 'line_nr' => 12,
- 'macro' => '',
- 'text' => 'Use braces to give a command as an argument to @^',
- 'type' => 'error'
- }
-];
-
-
-1;
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- texinfo/tp Texinfo/Parser.pm t/02coverage.t t/1...,
Patrice Dumas <=