[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
texinfo/tp Texinfo/Parser.pm t/19def.t t/result...
|
From: |
Patrice Dumas |
|
Subject: |
texinfo/tp Texinfo/Parser.pm t/19def.t t/result... |
|
Date: |
Sat, 27 Nov 2010 11:22:33 +0000 |
CVSROOT: /sources/texinfo
Module name: texinfo
Changes by: Patrice Dumas <pertusus> 10/11/27 11:22:32
Modified files:
tp/Texinfo : Parser.pm
tp/t : 19def.t
tp/t/results/def: empty_def_arguments.pl protected_brace.pl
Log message:
Don't enter definition index entry when there is no name.
CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/Texinfo/Parser.pm?cvsroot=texinfo&r1=1.159&r2=1.160
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/19def.t?cvsroot=texinfo&r1=1.7&r2=1.8
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/def/empty_def_arguments.pl?cvsroot=texinfo&r1=1.11&r2=1.12
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/def/protected_brace.pl?cvsroot=texinfo&r1=1.3&r2=1.4
Patches:
Index: Texinfo/Parser.pm
===================================================================
RCS file: /sources/texinfo/texinfo/tp/Texinfo/Parser.pm,v
retrieving revision 1.159
retrieving revision 1.160
diff -u -b -r1.159 -r1.160
--- Texinfo/Parser.pm 27 Nov 2010 10:55:15 -0000 1.159
+++ Texinfo/Parser.pm 27 Nov 2010 11:22:32 -0000 1.160
@@ -1797,7 +1797,8 @@
$def_parsed_hash->{$arg->[0]} = $arg->[1];
}
$current->{'parent'}->{'extra'}->{'def_parsed_hash'} = $def_parsed_hash;
- #my $index_entry = $def_parsed_hash->{'name'};
+ my $index_entry = $def_parsed_hash->{'name'};
+ if (defined($index_entry)) {
#if ($def_parsed_hash->{'class'}) {
# if ($command_index_prefix{$current->{'parent'}->{'cmdname'}} eq 'f') {
# $index_entry = $self->gdt('{name} on {class}',
@@ -1814,6 +1815,7 @@
$current->{'parent'}, $arguments);
#$current->{'parent'}, $index_entry->{'contents'});
}
+ }
$current = $current->{'parent'}->{'parent'};
# other block command lines
Index: t/19def.t
===================================================================
RCS file: /sources/texinfo/texinfo/tp/t/19def.t,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -b -r1.7 -r1.8
--- t/19def.t 11 Nov 2010 15:15:42 -0000 1.7
+++ t/19def.t 27 Nov 2010 11:22:32 -0000 1.8
@@ -92,38 +92,11 @@
@deffnx empty deffnx
@end deffn
'],
-['def_defx_mismatch',
-'@defun {my def} args @var{arg} @dots{}
address@hidden {type} {name} and now the args
-
-In defun.
-
address@hidden defun
-'],
['defx_after_comment',
'@deffn fset @var{i} a g
@c comment
@deffnx {truc} bidulr machin...
@end deffn'],
-['defx_after_text',
-'@deffn fset @var{i} a g
-Text in deffn
address@hidden {truc} bidulr machin...
address@hidden deffn'],
-['defx_after_empty_line',
-'@deffn fset @var{i} a g
-
address@hidden {truc} bidulr machin...
address@hidden deffn'],
-['defx_after_paragraph_end',
-'@deffn fset @var{i} a g
-Text in paragraph.
-
address@hidden {truc} bidulr machin...
address@hidden deffn'],
-['end_of_line_protect_at_end',
-'
address@hidden category2 deffn_name2 arguments2 @'],
['end_of_lines_protected_in_footnote',
'@footnote{
@deffn category deffn_name arguments arg2 @
@@ -134,24 +107,6 @@
@end deffn
}
'],
-# the command with type is compared with the corresponding command without type
-['empty_deftype',
-'@deftypefun {} f (const type& x)
-Deftypefun.
address@hidden deftypefun
-
address@hidden f (const type& x)
-Defun.
address@hidden defun
-
address@hidden c {} f (const type& x)
-Deftypemethod.
address@hidden deftypemethod
-
address@hidden c f (const type& x)
-Defmethod.
address@hidden defmethod
-'],
['all_commands_delimiters',
'@deffn Command @var{forward--char} @var{nchars} {argument2} {argument3} @
(arg in brace, [something @var{in v--ar}, @b{in, b} {, comma}
address@hidden p]) last
@@ -304,6 +259,58 @@
@deftypefn {var then code} {ret_type1} {fun_name1} @var{A1} @code{A2} @var{A3}
@code{A4}
@end deftypefn
'],
+['protected_brace',
+'@deffn c @{
address@hidden deffn
+'],
+);
+
+my @test_invalid = (
+['def_defx_mismatch',
+'@defun {my def} args @var{arg} @dots{}
address@hidden {type} {name} and now the args
+
+In defun.
+
address@hidden defun
+'],
+['defx_after_text',
+'@deffn fset @var{i} a g
+Text in deffn
address@hidden {truc} bidulr machin...
address@hidden deffn'],
+['defx_after_empty_line',
+'@deffn fset @var{i} a g
+
address@hidden {truc} bidulr machin...
address@hidden deffn'],
+['defx_after_paragraph_end',
+'@deffn fset @var{i} a g
+Text in paragraph.
+
address@hidden {truc} bidulr machin...
address@hidden deffn'],
+['end_of_line_protect_at_end',
+'
address@hidden category2 deffn_name2 arguments2 @'],
+# the command with type is compared with the corresponding command without type
+['empty_deftype',
+'@deftypefun {} f (const type& x)
+Deftypefun.
address@hidden deftypefun
+
address@hidden f (const type& x)
+Defun.
address@hidden defun
+
address@hidden c {} f (const type& x)
+Deftypemethod.
address@hidden deftypemethod
+
address@hidden c f (const type& x)
+Defmethod.
address@hidden defmethod
+'],
['wrong_braces_simple',
'@deffn truc machin bidule chose and }
@end deffn
@@ -335,10 +342,6 @@
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}
@@ -401,6 +404,6 @@
our ($arg_test_case, $arg_generate, $arg_debug);
-run_all ('def', address@hidden, $arg_test_case,
+run_all ('def', address@hidden, @test_invalid], $arg_test_case,
$arg_generate, $arg_debug);
Index: t/results/def/empty_def_arguments.pl
===================================================================
RCS file: /sources/texinfo/texinfo/tp/t/results/def/empty_def_arguments.pl,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -b -r1.11 -r1.12
--- t/results/def/empty_def_arguments.pl 27 Nov 2010 10:55:16 -0000
1.11
+++ t/results/def/empty_def_arguments.pl 27 Nov 2010 11:22:32 -0000
1.12
@@ -178,14 +178,6 @@
'def_command' => 'deffn',
'def_parsed_hash' => {
'category' => {}
- },
- 'index_entry' => {
- 'command' => {},
- 'content' => [],
- 'def' => 1,
- 'index_at_command' => 'deffn',
- 'index_name' => 'fn',
- 'index_prefix' => 'f'
}
},
'line_nr' => {
@@ -255,14 +247,6 @@
'def_command' => 'deffn',
'def_parsed_hash' => {
'category' => {}
- },
- 'index_entry' => {
- 'command' => {},
- 'content' => [],
- 'def' => 1,
- 'index_at_command' => 'deffn',
- 'index_name' => 'fn',
- 'index_prefix' => 'f'
}
},
'line_nr' => {
@@ -377,14 +361,6 @@
'def_command' => 'deffn',
'def_parsed_hash' => {
'category' => {}
- },
- 'index_entry' => {
- 'command' => {},
- 'content' => [],
- 'def' => 1,
- 'index_at_command' => 'deffn',
- 'index_name' => 'fn',
- 'index_prefix' => 'f'
}
},
'line_nr' => {
@@ -509,14 +485,6 @@
'def_command' => 'deffn',
'def_parsed_hash' => {
'category' => {}
- },
- 'index_entry' => {
- 'command' => {},
- 'content' => [],
- 'def' => 1,
- 'index_at_command' => 'deffn',
- 'index_name' => 'fn',
- 'index_prefix' => 'f'
}
},
'line_nr' => {
@@ -633,8 +601,6 @@
$result_trees{'empty_def_arguments'}{'contents'}[0]{'contents'}[1]{'args'}[0]{'parent'}
= $result_trees{'empty_def_arguments'}{'contents'}[0]{'contents'}[1];
$result_trees{'empty_def_arguments'}{'contents'}[0]{'contents'}[1]{'extra'}{'def_args'}[0][1]
=
$result_trees{'empty_def_arguments'}{'contents'}[0]{'contents'}[1]{'args'}[0]{'contents'}[1];
$result_trees{'empty_def_arguments'}{'contents'}[0]{'contents'}[1]{'extra'}{'def_parsed_hash'}{'category'}
=
$result_trees{'empty_def_arguments'}{'contents'}[0]{'contents'}[1]{'args'}[0]{'contents'}[1];
-$result_trees{'empty_def_arguments'}{'contents'}[0]{'contents'}[1]{'extra'}{'index_entry'}{'command'}
= $result_trees{'empty_def_arguments'}{'contents'}[0]{'contents'}[1];
-$result_trees{'empty_def_arguments'}{'contents'}[0]{'contents'}[1]{'extra'}{'index_entry'}{'content'}
=
$result_trees{'empty_def_arguments'}{'contents'}[0]{'contents'}[1]{'extra'}{'def_args'};
$result_trees{'empty_def_arguments'}{'contents'}[0]{'contents'}[1]{'parent'} =
$result_trees{'empty_def_arguments'}{'contents'}[0];
$result_trees{'empty_def_arguments'}{'contents'}[0]{'contents'}[2]{'args'}[0]{'contents'}[0]{'parent'}
=
$result_trees{'empty_def_arguments'}{'contents'}[0]{'contents'}[2]{'args'}[0];
$result_trees{'empty_def_arguments'}{'contents'}[0]{'contents'}[2]{'args'}[0]{'parent'}
= $result_trees{'empty_def_arguments'}{'contents'}[0]{'contents'}[2];
@@ -643,8 +609,6 @@
$result_trees{'empty_def_arguments'}{'contents'}[0]{'contents'}[3]{'args'}[0]{'contents'}[1]{'parent'}
=
$result_trees{'empty_def_arguments'}{'contents'}[0]{'contents'}[3]{'args'}[0];
$result_trees{'empty_def_arguments'}{'contents'}[0]{'contents'}[3]{'args'}[0]{'parent'}
= $result_trees{'empty_def_arguments'}{'contents'}[0]{'contents'}[3];
$result_trees{'empty_def_arguments'}{'contents'}[0]{'contents'}[3]{'extra'}{'def_parsed_hash'}{'category'}
=
$result_trees{'empty_def_arguments'}{'contents'}[0]{'contents'}[3]{'extra'}{'def_args'}[0][1];
-$result_trees{'empty_def_arguments'}{'contents'}[0]{'contents'}[3]{'extra'}{'index_entry'}{'command'}
= $result_trees{'empty_def_arguments'}{'contents'}[0]{'contents'}[3];
-$result_trees{'empty_def_arguments'}{'contents'}[0]{'contents'}[3]{'extra'}{'index_entry'}{'content'}
=
$result_trees{'empty_def_arguments'}{'contents'}[0]{'contents'}[3]{'extra'}{'def_args'};
$result_trees{'empty_def_arguments'}{'contents'}[0]{'contents'}[3]{'parent'} =
$result_trees{'empty_def_arguments'}{'contents'}[0];
$result_trees{'empty_def_arguments'}{'contents'}[0]{'contents'}[4]{'args'}[0]{'contents'}[0]{'parent'}
=
$result_trees{'empty_def_arguments'}{'contents'}[0]{'contents'}[4]{'args'}[0];
$result_trees{'empty_def_arguments'}{'contents'}[0]{'contents'}[4]{'args'}[0]{'contents'}[1]{'parent'}
=
$result_trees{'empty_def_arguments'}{'contents'}[0]{'contents'}[4]{'args'}[0];
@@ -664,8 +628,6 @@
$result_trees{'empty_def_arguments'}{'contents'}[0]{'contents'}[5]{'args'}[0]{'parent'}
= $result_trees{'empty_def_arguments'}{'contents'}[0]{'contents'}[5];
$result_trees{'empty_def_arguments'}{'contents'}[0]{'contents'}[5]{'extra'}{'def_args'}[0][1]
=
$result_trees{'empty_def_arguments'}{'contents'}[0]{'contents'}[5]{'args'}[0]{'contents'}[0];
$result_trees{'empty_def_arguments'}{'contents'}[0]{'contents'}[5]{'extra'}{'def_parsed_hash'}{'category'}
=
$result_trees{'empty_def_arguments'}{'contents'}[0]{'contents'}[5]{'args'}[0]{'contents'}[0];
-$result_trees{'empty_def_arguments'}{'contents'}[0]{'contents'}[5]{'extra'}{'index_entry'}{'command'}
= $result_trees{'empty_def_arguments'}{'contents'}[0]{'contents'}[5];
-$result_trees{'empty_def_arguments'}{'contents'}[0]{'contents'}[5]{'extra'}{'index_entry'}{'content'}
=
$result_trees{'empty_def_arguments'}{'contents'}[0]{'contents'}[5]{'extra'}{'def_args'};
$result_trees{'empty_def_arguments'}{'contents'}[0]{'contents'}[5]{'parent'} =
$result_trees{'empty_def_arguments'}{'contents'}[0];
$result_trees{'empty_def_arguments'}{'contents'}[0]{'contents'}[6]{'args'}[0]{'contents'}[0]{'contents'}[0]{'parent'}
=
$result_trees{'empty_def_arguments'}{'contents'}[0]{'contents'}[6]{'args'}[0]{'contents'}[0];
$result_trees{'empty_def_arguments'}{'contents'}[0]{'contents'}[6]{'args'}[0]{'contents'}[0]{'parent'}
=
$result_trees{'empty_def_arguments'}{'contents'}[0]{'contents'}[6]{'args'}[0];
@@ -687,8 +649,6 @@
$result_trees{'empty_def_arguments'}{'contents'}[0]{'contents'}[7]{'args'}[0]{'parent'}
= $result_trees{'empty_def_arguments'}{'contents'}[0]{'contents'}[7];
$result_trees{'empty_def_arguments'}{'contents'}[0]{'contents'}[7]{'extra'}{'def_args'}[0][1]
=
$result_trees{'empty_def_arguments'}{'contents'}[0]{'contents'}[7]{'args'}[0]{'contents'}[0];
$result_trees{'empty_def_arguments'}{'contents'}[0]{'contents'}[7]{'extra'}{'def_parsed_hash'}{'category'}
=
$result_trees{'empty_def_arguments'}{'contents'}[0]{'contents'}[7]{'args'}[0]{'contents'}[0];
-$result_trees{'empty_def_arguments'}{'contents'}[0]{'contents'}[7]{'extra'}{'index_entry'}{'command'}
= $result_trees{'empty_def_arguments'}{'contents'}[0]{'contents'}[7];
-$result_trees{'empty_def_arguments'}{'contents'}[0]{'contents'}[7]{'extra'}{'index_entry'}{'content'}
=
$result_trees{'empty_def_arguments'}{'contents'}[0]{'contents'}[7]{'extra'}{'def_args'};
$result_trees{'empty_def_arguments'}{'contents'}[0]{'contents'}[7]{'parent'} =
$result_trees{'empty_def_arguments'}{'contents'}[0];
$result_trees{'empty_def_arguments'}{'contents'}[0]{'contents'}[8]{'args'}[0]{'contents'}[0]{'parent'}
=
$result_trees{'empty_def_arguments'}{'contents'}[0]{'contents'}[8]{'args'}[0];
$result_trees{'empty_def_arguments'}{'contents'}[0]{'contents'}[8]{'args'}[0]{'contents'}[1]{'parent'}
=
$result_trees{'empty_def_arguments'}{'contents'}[0]{'contents'}[8]{'args'}[0];
Index: t/results/def/protected_brace.pl
===================================================================
RCS file: /sources/texinfo/texinfo/tp/t/results/def/protected_brace.pl,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -b -r1.3 -r1.4
--- t/results/def/protected_brace.pl 27 Nov 2010 10:55:21 -0000 1.3
+++ t/results/def/protected_brace.pl 27 Nov 2010 11:22:32 -0000 1.4
@@ -17,6 +17,10 @@
'type' => 'empty_spaces_after_command'
},
{
+ 'parent' => {},
+ 'text' => 'c '
+ },
+ {
'cmdname' => '{',
'parent' => {}
},
@@ -34,12 +38,26 @@
'def_args' => [
[
'category',
+ {
+ 'text' => 'c'
+ }
+ ],
+ [
+ 'spaces',
+ {
+ 'text' => ' ',
+ 'type' => 'spaces'
+ }
+ ],
+ [
+ 'name',
{}
]
],
'def_command' => 'deffn',
'def_parsed_hash' => {
- 'category' => {}
+ 'category' => {},
+ 'name' => {}
},
'index_entry' => {
'command' => {},
@@ -68,21 +86,23 @@
$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]{'contents'}[3]{'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'}{'def_parsed_hash'}{'category'}
=
$result_trees{'protected_brace'}{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[1];
+$result_trees{'protected_brace'}{'contents'}[0]{'contents'}[0]{'extra'}{'def_args'}[2][1]
=
$result_trees{'protected_brace'}{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[2];
+$result_trees{'protected_brace'}{'contents'}[0]{'contents'}[0]{'extra'}{'def_parsed_hash'}{'category'}
=
$result_trees{'protected_brace'}{'contents'}[0]{'contents'}[0]{'extra'}{'def_args'}[0][1];
+$result_trees{'protected_brace'}{'contents'}[0]{'contents'}[0]{'extra'}{'def_parsed_hash'}{'name'}
=
$result_trees{'protected_brace'}{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[2];
$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 @{
+$result_texis{'protected_brace'} = '@deffn c @{
@end deffn
';
-$result_texts{'protected_brace'} = '{
+$result_texts{'protected_brace'} = 'c {
';
$result_errors{'protected_brace'} = [];
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- texinfo/tp Texinfo/Parser.pm t/19def.t t/result...,
Patrice Dumas <=