[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
texinfo/tp TODO Texinfo/Parser.pm t/06columnfra...
|
From: |
Patrice Dumas |
|
Subject: |
texinfo/tp TODO Texinfo/Parser.pm t/06columnfra... |
|
Date: |
Sun, 17 Oct 2010 16:08:35 +0000 |
CVSROOT: /sources/texinfo
Module name: texinfo
Changes by: Patrice Dumas <pertusus> 10/10/17 16:08:35
Modified files:
tp : TODO
tp/Texinfo : Parser.pm
tp/t : 06columnfractions.t
tp/t/results/coverage: commands.pl
Added files:
tp/t/results/columnfractions: out_of_multitable.pl
something_before_columnfractions.pl
Log message:
Warn if @columnfraction outside of @multitable line.
CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/TODO?cvsroot=texinfo&r1=1.19&r2=1.20
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/Texinfo/Parser.pm?cvsroot=texinfo&r1=1.75&r2=1.76
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/06columnfractions.t?cvsroot=texinfo&r1=1.10&r2=1.11
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/columnfractions/out_of_multitable.pl?cvsroot=texinfo&rev=1.1
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/columnfractions/something_before_columnfractions.pl?cvsroot=texinfo&rev=1.1
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/coverage/commands.pl?cvsroot=texinfo&r1=1.10&r2=1.11
Patches:
Index: TODO
===================================================================
RCS file: /sources/texinfo/texinfo/tp/TODO,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -b -r1.19 -r1.20
--- TODO 17 Oct 2010 15:51:31 -0000 1.19
+++ TODO 17 Oct 2010 16:08:34 -0000 1.20
@@ -18,8 +18,9 @@
test invalid, especially commands not closed/bad nesting
test root_commands, like nodes and sections
-Test for @columnfractions in a random place and something like
address@hidden aaa @columnfractions 0.3 0.7
+
+Error message if block or line misc at-command on a
+block command or misc @-command line
t/results/macro/macro_in_misc_commands.pl
some spaces are not counted as empty_spaces_after_command.
Index: Texinfo/Parser.pm
===================================================================
RCS file: /sources/texinfo/texinfo/tp/Texinfo/Parser.pm,v
retrieving revision 1.75
retrieving revision 1.76
diff -u -b -r1.75 -r1.76
--- Texinfo/Parser.pm 17 Oct 2010 15:51:31 -0000 1.75
+++ Texinfo/Parser.pm 17 Oct 2010 16:08:34 -0000 1.76
@@ -1362,7 +1362,8 @@
# in a multitable, we are in a block_line_arg
if (!$current->{'parent'} or !$current->{'parent'}->{'cmdname'}
or $current->{'parent'}->{'cmdname'} ne 'multitable') {
- # FIXME error message
+ _line_error ($self, sprintf($self->__("address@hidden only meaningful
on a address@hidden line"),
+ $command), $line_nr);
} else {
$current = $current->{'parent'};
$current->{'special'}->{'max_columns'} = 0;
Index: t/06columnfractions.t
===================================================================
RCS file: /sources/texinfo/texinfo/tp/t/06columnfractions.t,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -b -r1.10 -r1.11
--- t/06columnfractions.t 17 Oct 2010 10:50:45 -0000 1.10
+++ t/06columnfractions.t 17 Oct 2010 16:08:34 -0000 1.11
@@ -17,6 +17,9 @@
[ 'empty_comment', '@multitable @columnfractions @c
@end multitable' ],
[ 'wrong_command', '@multitable @columnfractions @b{3.4}
address@hidden multitable' ],
+[ 'out_of_multitable', '@columnfractions 0.6 0.4 aaa' ],
+[ 'something_before_columnfractions', '@multitable aaa @columnfractions 0.3 0.7
@end multitable' ]
);
Index: t/results/coverage/commands.pl
===================================================================
RCS file: /sources/texinfo/texinfo/tp/t/results/coverage/commands.pl,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -b -r1.10 -r1.11
--- t/results/coverage/commands.pl 17 Oct 2010 10:50:46 -0000 1.10
+++ t/results/coverage/commands.pl 17 Oct 2010 16:08:34 -0000 1.11
@@ -130,6 +130,52 @@
'contents' => [
{
'parent' => {},
+ 'text' => 'File '
+ },
+ {
+ 'args' => [
+ {
+ 'contents' => [],
+ 'parent' => {},
+ 'type' => 'brace_command_arg'
+ }
+ ],
+ 'cmdname' => 'click',
+ 'contents' => [],
+ 'parent' => {},
+ 'special' => {
+ 'clickstyle' => 'arrow'
+ }
+ },
+ {
+ 'parent' => {},
+ 'text' => ' Open'
+ }
+ ],
+ 'parent' => {},
+ 'type' => 'brace_command_arg'
+ }
+ ],
+ 'cmdname' => 'clicksequence',
+ 'contents' => [],
+ 'parent' => {},
+ 'remaining_args' => 0
+ },
+ {
+ 'cmdname' => '.',
+ 'parent' => {}
+ },
+ {
+ 'parent' => {},
+ 'text' => '
+'
+ },
+ {
+ 'args' => [
+ {
+ 'contents' => [
+ {
+ 'parent' => {},
'text' => 'a'
}
],
@@ -284,11 +330,19 @@
$result_trees{'commands'}{'contents'}[0]{'contents'}[11]{'parent'} =
$result_trees{'commands'}{'contents'}[0];
$result_trees{'commands'}{'contents'}[0]{'contents'}[12]{'parent'} =
$result_trees{'commands'}{'contents'}[0];
$result_trees{'commands'}{'contents'}[0]{'contents'}[13]{'args'}[0]{'contents'}[0]{'parent'}
= $result_trees{'commands'}{'contents'}[0]{'contents'}[13]{'args'}[0];
+$result_trees{'commands'}{'contents'}[0]{'contents'}[13]{'args'}[0]{'contents'}[1]{'args'}[0]{'parent'}
=
$result_trees{'commands'}{'contents'}[0]{'contents'}[13]{'args'}[0]{'contents'}[1];
+$result_trees{'commands'}{'contents'}[0]{'contents'}[13]{'args'}[0]{'contents'}[1]{'parent'}
= $result_trees{'commands'}{'contents'}[0]{'contents'}[13]{'args'}[0];
+$result_trees{'commands'}{'contents'}[0]{'contents'}[13]{'args'}[0]{'contents'}[2]{'parent'}
= $result_trees{'commands'}{'contents'}[0]{'contents'}[13]{'args'}[0];
$result_trees{'commands'}{'contents'}[0]{'contents'}[13]{'args'}[0]{'parent'}
= $result_trees{'commands'}{'contents'}[0]{'contents'}[13];
-$result_trees{'commands'}{'contents'}[0]{'contents'}[13]{'args'}[1]{'contents'}[1]{'parent'}
= $result_trees{'commands'}{'contents'}[0]{'contents'}[13]{'args'}[1];
-$result_trees{'commands'}{'contents'}[0]{'contents'}[13]{'args'}[1]{'parent'}
= $result_trees{'commands'}{'contents'}[0]{'contents'}[13];
$result_trees{'commands'}{'contents'}[0]{'contents'}[13]{'parent'} =
$result_trees{'commands'}{'contents'}[0];
$result_trees{'commands'}{'contents'}[0]{'contents'}[14]{'parent'} =
$result_trees{'commands'}{'contents'}[0];
+$result_trees{'commands'}{'contents'}[0]{'contents'}[15]{'parent'} =
$result_trees{'commands'}{'contents'}[0];
+$result_trees{'commands'}{'contents'}[0]{'contents'}[16]{'args'}[0]{'contents'}[0]{'parent'}
= $result_trees{'commands'}{'contents'}[0]{'contents'}[16]{'args'}[0];
+$result_trees{'commands'}{'contents'}[0]{'contents'}[16]{'args'}[0]{'parent'}
= $result_trees{'commands'}{'contents'}[0]{'contents'}[16];
+$result_trees{'commands'}{'contents'}[0]{'contents'}[16]{'args'}[1]{'contents'}[1]{'parent'}
= $result_trees{'commands'}{'contents'}[0]{'contents'}[16]{'args'}[1];
+$result_trees{'commands'}{'contents'}[0]{'contents'}[16]{'args'}[1]{'parent'}
= $result_trees{'commands'}{'contents'}[0]{'contents'}[16];
+$result_trees{'commands'}{'contents'}[0]{'contents'}[16]{'parent'} =
$result_trees{'commands'}{'contents'}[0];
+$result_trees{'commands'}{'contents'}[0]{'contents'}[17]{'parent'} =
$result_trees{'commands'}{'contents'}[0];
$result_trees{'commands'}{'contents'}[0]{'parent'} = $result_trees{'commands'};
$result_trees{'commands'}{'contents'}[1]{'parent'} = $result_trees{'commands'};
$result_trees{'commands'}{'contents'}[2]{'args'}[0]{'contents'}[0]{'parent'} =
$result_trees{'commands'}{'contents'}[2]{'args'}[0];
@@ -310,6 +364,7 @@
$result_texis{'commands'} = '@@ @TeX{} @
@"e @address@hidden @~{a} @ringaccent a
address@hidden @click{} address@hidden
@email{a, b}
@cindex index entry in text @LaTeX{}
@@ -319,6 +374,7 @@
$result_texts{'commands'} = '@ TeX e" i^ a~ a*
+File -> Open.
b
Index: t/results/columnfractions/out_of_multitable.pl
===================================================================
RCS file: t/results/columnfractions/out_of_multitable.pl
diff -N t/results/columnfractions/out_of_multitable.pl
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ t/results/columnfractions/out_of_multitable.pl 17 Oct 2010 16:08:34
-0000 1.1
@@ -0,0 +1,65 @@
+use vars qw(%result_texis %result_texts %result_trees %result_errors);
+
+$result_trees{'out_of_multitable'} = {
+ 'contents' => [
+ {
+ 'args' => [
+ {
+ 'contents' => [
+ {
+ 'parent' => {},
+ 'text' => ' ',
+ 'type' => 'empty_spaces_after_command'
+ },
+ {
+ 'parent' => {},
+ 'text' => '0.6 0.4 aaa'
+ }
+ ],
+ 'parent' => {},
+ 'type' => 'misc_line_arg'
+ }
+ ],
+ 'cmdname' => 'columnfractions',
+ 'parent' => {},
+ 'special' => {
+ 'misc_args' => [
+ '0.6',
+ '0.4'
+ ]
+ }
+ }
+ ]
+};
+$result_trees{'out_of_multitable'}{'contents'}[0]{'args'}[0]{'contents'}[0]{'parent'}
= $result_trees{'out_of_multitable'}{'contents'}[0]{'args'}[0];
+$result_trees{'out_of_multitable'}{'contents'}[0]{'args'}[0]{'contents'}[1]{'parent'}
= $result_trees{'out_of_multitable'}{'contents'}[0]{'args'}[0];
+$result_trees{'out_of_multitable'}{'contents'}[0]{'args'}[0]{'parent'} =
$result_trees{'out_of_multitable'}{'contents'}[0];
+$result_trees{'out_of_multitable'}{'contents'}[0]{'parent'} =
$result_trees{'out_of_multitable'};
+
+$result_texis{'out_of_multitable'} = '@columnfractions 0.6 0.4 aaa';
+
+
+$result_texts{'out_of_multitable'} = '';
+
+$result_errors{'out_of_multitable'} = [
+ {
+ 'error_line' => ':1: column fraction not a number: aaa
+',
+ 'file_name' => '',
+ 'line_nr' => 1,
+ 'macro' => '',
+ 'text' => 'column fraction not a number: aaa',
+ 'type' => 'error'
+ },
+ {
+ 'error_line' => ':1: @columnfractions only meaningful on a @multitable line
+',
+ 'file_name' => '',
+ 'line_nr' => 1,
+ 'macro' => '',
+ 'text' => '@columnfractions only meaningful on a @multitable line',
+ 'type' => 'error'
+ }
+];
+
+
Index: t/results/columnfractions/something_before_columnfractions.pl
===================================================================
RCS file: t/results/columnfractions/something_before_columnfractions.pl
diff -N t/results/columnfractions/something_before_columnfractions.pl
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ t/results/columnfractions/something_before_columnfractions.pl 17 Oct
2010 16:08:34 -0000 1.1
@@ -0,0 +1,84 @@
+use vars qw(%result_texis %result_texts %result_trees %result_errors);
+
+$result_trees{'something_before_columnfractions'} = {
+ 'contents' => [
+ {
+ 'args' => [
+ {
+ 'contents' => [
+ {
+ 'parent' => {},
+ 'text' => ' aaa '
+ },
+ {
+ 'args' => [
+ {
+ 'contents' => [
+ {
+ 'parent' => {},
+ 'text' => ' ',
+ 'type' => 'empty_spaces_after_command'
+ },
+ {
+ 'parent' => {},
+ 'text' => '0.3 0.7
+'
+ }
+ ],
+ 'parent' => {},
+ 'type' => 'misc_line_arg'
+ }
+ ],
+ 'cmdname' => 'columnfractions',
+ 'parent' => {},
+ 'special' => {
+ 'misc_args' => [
+ '0.3',
+ '0.7'
+ ]
+ }
+ }
+ ],
+ 'parent' => {},
+ 'type' => 'block_line_arg'
+ }
+ ],
+ 'cmdname' => 'multitable',
+ 'contents' => [
+ {
+ 'contents' => [],
+ 'parent' => {},
+ 'type' => 'before_item'
+ }
+ ],
+ 'parent' => {},
+ 'special' => {
+ 'max_columns' => 2
+ }
+ },
+ {
+ 'parent' => {},
+ 'text' => '',
+ 'type' => 'empty_line_after_command'
+ }
+ ]
+};
+$result_trees{'something_before_columnfractions'}{'contents'}[0]{'args'}[0]{'contents'}[0]{'parent'}
= $result_trees{'something_before_columnfractions'}{'contents'}[0]{'args'}[0];
+$result_trees{'something_before_columnfractions'}{'contents'}[0]{'args'}[0]{'contents'}[1]{'args'}[0]{'contents'}[0]{'parent'}
=
$result_trees{'something_before_columnfractions'}{'contents'}[0]{'args'}[0]{'contents'}[1]{'args'}[0];
+$result_trees{'something_before_columnfractions'}{'contents'}[0]{'args'}[0]{'contents'}[1]{'args'}[0]{'contents'}[1]{'parent'}
=
$result_trees{'something_before_columnfractions'}{'contents'}[0]{'args'}[0]{'contents'}[1]{'args'}[0];
+$result_trees{'something_before_columnfractions'}{'contents'}[0]{'args'}[0]{'contents'}[1]{'args'}[0]{'parent'}
=
$result_trees{'something_before_columnfractions'}{'contents'}[0]{'args'}[0]{'contents'}[1];
+$result_trees{'something_before_columnfractions'}{'contents'}[0]{'args'}[0]{'contents'}[1]{'parent'}
= $result_trees{'something_before_columnfractions'}{'contents'}[0]{'args'}[0];
+$result_trees{'something_before_columnfractions'}{'contents'}[0]{'args'}[0]{'parent'}
= $result_trees{'something_before_columnfractions'}{'contents'}[0];
+$result_trees{'something_before_columnfractions'}{'contents'}[0]{'contents'}[0]{'parent'}
= $result_trees{'something_before_columnfractions'}{'contents'}[0];
+$result_trees{'something_before_columnfractions'}{'contents'}[0]{'parent'} =
$result_trees{'something_before_columnfractions'};
+$result_trees{'something_before_columnfractions'}{'contents'}[1]{'parent'} =
$result_trees{'something_before_columnfractions'};
+
+$result_texis{'something_before_columnfractions'} = '@multitable aaa
@columnfractions 0.3 0.7
address@hidden multitable';
+
+
+$result_texts{'something_before_columnfractions'} = '';
+
+$result_errors{'something_before_columnfractions'} = [];
+
+