[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
texinfo/tp Texinfo/Parser.pm t/60macro.t t/resu...
|
From: |
Patrice Dumas |
|
Subject: |
texinfo/tp Texinfo/Parser.pm t/60macro.t t/resu... |
|
Date: |
Fri, 29 Oct 2010 21:20:49 +0000 |
CVSROOT: /sources/texinfo
Module name: texinfo
Changes by: Patrice Dumas <pertusus> 10/10/29 21:20:49
Modified files:
tp/Texinfo : Parser.pm
tp/t : 60macro.t
tp/t/results/include: macro_and_commands_in_early_commands.pl
macro_definition_in_include.pl
macro_in_early_commands.pl
tp/t/results/macro: arg_body_expansion_order.pl
arg_not_closed.pl bad_argument.pl
bad_formal_arg.pl complete_macro_for_end.pl
complex_argument.pl empty_end.pl
empty_macro.pl empty_macro_in_text_no_arg.pl
expand_two_same.pl expansion_order.pl
ifclear_in_macro.pl ifset_in_macro.pl
ifset_in_macro_set.pl
implicit_quoting_one_arg.pl
implicit_quoting_recursion.pl
macro_expansion.pl macro_for_end.pl
macro_for_ignored_line_command.pl
macro_in_accent.pl macro_in_brace_command.pl
macro_in_end_argument.pl macro_in_ifset.pl
macro_in_ifset_end_in_arg.pl
macro_in_index_commands.pl
macro_in_macro_arg.pl
macro_in_macro_arg_simpler.pl
macro_in_menu.pl macro_in_misc_commands.pl
macro_no_arg_bad_expansion.pl
macro_no_arg_expansion.pl
macro_no_argument.pl macro_not_closed.pl
macro_one_arg_end_of_file.pl macro_zero.pl
nested_macro_call.pl no_macrobody.pl
paragraph_and_macro.pl
protect_comma_macro_line.pl
protect_in_body.pl
protect_in_body_line_arg.pl
protect_in_body_one_arg.pl
simple_imbricated_macro.pl
space_macro_after_end.pl
text_before_after.pl too_much_args.pl
two_macros_on_a_line.pl zero_argument.pl
tp/t/results/raw: nested_macros.pl
tp/t/results/value_and_macro: comma_value_in_macro_arg.pl
macro_in_value.pl
value_in_macro_body.pl
value_in_macro_formal_arg.pl
Added files:
tp/t/results/macro: double_macro_definition.pl
Log message:
Warn if a macro was previously defined.
CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/Texinfo/Parser.pm?cvsroot=texinfo&r1=1.122&r2=1.123
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/60macro.t?cvsroot=texinfo&r1=1.24&r2=1.25
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/include/macro_and_commands_in_early_commands.pl?cvsroot=texinfo&r1=1.12&r2=1.13
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/include/macro_definition_in_include.pl?cvsroot=texinfo&r1=1.5&r2=1.6
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/include/macro_in_early_commands.pl?cvsroot=texinfo&r1=1.11&r2=1.12
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/macro/arg_body_expansion_order.pl?cvsroot=texinfo&r1=1.11&r2=1.12
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/macro/arg_not_closed.pl?cvsroot=texinfo&r1=1.11&r2=1.12
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/macro/bad_argument.pl?cvsroot=texinfo&r1=1.11&r2=1.12
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/macro/bad_formal_arg.pl?cvsroot=texinfo&r1=1.12&r2=1.13
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/macro/complete_macro_for_end.pl?cvsroot=texinfo&r1=1.8&r2=1.9
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/macro/complex_argument.pl?cvsroot=texinfo&r1=1.15&r2=1.16
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/macro/empty_end.pl?cvsroot=texinfo&r1=1.10&r2=1.11
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/macro/empty_macro.pl?cvsroot=texinfo&r1=1.5&r2=1.6
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/macro/empty_macro_in_text_no_arg.pl?cvsroot=texinfo&r1=1.5&r2=1.6
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/macro/expand_two_same.pl?cvsroot=texinfo&r1=1.13&r2=1.14
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/macro/expansion_order.pl?cvsroot=texinfo&r1=1.10&r2=1.11
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/macro/ifclear_in_macro.pl?cvsroot=texinfo&r1=1.10&r2=1.11
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/macro/ifset_in_macro.pl?cvsroot=texinfo&r1=1.10&r2=1.11
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/macro/ifset_in_macro_set.pl?cvsroot=texinfo&r1=1.10&r2=1.11
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/macro/implicit_quoting_one_arg.pl?cvsroot=texinfo&r1=1.12&r2=1.13
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/macro/implicit_quoting_recursion.pl?cvsroot=texinfo&r1=1.10&r2=1.11
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/macro/macro_expansion.pl?cvsroot=texinfo&r1=1.15&r2=1.16
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/macro/macro_for_end.pl?cvsroot=texinfo&r1=1.10&r2=1.11
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/macro/macro_for_ignored_line_command.pl?cvsroot=texinfo&r1=1.5&r2=1.6
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/macro/macro_in_accent.pl?cvsroot=texinfo&r1=1.8&r2=1.9
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/macro/macro_in_brace_command.pl?cvsroot=texinfo&r1=1.14&r2=1.15
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/macro/macro_in_end_argument.pl?cvsroot=texinfo&r1=1.10&r2=1.11
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/macro/macro_in_ifset.pl?cvsroot=texinfo&r1=1.10&r2=1.11
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/macro/macro_in_ifset_end_in_arg.pl?cvsroot=texinfo&r1=1.13&r2=1.14
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/macro/macro_in_index_commands.pl?cvsroot=texinfo&r1=1.14&r2=1.15
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/macro/macro_in_macro_arg.pl?cvsroot=texinfo&r1=1.12&r2=1.13
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/macro/macro_in_macro_arg_simpler.pl?cvsroot=texinfo&r1=1.10&r2=1.11
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/macro/macro_in_menu.pl?cvsroot=texinfo&r1=1.14&r2=1.15
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/macro/macro_in_misc_commands.pl?cvsroot=texinfo&r1=1.20&r2=1.21
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/macro/macro_no_arg_bad_expansion.pl?cvsroot=texinfo&r1=1.10&r2=1.11
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/macro/macro_no_arg_expansion.pl?cvsroot=texinfo&r1=1.10&r2=1.11
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/macro/macro_no_argument.pl?cvsroot=texinfo&r1=1.8&r2=1.9
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/macro/macro_not_closed.pl?cvsroot=texinfo&r1=1.8&r2=1.9
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/macro/macro_one_arg_end_of_file.pl?cvsroot=texinfo&r1=1.8&r2=1.9
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/macro/macro_zero.pl?cvsroot=texinfo&r1=1.11&r2=1.12
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/macro/nested_macro_call.pl?cvsroot=texinfo&r1=1.11&r2=1.12
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/macro/no_macrobody.pl?cvsroot=texinfo&r1=1.13&r2=1.14
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/macro/paragraph_and_macro.pl?cvsroot=texinfo&r1=1.11&r2=1.12
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/macro/protect_comma_macro_line.pl?cvsroot=texinfo&r1=1.10&r2=1.11
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/macro/protect_in_body.pl?cvsroot=texinfo&r1=1.11&r2=1.12
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/macro/protect_in_body_line_arg.pl?cvsroot=texinfo&r1=1.11&r2=1.12
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/macro/protect_in_body_one_arg.pl?cvsroot=texinfo&r1=1.12&r2=1.13
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/macro/simple_imbricated_macro.pl?cvsroot=texinfo&r1=1.5&r2=1.6
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/macro/space_macro_after_end.pl?cvsroot=texinfo&r1=1.8&r2=1.9
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/macro/text_before_after.pl?cvsroot=texinfo&r1=1.11&r2=1.12
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/macro/too_much_args.pl?cvsroot=texinfo&r1=1.11&r2=1.12
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/macro/two_macros_on_a_line.pl?cvsroot=texinfo&r1=1.12&r2=1.13
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/macro/zero_argument.pl?cvsroot=texinfo&r1=1.10&r2=1.11
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/macro/double_macro_definition.pl?cvsroot=texinfo&rev=1.1
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/raw/nested_macros.pl?cvsroot=texinfo&r1=1.13&r2=1.14
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/value_and_macro/comma_value_in_macro_arg.pl?cvsroot=texinfo&r1=1.12&r2=1.13
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/value_and_macro/macro_in_value.pl?cvsroot=texinfo&r1=1.10&r2=1.11
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/value_and_macro/value_in_macro_body.pl?cvsroot=texinfo&r1=1.12&r2=1.13
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/value_and_macro/value_in_macro_formal_arg.pl?cvsroot=texinfo&r1=1.12&r2=1.13
Patches:
Index: Texinfo/Parser.pm
===================================================================
RCS file: /sources/texinfo/texinfo/tp/Texinfo/Parser.pm,v
retrieving revision 1.122
retrieving revision 1.123
diff -u -b -r1.122 -r1.123
--- Texinfo/Parser.pm 29 Oct 2010 19:58:39 -0000 1.122
+++ Texinfo/Parser.pm 29 Oct 2010 21:20:25 -0000 1.123
@@ -1034,7 +1034,7 @@
my $parent = shift;
my $line_nr = shift;
my $macro = { 'cmdname' => $command, 'parent' => $parent, 'contents' => [],
- 'extra' => {'arg_line' => $line} };
+ 'extra' => {'arg_line' => $line}, 'line_nr' => $line_nr };
# REMACRO
if ($line =~ /^\s+([[:alnum:]][[:alnum:]-]*)\s*(.*)/) {
my $macro_name = $1;
@@ -2296,6 +2296,13 @@
$current->{'extra'}->{'macrobody'} =
tree_to_texi({ 'contents' => $current->{'contents'} });
if ($current->{'args'} and $current->{'args'}->[0]) {
+ my $name = $current->{'args'}->[0]->{'text'};
+ if (exists($self->{'macros'}->{$name})) {
+ _line_warn($self, sprintf($self->__("macro `%s' previously
defined"),
+ $name), $current->{'line_nr'});
+ _line_warn($self, sprintf($self->__("here is the previous
definition of `%s'"),
+ $name),
$self->{'macros'}->{$name}->{'line_nr'});
+ }
$self->{'macros'}->{$current->{'args'}->[0]->{'text'}} =
$current;
}
}
Index: t/60macro.t
===================================================================
RCS file: /sources/texinfo/texinfo/tp/t/60macro.t,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -b -r1.24 -r1.25
--- t/60macro.t 23 Oct 2010 15:36:53 -0000 1.24
+++ t/60macro.t 29 Oct 2010 21:20:35 -0000 1.25
@@ -56,6 +56,13 @@
@end macro
@end macro
'],
+['double_macro_definition',
+'@macro foo
address@hidden macro
+
address@hidden foo
address@hidden macro
+'],
['macro_no_arg_expansion',
'@macro test1
res1
Index: t/results/include/macro_and_commands_in_early_commands.pl
===================================================================
RCS file:
/sources/texinfo/texinfo/tp/t/results/include/macro_and_commands_in_early_commands.pl,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -b -r1.12 -r1.13
--- t/results/include/macro_and_commands_in_early_commands.pl 29 Oct 2010
07:25:01 -0000 1.12
+++ t/results/include/macro_and_commands_in_early_commands.pl 29 Oct 2010
21:20:40 -0000 1.13
@@ -27,6 +27,11 @@
'macrobody' => 'macro_i--n_pass@@
'
},
+ 'line_nr' => {
+ 'file_name' => '',
+ 'line_nr' => 1,
+ 'macro' => ''
+ },
'parent' => {}
},
{
@@ -113,6 +118,11 @@
'macrobody' => 'ISO-8859-1@@
'
},
+ 'line_nr' => {
+ 'file_name' => '',
+ 'line_nr' => 7,
+ 'macro' => ''
+ },
'parent' => {}
},
{
@@ -202,6 +212,11 @@
@include inc_@@f--ile.texi
'
},
+ 'line_nr' => {
+ 'file_name' => '',
+ 'line_nr' => 13,
+ 'macro' => ''
+ },
'parent' => {}
},
{
@@ -317,6 +332,11 @@
'macrobody' => 'in themacro
'
},
+ 'line_nr' => {
+ 'file_name' => 't/include//macro_included.texi',
+ 'line_nr' => 2,
+ 'macro' => ''
+ },
'parent' => {}
},
{
Index: t/results/include/macro_definition_in_include.pl
===================================================================
RCS file:
/sources/texinfo/texinfo/tp/t/results/include/macro_definition_in_include.pl,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -b -r1.5 -r1.6
--- t/results/include/macro_definition_in_include.pl 29 Oct 2010 07:11:58
-0000 1.5
+++ t/results/include/macro_definition_in_include.pl 29 Oct 2010 21:20:41
-0000 1.6
@@ -25,6 +25,11 @@
'macrobody' => 'in themacro
'
},
+ 'line_nr' => {
+ 'file_name' => 't/include//macro_included.texi',
+ 'line_nr' => 2,
+ 'macro' => ''
+ },
'parent' => {}
},
{
Index: t/results/include/macro_in_early_commands.pl
===================================================================
RCS file:
/sources/texinfo/texinfo/tp/t/results/include/macro_in_early_commands.pl,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -b -r1.11 -r1.12
--- t/results/include/macro_in_early_commands.pl 29 Oct 2010 07:25:01
-0000 1.11
+++ t/results/include/macro_in_early_commands.pl 29 Oct 2010 21:20:42
-0000 1.12
@@ -27,6 +27,11 @@
'macrobody' => 'macro_in_pass
'
},
+ 'line_nr' => {
+ 'file_name' => '',
+ 'line_nr' => 1,
+ 'macro' => ''
+ },
'parent' => {}
},
{
@@ -66,6 +71,11 @@
'macrobody' => 'texi_commands.\\ext\\
'
},
+ 'line_nr' => {
+ 'file_name' => '',
+ 'line_nr' => 4,
+ 'macro' => ''
+ },
'parent' => {}
},
{
@@ -144,6 +154,11 @@
'macrobody' => 'ISO-8859-1
'
},
+ 'line_nr' => {
+ 'file_name' => '',
+ 'line_nr' => 10,
+ 'macro' => ''
+ },
'parent' => {}
},
{
@@ -181,6 +196,11 @@
'macrobody' => '@documentencoding
'
},
+ 'line_nr' => {
+ 'file_name' => '',
+ 'line_nr' => 14,
+ 'macro' => ''
+ },
'parent' => {}
},
{
@@ -266,6 +286,11 @@
@include inc_file.texi
'
},
+ 'line_nr' => {
+ 'file_name' => '',
+ 'line_nr' => 20,
+ 'macro' => ''
+ },
'parent' => {}
},
{
@@ -381,6 +406,11 @@
'macrobody' => 'in themacro
'
},
+ 'line_nr' => {
+ 'file_name' => 't/include//macro_included.texi',
+ 'line_nr' => 2,
+ 'macro' => ''
+ },
'parent' => {}
},
{
Index: t/results/macro/arg_body_expansion_order.pl
===================================================================
RCS file:
/sources/texinfo/texinfo/tp/t/results/macro/arg_body_expansion_order.pl,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -b -r1.11 -r1.12
--- t/results/macro/arg_body_expansion_order.pl 29 Oct 2010 07:11:59 -0000
1.11
+++ t/results/macro/arg_body_expansion_order.pl 29 Oct 2010 21:20:43 -0000
1.12
@@ -31,6 +31,11 @@
'macrobody' => 'initial
'
},
+ 'line_nr' => {
+ 'file_name' => '',
+ 'line_nr' => 2,
+ 'macro' => ''
+ },
'parent' => {}
},
{
@@ -108,6 +113,11 @@
\\arg\\
'
},
+ 'line_nr' => {
+ 'file_name' => '',
+ 'line_nr' => 6,
+ 'macro' => ''
+ },
'parent' => {}
},
{
@@ -160,6 +170,11 @@
'macrobody' => 'different
'
},
+ 'line_nr' => {
+ 'file_name' => '',
+ 'line_nr' => 14,
+ 'macro' => 'redefineothermacro'
+ },
'parent' => {}
},
{
Index: t/results/macro/arg_not_closed.pl
===================================================================
RCS file: /sources/texinfo/texinfo/tp/t/results/macro/arg_not_closed.pl,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -b -r1.11 -r1.12
--- t/results/macro/arg_not_closed.pl 29 Oct 2010 07:11:59 -0000 1.11
+++ t/results/macro/arg_not_closed.pl 29 Oct 2010 21:20:43 -0000 1.12
@@ -33,6 +33,11 @@
'macrobody' => 'foo
'
},
+ 'line_nr' => {
+ 'file_name' => '',
+ 'line_nr' => 1,
+ 'macro' => ''
+ },
'parent' => {}
},
{
Index: t/results/macro/bad_argument.pl
===================================================================
RCS file: /sources/texinfo/texinfo/tp/t/results/macro/bad_argument.pl,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -b -r1.11 -r1.12
--- t/results/macro/bad_argument.pl 29 Oct 2010 07:11:59 -0000 1.11
+++ t/results/macro/bad_argument.pl 29 Oct 2010 21:20:43 -0000 1.12
@@ -18,6 +18,11 @@
'macrobody' => 'in macro
'
},
+ 'line_nr' => {
+ 'file_name' => '',
+ 'line_nr' => 1,
+ 'macro' => ''
+ },
'parent' => {}
},
{
@@ -55,6 +60,11 @@
'macrobody' => 'in
'
},
+ 'line_nr' => {
+ 'file_name' => '',
+ 'line_nr' => 5,
+ 'macro' => ''
+ },
'parent' => {}
},
{
@@ -100,6 +110,11 @@
'macrobody' => 'in macro
'
},
+ 'line_nr' => {
+ 'file_name' => '',
+ 'line_nr' => 9,
+ 'macro' => ''
+ },
'parent' => {}
},
{
Index: t/results/macro/bad_formal_arg.pl
===================================================================
RCS file: /sources/texinfo/texinfo/tp/t/results/macro/bad_formal_arg.pl,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -b -r1.12 -r1.13
--- t/results/macro/bad_formal_arg.pl 29 Oct 2010 07:11:59 -0000 1.12
+++ t/results/macro/bad_formal_arg.pl 29 Oct 2010 21:20:43 -0000 1.13
@@ -45,6 +45,11 @@
'macrobody' => 'in bad macro
'
},
+ 'line_nr' => {
+ 'file_name' => '',
+ 'line_nr' => 2,
+ 'macro' => ''
+ },
'parent' => {}
},
{
@@ -96,6 +101,11 @@
'macrobody' => 'bad space
'
},
+ 'line_nr' => {
+ 'file_name' => '',
+ 'line_nr' => 6,
+ 'macro' => ''
+ },
'parent' => {}
},
{
@@ -166,6 +176,11 @@
@end macro
'
},
+ 'line_nr' => {
+ 'file_name' => '',
+ 'line_nr' => 10,
+ 'macro' => ''
+ },
'parent' => {}
},
{
Index: t/results/macro/complete_macro_for_end.pl
===================================================================
RCS file:
/sources/texinfo/texinfo/tp/t/results/macro/complete_macro_for_end.pl,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -b -r1.8 -r1.9
--- t/results/macro/complete_macro_for_end.pl 29 Oct 2010 07:11:59 -0000
1.8
+++ t/results/macro/complete_macro_for_end.pl 29 Oct 2010 21:20:43 -0000
1.9
@@ -25,6 +25,11 @@
'macrobody' => '@end cartouche
'
},
+ 'line_nr' => {
+ 'file_name' => '',
+ 'line_nr' => 1,
+ 'macro' => ''
+ },
'parent' => {}
},
{
Index: t/results/macro/complex_argument.pl
===================================================================
RCS file: /sources/texinfo/texinfo/tp/t/results/macro/complex_argument.pl,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -b -r1.15 -r1.16
--- t/results/macro/complex_argument.pl 29 Oct 2010 07:11:59 -0000 1.15
+++ t/results/macro/complex_argument.pl 29 Oct 2010 21:20:43 -0000 1.16
@@ -33,6 +33,11 @@
'macrobody' => 'coucou \\arg\\ after arg
'
},
+ 'line_nr' => {
+ 'file_name' => '',
+ 'line_nr' => 1,
+ 'macro' => ''
+ },
'parent' => {}
},
{
@@ -91,6 +96,11 @@
4
'
},
+ 'line_nr' => {
+ 'file_name' => '',
+ 'line_nr' => 5,
+ 'macro' => ''
+ },
'parent' => {}
},
{
@@ -149,6 +159,11 @@
&&&& \\arg\\
'
},
+ 'line_nr' => {
+ 'file_name' => '',
+ 'line_nr' => 12,
+ 'macro' => ''
+ },
'parent' => {}
},
{
@@ -378,6 +393,11 @@
'macrobody' => '@emph{\\truc\\}
'
},
+ 'line_nr' => {
+ 'file_name' => '',
+ 'line_nr' => 38,
+ 'macro' => 'macro3'
+ },
'parent' => {}
},
{
Index: t/results/macro/empty_end.pl
===================================================================
RCS file: /sources/texinfo/texinfo/tp/t/results/macro/empty_end.pl,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -b -r1.10 -r1.11
--- t/results/macro/empty_end.pl 29 Oct 2010 07:11:59 -0000 1.10
+++ t/results/macro/empty_end.pl 29 Oct 2010 21:20:44 -0000 1.11
@@ -33,6 +33,11 @@
'macrobody' => 'in foo
'
},
+ 'line_nr' => {
+ 'file_name' => '',
+ 'line_nr' => 1,
+ 'macro' => ''
+ },
'parent' => {}
},
{
Index: t/results/macro/empty_macro.pl
===================================================================
RCS file: /sources/texinfo/texinfo/tp/t/results/macro/empty_macro.pl,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -b -r1.5 -r1.6
--- t/results/macro/empty_macro.pl 29 Oct 2010 07:11:59 -0000 1.5
+++ t/results/macro/empty_macro.pl 29 Oct 2010 21:20:44 -0000 1.6
@@ -17,6 +17,11 @@
',
'macrobody' => ''
},
+ 'line_nr' => {
+ 'file_name' => '',
+ 'line_nr' => 1,
+ 'macro' => ''
+ },
'parent' => {}
},
{
Index: t/results/macro/empty_macro_in_text_no_arg.pl
===================================================================
RCS file:
/sources/texinfo/texinfo/tp/t/results/macro/empty_macro_in_text_no_arg.pl,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -b -r1.5 -r1.6
--- t/results/macro/empty_macro_in_text_no_arg.pl 29 Oct 2010 07:11:59
-0000 1.5
+++ t/results/macro/empty_macro_in_text_no_arg.pl 29 Oct 2010 21:20:44
-0000 1.6
@@ -17,6 +17,11 @@
',
'macrobody' => ''
},
+ 'line_nr' => {
+ 'file_name' => '',
+ 'line_nr' => 1,
+ 'macro' => ''
+ },
'parent' => {}
},
{
@@ -67,6 +72,11 @@
',
'macrobody' => ''
},
+ 'line_nr' => {
+ 'file_name' => '',
+ 'line_nr' => 6,
+ 'macro' => ''
+ },
'parent' => {}
},
{
Index: t/results/macro/expand_two_same.pl
===================================================================
RCS file: /sources/texinfo/texinfo/tp/t/results/macro/expand_two_same.pl,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -b -r1.13 -r1.14
--- t/results/macro/expand_two_same.pl 29 Oct 2010 07:11:59 -0000 1.13
+++ t/results/macro/expand_two_same.pl 29 Oct 2010 21:20:44 -0000 1.14
@@ -40,6 +40,11 @@
'
},
+ 'line_nr' => {
+ 'file_name' => '',
+ 'line_nr' => 1,
+ 'macro' => ''
+ },
'parent' => {}
},
{
Index: t/results/macro/expansion_order.pl
===================================================================
RCS file: /sources/texinfo/texinfo/tp/t/results/macro/expansion_order.pl,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -b -r1.10 -r1.11
--- t/results/macro/expansion_order.pl 29 Oct 2010 07:11:59 -0000 1.10
+++ t/results/macro/expansion_order.pl 29 Oct 2010 21:20:44 -0000 1.11
@@ -33,6 +33,11 @@
'macrobody' => '@machin{}
'
},
+ 'line_nr' => {
+ 'file_name' => '',
+ 'line_nr' => 1,
+ 'macro' => ''
+ },
'parent' => {}
},
{
@@ -77,6 +82,11 @@
'
},
+ 'line_nr' => {
+ 'file_name' => '',
+ 'line_nr' => 5,
+ 'macro' => ''
+ },
'parent' => {}
},
{
Index: t/results/macro/ifclear_in_macro.pl
===================================================================
RCS file: /sources/texinfo/texinfo/tp/t/results/macro/ifclear_in_macro.pl,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -b -r1.10 -r1.11
--- t/results/macro/ifclear_in_macro.pl 29 Oct 2010 07:11:59 -0000 1.10
+++ t/results/macro/ifclear_in_macro.pl 29 Oct 2010 21:20:44 -0000 1.11
@@ -47,6 +47,11 @@
@end ifclear
'
},
+ 'line_nr' => {
+ 'file_name' => '',
+ 'line_nr' => 1,
+ 'macro' => ''
+ },
'parent' => {}
},
{
Index: t/results/macro/ifset_in_macro.pl
===================================================================
RCS file: /sources/texinfo/texinfo/tp/t/results/macro/ifset_in_macro.pl,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -b -r1.10 -r1.11
--- t/results/macro/ifset_in_macro.pl 29 Oct 2010 07:11:59 -0000 1.10
+++ t/results/macro/ifset_in_macro.pl 29 Oct 2010 21:20:44 -0000 1.11
@@ -47,6 +47,11 @@
@end ifset
'
},
+ 'line_nr' => {
+ 'file_name' => '',
+ 'line_nr' => 1,
+ 'macro' => ''
+ },
'parent' => {}
},
{
Index: t/results/macro/ifset_in_macro_set.pl
===================================================================
RCS file: /sources/texinfo/texinfo/tp/t/results/macro/ifset_in_macro_set.pl,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -b -r1.10 -r1.11
--- t/results/macro/ifset_in_macro_set.pl 29 Oct 2010 07:11:59 -0000
1.10
+++ t/results/macro/ifset_in_macro_set.pl 29 Oct 2010 21:20:44 -0000
1.11
@@ -47,6 +47,11 @@
@end ifset
'
},
+ 'line_nr' => {
+ 'file_name' => '',
+ 'line_nr' => 1,
+ 'macro' => ''
+ },
'parent' => {}
},
{
Index: t/results/macro/implicit_quoting_one_arg.pl
===================================================================
RCS file:
/sources/texinfo/texinfo/tp/t/results/macro/implicit_quoting_one_arg.pl,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -b -r1.12 -r1.13
--- t/results/macro/implicit_quoting_one_arg.pl 29 Oct 2010 07:11:59 -0000
1.12
+++ t/results/macro/implicit_quoting_one_arg.pl 29 Oct 2010 21:20:44 -0000
1.13
@@ -39,6 +39,11 @@
'macrobody' => '@strong{FIXME: \\a\\}
'
},
+ 'line_nr' => {
+ 'file_name' => '',
+ 'line_nr' => 2,
+ 'macro' => ''
+ },
'parent' => {}
},
{
Index: t/results/macro/implicit_quoting_recursion.pl
===================================================================
RCS file:
/sources/texinfo/texinfo/tp/t/results/macro/implicit_quoting_recursion.pl,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -b -r1.10 -r1.11
--- t/results/macro/implicit_quoting_recursion.pl 29 Oct 2010 07:11:59
-0000 1.10
+++ t/results/macro/implicit_quoting_recursion.pl 29 Oct 2010 21:20:44
-0000 1.11
@@ -39,6 +39,11 @@
'macrobody' => '\\a\\\\b\\
'
},
+ 'line_nr' => {
+ 'file_name' => '',
+ 'line_nr' => 1,
+ 'macro' => ''
+ },
'parent' => {}
},
{
Index: t/results/macro/macro_expansion.pl
===================================================================
RCS file: /sources/texinfo/texinfo/tp/t/results/macro/macro_expansion.pl,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -b -r1.15 -r1.16
--- t/results/macro/macro_expansion.pl 29 Oct 2010 07:11:59 -0000 1.15
+++ t/results/macro/macro_expansion.pl 29 Oct 2010 21:20:45 -0000 1.16
@@ -66,6 +66,11 @@
@end verbatim
'
},
+ 'line_nr' => {
+ 'file_name' => '',
+ 'line_nr' => 2,
+ 'macro' => ''
+ },
'parent' => {}
},
{
Index: t/results/macro/macro_for_end.pl
===================================================================
RCS file: /sources/texinfo/texinfo/tp/t/results/macro/macro_for_end.pl,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -b -r1.10 -r1.11
--- t/results/macro/macro_for_end.pl 29 Oct 2010 07:11:59 -0000 1.10
+++ t/results/macro/macro_for_end.pl 29 Oct 2010 21:20:45 -0000 1.11
@@ -25,6 +25,11 @@
'macrobody' => '@end
'
},
+ 'line_nr' => {
+ 'file_name' => '',
+ 'line_nr' => 1,
+ 'macro' => ''
+ },
'parent' => {}
},
{
Index: t/results/macro/macro_for_ignored_line_command.pl
===================================================================
RCS file:
/sources/texinfo/texinfo/tp/t/results/macro/macro_for_ignored_line_command.pl,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -b -r1.5 -r1.6
--- t/results/macro/macro_for_ignored_line_command.pl 29 Oct 2010 07:11:59
-0000 1.5
+++ t/results/macro/macro_for_ignored_line_command.pl 29 Oct 2010 21:20:45
-0000 1.6
@@ -25,6 +25,11 @@
'macrobody' => '@page
'
},
+ 'line_nr' => {
+ 'file_name' => '',
+ 'line_nr' => 1,
+ 'macro' => ''
+ },
'parent' => {}
},
{
Index: t/results/macro/macro_in_accent.pl
===================================================================
RCS file: /sources/texinfo/texinfo/tp/t/results/macro/macro_in_accent.pl,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -b -r1.8 -r1.9
--- t/results/macro/macro_in_accent.pl 29 Oct 2010 07:11:59 -0000 1.8
+++ t/results/macro/macro_in_accent.pl 29 Oct 2010 21:20:45 -0000 1.9
@@ -25,6 +25,11 @@
'macrobody' => 'a
'
},
+ 'line_nr' => {
+ 'file_name' => '',
+ 'line_nr' => 1,
+ 'macro' => ''
+ },
'parent' => {}
},
{
@@ -62,6 +67,11 @@
'macrobody' => '
'
},
+ 'line_nr' => {
+ 'file_name' => '',
+ 'line_nr' => 5,
+ 'macro' => ''
+ },
'parent' => {}
},
{
Index: t/results/macro/macro_in_brace_command.pl
===================================================================
RCS file:
/sources/texinfo/texinfo/tp/t/results/macro/macro_in_brace_command.pl,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -b -r1.14 -r1.15
--- t/results/macro/macro_in_brace_command.pl 29 Oct 2010 19:31:16 -0000
1.14
+++ t/results/macro/macro_in_brace_command.pl 29 Oct 2010 21:20:45 -0000
1.15
@@ -25,6 +25,11 @@
'macrobody' => 'foo-expansion
'
},
+ 'line_nr' => {
+ 'file_name' => '',
+ 'line_nr' => 1,
+ 'macro' => ''
+ },
'parent' => {}
},
{
@@ -62,6 +67,11 @@
'macrobody' => 'bar-expansion
'
},
+ 'line_nr' => {
+ 'file_name' => '',
+ 'line_nr' => 5,
+ 'macro' => ''
+ },
'parent' => {}
},
{
Index: t/results/macro/macro_in_end_argument.pl
===================================================================
RCS file: /sources/texinfo/texinfo/tp/t/results/macro/macro_in_end_argument.pl,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -b -r1.10 -r1.11
--- t/results/macro/macro_in_end_argument.pl 29 Oct 2010 07:11:59 -0000
1.10
+++ t/results/macro/macro_in_end_argument.pl 29 Oct 2010 21:20:45 -0000
1.11
@@ -25,6 +25,11 @@
'macrobody' => 'cartouche
'
},
+ 'line_nr' => {
+ 'file_name' => '',
+ 'line_nr' => 1,
+ 'macro' => ''
+ },
'parent' => {}
},
{
Index: t/results/macro/macro_in_ifset.pl
===================================================================
RCS file: /sources/texinfo/texinfo/tp/t/results/macro/macro_in_ifset.pl,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -b -r1.10 -r1.11
--- t/results/macro/macro_in_ifset.pl 29 Oct 2010 07:11:59 -0000 1.10
+++ t/results/macro/macro_in_ifset.pl 29 Oct 2010 21:20:45 -0000 1.11
@@ -33,6 +33,11 @@
'macrobody' => '@end ifset
'
},
+ 'line_nr' => {
+ 'file_name' => '',
+ 'line_nr' => 1,
+ 'macro' => ''
+ },
'parent' => {}
},
{
Index: t/results/macro/macro_in_ifset_end_in_arg.pl
===================================================================
RCS file:
/sources/texinfo/texinfo/tp/t/results/macro/macro_in_ifset_end_in_arg.pl,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -b -r1.13 -r1.14
--- t/results/macro/macro_in_ifset_end_in_arg.pl 29 Oct 2010 07:11:59
-0000 1.13
+++ t/results/macro/macro_in_ifset_end_in_arg.pl 29 Oct 2010 21:20:45
-0000 1.14
@@ -33,6 +33,11 @@
'macrobody' => '@end ifset
'
},
+ 'line_nr' => {
+ 'file_name' => '',
+ 'line_nr' => 1,
+ 'macro' => ''
+ },
'parent' => {}
},
{
Index: t/results/macro/macro_in_index_commands.pl
===================================================================
RCS file:
/sources/texinfo/texinfo/tp/t/results/macro/macro_in_index_commands.pl,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -b -r1.14 -r1.15
--- t/results/macro/macro_in_index_commands.pl 26 Oct 2010 19:36:53 -0000
1.14
+++ t/results/macro/macro_in_index_commands.pl 29 Oct 2010 21:20:45 -0000
1.15
@@ -25,6 +25,11 @@
'macrobody' => 'cp
'
},
+ 'line_nr' => {
+ 'file_name' => '',
+ 'line_nr' => 1,
+ 'macro' => ''
+ },
'parent' => {}
},
{
@@ -56,6 +61,11 @@
'macrobody' => 'fn
'
},
+ 'line_nr' => {
+ 'file_name' => '',
+ 'line_nr' => 4,
+ 'macro' => ''
+ },
'parent' => {}
},
{
@@ -87,6 +97,11 @@
'macrobody' => '@syncodeindex
'
},
+ 'line_nr' => {
+ 'file_name' => '',
+ 'line_nr' => 7,
+ 'macro' => ''
+ },
'parent' => {}
},
{
@@ -206,6 +221,11 @@
'macrobody' => 'en
'
},
+ 'line_nr' => {
+ 'file_name' => '',
+ 'line_nr' => 14,
+ 'macro' => ''
+ },
'parent' => {}
},
{
@@ -237,6 +257,11 @@
'macrobody' => '@documentlanguage
'
},
+ 'line_nr' => {
+ 'file_name' => '',
+ 'line_nr' => 17,
+ 'macro' => ''
+ },
'parent' => {}
},
{
@@ -382,6 +407,11 @@
'macrobody' => 'truc
'
},
+ 'line_nr' => {
+ 'file_name' => '',
+ 'line_nr' => 27,
+ 'macro' => ''
+ },
'parent' => {}
},
{
@@ -478,6 +508,11 @@
'macrobody' => '@trucindex
'
},
+ 'line_nr' => {
+ 'file_name' => '',
+ 'line_nr' => 35,
+ 'macro' => ''
+ },
'parent' => {}
},
{
@@ -553,6 +588,11 @@
'macrobody' => 'codeidx
'
},
+ 'line_nr' => {
+ 'file_name' => '',
+ 'line_nr' => 41,
+ 'macro' => ''
+ },
'parent' => {}
},
{
@@ -633,6 +673,11 @@
'macrobody' => 'a @var{index entry} address@hidden'e @address@hidden
'
},
+ 'line_nr' => {
+ 'file_name' => '',
+ 'line_nr' => 47,
+ 'macro' => ''
+ },
'parent' => {}
},
{
Index: t/results/macro/macro_in_macro_arg.pl
===================================================================
RCS file: /sources/texinfo/texinfo/tp/t/results/macro/macro_in_macro_arg.pl,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -b -r1.12 -r1.13
--- t/results/macro/macro_in_macro_arg.pl 29 Oct 2010 07:11:59 -0000
1.12
+++ t/results/macro/macro_in_macro_arg.pl 29 Oct 2010 21:20:46 -0000
1.13
@@ -31,6 +31,11 @@
'macrobody' => 'a, @macro2
'
},
+ 'line_nr' => {
+ 'file_name' => '',
+ 'line_nr' => 2,
+ 'macro' => ''
+ },
'parent' => {}
},
{
@@ -76,6 +81,11 @@
'macrobody' => 'hello \\arg\\ after arg
'
},
+ 'line_nr' => {
+ 'file_name' => '',
+ 'line_nr' => 6,
+ 'macro' => ''
+ },
'parent' => {}
},
{
@@ -134,6 +144,11 @@
&&&& \\arg\\
'
},
+ 'line_nr' => {
+ 'file_name' => '',
+ 'line_nr' => 10,
+ 'macro' => ''
+ },
'parent' => {}
},
{
Index: t/results/macro/macro_in_macro_arg_simpler.pl
===================================================================
RCS file:
/sources/texinfo/texinfo/tp/t/results/macro/macro_in_macro_arg_simpler.pl,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -b -r1.10 -r1.11
--- t/results/macro/macro_in_macro_arg_simpler.pl 29 Oct 2010 07:11:59
-0000 1.10
+++ t/results/macro/macro_in_macro_arg_simpler.pl 29 Oct 2010 21:20:46
-0000 1.11
@@ -25,6 +25,11 @@
'macrobody' => 'a, macro2
'
},
+ 'line_nr' => {
+ 'file_name' => '',
+ 'line_nr' => 1,
+ 'macro' => ''
+ },
'parent' => {}
},
{
@@ -83,6 +88,11 @@
&&&& \\arg\\
'
},
+ 'line_nr' => {
+ 'file_name' => '',
+ 'line_nr' => 5,
+ 'macro' => ''
+ },
'parent' => {}
},
{
Index: t/results/macro/macro_in_menu.pl
===================================================================
RCS file: /sources/texinfo/texinfo/tp/t/results/macro/macro_in_menu.pl,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -b -r1.14 -r1.15
--- t/results/macro/macro_in_menu.pl 29 Oct 2010 07:11:59 -0000 1.14
+++ t/results/macro/macro_in_menu.pl 29 Oct 2010 21:20:46 -0000 1.15
@@ -31,6 +31,11 @@
'macrobody' => '*
'
},
+ 'line_nr' => {
+ 'file_name' => '',
+ 'line_nr' => 2,
+ 'macro' => ''
+ },
'parent' => {}
},
{
@@ -68,6 +73,11 @@
'macrobody' => '*
'
},
+ 'line_nr' => {
+ 'file_name' => '',
+ 'line_nr' => 6,
+ 'macro' => ''
+ },
'parent' => {}
},
{
@@ -105,6 +115,11 @@
'macrobody' => '
'
},
+ 'line_nr' => {
+ 'file_name' => '',
+ 'line_nr' => 10,
+ 'macro' => ''
+ },
'parent' => {}
},
{
@@ -142,6 +157,11 @@
'macrobody' => '
'
},
+ 'line_nr' => {
+ 'file_name' => '',
+ 'line_nr' => 14,
+ 'macro' => ''
+ },
'parent' => {}
},
{
@@ -179,6 +199,11 @@
'macrobody' => '::
'
},
+ 'line_nr' => {
+ 'file_name' => '',
+ 'line_nr' => 18,
+ 'macro' => ''
+ },
'parent' => {}
},
{
@@ -216,6 +241,11 @@
'macrobody' => ':
'
},
+ 'line_nr' => {
+ 'file_name' => '',
+ 'line_nr' => 22,
+ 'macro' => ''
+ },
'parent' => {}
},
{
Index: t/results/macro/macro_in_misc_commands.pl
===================================================================
RCS file:
/sources/texinfo/texinfo/tp/t/results/macro/macro_in_misc_commands.pl,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -b -r1.20 -r1.21
--- t/results/macro/macro_in_misc_commands.pl 29 Oct 2010 07:25:05 -0000
1.20
+++ t/results/macro/macro_in_misc_commands.pl 29 Oct 2010 21:20:46 -0000
1.21
@@ -27,6 +27,11 @@
'macrobody' => 'atext
'
},
+ 'line_nr' => {
+ 'file_name' => '',
+ 'line_nr' => 1,
+ 'macro' => ''
+ },
'parent' => {}
},
{
@@ -64,6 +69,11 @@
'macrobody' => 'Top
'
},
+ 'line_nr' => {
+ 'file_name' => '',
+ 'line_nr' => 5,
+ 'macro' => ''
+ },
'parent' => {}
},
{
@@ -251,6 +261,11 @@
'macrobody' => '200mm,150mm
'
},
+ 'line_nr' => {
+ 'file_name' => '',
+ 'line_nr' => 16,
+ 'macro' => ''
+ },
'parent' => {}
},
{
@@ -288,6 +303,11 @@
'macrobody' => '@afourpaper
'
},
+ 'line_nr' => {
+ 'file_name' => '',
+ 'line_nr' => 20,
+ 'macro' => ''
+ },
'parent' => {}
},
{
@@ -423,6 +443,11 @@
'macrobody' => '0.1
'
},
+ 'line_nr' => {
+ 'file_name' => '',
+ 'line_nr' => 30,
+ 'macro' => ''
+ },
'parent' => {}
},
{
@@ -503,6 +528,11 @@
'macrobody' => '@raisesections
'
},
+ 'line_nr' => {
+ 'file_name' => '',
+ 'line_nr' => 36,
+ 'macro' => ''
+ },
'parent' => {}
},
{
@@ -538,6 +568,11 @@
'macrobody' => '@lowersections
'
},
+ 'line_nr' => {
+ 'file_name' => '',
+ 'line_nr' => 40,
+ 'macro' => ''
+ },
'parent' => {}
},
{
@@ -677,6 +712,11 @@
'macrobody' => 'phi
'
},
+ 'line_nr' => {
+ 'file_name' => '',
+ 'line_nr' => 49,
+ 'macro' => ''
+ },
'parent' => {}
},
{
@@ -792,6 +832,11 @@
'macrobody' => '@strong
'
},
+ 'line_nr' => {
+ 'file_name' => '',
+ 'line_nr' => 56,
+ 'macro' => ''
+ },
'parent' => {}
},
{
@@ -823,6 +868,11 @@
'macrobody' => 'strong
'
},
+ 'line_nr' => {
+ 'file_name' => '',
+ 'line_nr' => 59,
+ 'macro' => ''
+ },
'parent' => {}
},
{
@@ -1012,6 +1062,11 @@
'macrobody' => 'code
'
},
+ 'line_nr' => {
+ 'file_name' => '',
+ 'line_nr' => 71,
+ 'macro' => ''
+ },
'parent' => {}
},
{
@@ -1166,6 +1221,11 @@
'macrobody' => 'asis
'
},
+ 'line_nr' => {
+ 'file_name' => '',
+ 'line_nr' => 82,
+ 'macro' => ''
+ },
'parent' => {}
},
{
@@ -1197,6 +1257,11 @@
'macrobody' => '0
'
},
+ 'line_nr' => {
+ 'file_name' => '',
+ 'line_nr' => 85,
+ 'macro' => ''
+ },
'parent' => {}
},
{
@@ -1228,6 +1293,11 @@
'macrobody' => 'none
'
},
+ 'line_nr' => {
+ 'file_name' => '',
+ 'line_nr' => 88,
+ 'macro' => ''
+ },
'parent' => {}
},
{
@@ -1259,6 +1329,11 @@
'macrobody' => '4
'
},
+ 'line_nr' => {
+ 'file_name' => '',
+ 'line_nr' => 91,
+ 'macro' => ''
+ },
'parent' => {}
},
{
@@ -1290,6 +1365,11 @@
'macrobody' => '6
'
},
+ 'line_nr' => {
+ 'file_name' => '',
+ 'line_nr' => 94,
+ 'macro' => ''
+ },
'parent' => {}
},
{
@@ -1555,6 +1635,11 @@
'macrobody' => 'end
'
},
+ 'line_nr' => {
+ 'file_name' => '',
+ 'line_nr' => 105,
+ 'macro' => ''
+ },
'parent' => {}
},
{
@@ -1586,6 +1671,11 @@
'macrobody' => 'separate
'
},
+ 'line_nr' => {
+ 'file_name' => '',
+ 'line_nr' => 108,
+ 'macro' => ''
+ },
'parent' => {}
},
{
@@ -1697,6 +1787,11 @@
'macrobody' => 'on
'
},
+ 'line_nr' => {
+ 'file_name' => '',
+ 'line_nr' => 114,
+ 'macro' => ''
+ },
'parent' => {}
},
{
@@ -1728,6 +1823,11 @@
'macrobody' => 'off
'
},
+ 'line_nr' => {
+ 'file_name' => '',
+ 'line_nr' => 117,
+ 'macro' => ''
+ },
'parent' => {}
},
{
@@ -1851,6 +1951,11 @@
'macrobody' => '10
'
},
+ 'line_nr' => {
+ 'file_name' => '',
+ 'line_nr' => 124,
+ 'macro' => ''
+ },
'parent' => {}
},
{
@@ -1931,6 +2036,11 @@
'macrobody' => 'false
'
},
+ 'line_nr' => {
+ 'file_name' => '',
+ 'line_nr' => 129,
+ 'macro' => ''
+ },
'parent' => {}
},
{
@@ -1962,6 +2072,11 @@
'macrobody' => 'true
'
},
+ 'line_nr' => {
+ 'file_name' => '',
+ 'line_nr' => 132,
+ 'macro' => ''
+ },
'parent' => {}
},
{
@@ -2079,6 +2194,11 @@
'macrobody' => '@page
'
},
+ 'line_nr' => {
+ 'file_name' => '',
+ 'line_nr' => 139,
+ 'macro' => ''
+ },
'parent' => {}
},
{
@@ -2110,6 +2230,11 @@
'macrobody' => '@noindent
'
},
+ 'line_nr' => {
+ 'file_name' => '',
+ 'line_nr' => 142,
+ 'macro' => ''
+ },
'parent' => {}
},
{
@@ -2141,6 +2266,11 @@
'macrobody' => '@refill
'
},
+ 'line_nr' => {
+ 'file_name' => '',
+ 'line_nr' => 145,
+ 'macro' => ''
+ },
'parent' => {}
},
{
@@ -2413,6 +2543,11 @@
'macrobody' => '@contents
'
},
+ 'line_nr' => {
+ 'file_name' => '',
+ 'line_nr' => 163,
+ 'macro' => ''
+ },
'parent' => {}
},
{
@@ -2472,6 +2607,11 @@
'macrobody' => '@cropmarks
'
},
+ 'line_nr' => {
+ 'file_name' => '',
+ 'line_nr' => 170,
+ 'macro' => ''
+ },
'parent' => {}
},
{
@@ -2513,6 +2653,11 @@
'macrobody' => '@exdent
'
},
+ 'line_nr' => {
+ 'file_name' => '',
+ 'line_nr' => 175,
+ 'macro' => ''
+ },
'parent' => {}
},
{
@@ -2575,6 +2720,11 @@
'macrobody' => '2
'
},
+ 'line_nr' => {
+ 'file_name' => '',
+ 'line_nr' => 180,
+ 'macro' => ''
+ },
'parent' => {}
},
{
@@ -2649,6 +2799,11 @@
'macrobody' => '@result
'
},
+ 'line_nr' => {
+ 'file_name' => '',
+ 'line_nr' => 185,
+ 'macro' => ''
+ },
'parent' => {}
},
{
@@ -2869,6 +3024,11 @@
'macrobody' => '@shortcontents
'
},
+ 'line_nr' => {
+ 'file_name' => '',
+ 'line_nr' => 200,
+ 'macro' => ''
+ },
'parent' => {}
},
{
@@ -2910,6 +3070,11 @@
'macrobody' => '@bye
'
},
+ 'line_nr' => {
+ 'file_name' => '',
+ 'line_nr' => 205,
+ 'macro' => ''
+ },
'parent' => {}
},
{
Index: t/results/macro/macro_no_arg_bad_expansion.pl
===================================================================
RCS file:
/sources/texinfo/texinfo/tp/t/results/macro/macro_no_arg_bad_expansion.pl,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -b -r1.10 -r1.11
--- t/results/macro/macro_no_arg_bad_expansion.pl 29 Oct 2010 07:12:00
-0000 1.10
+++ t/results/macro/macro_no_arg_bad_expansion.pl 29 Oct 2010 21:20:46
-0000 1.11
@@ -25,6 +25,11 @@
'macrobody' => 'res1
'
},
+ 'line_nr' => {
+ 'file_name' => '',
+ 'line_nr' => 1,
+ 'macro' => ''
+ },
'parent' => {}
},
{
Index: t/results/macro/macro_no_arg_expansion.pl
===================================================================
RCS file:
/sources/texinfo/texinfo/tp/t/results/macro/macro_no_arg_expansion.pl,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -b -r1.10 -r1.11
--- t/results/macro/macro_no_arg_expansion.pl 29 Oct 2010 07:12:00 -0000
1.10
+++ t/results/macro/macro_no_arg_expansion.pl 29 Oct 2010 21:20:47 -0000
1.11
@@ -25,6 +25,11 @@
'macrobody' => 'res1
'
},
+ 'line_nr' => {
+ 'file_name' => '',
+ 'line_nr' => 1,
+ 'macro' => ''
+ },
'parent' => {}
},
{
Index: t/results/macro/macro_no_argument.pl
===================================================================
RCS file: /sources/texinfo/texinfo/tp/t/results/macro/macro_no_argument.pl,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -b -r1.8 -r1.9
--- t/results/macro/macro_no_argument.pl 29 Oct 2010 07:12:00 -0000
1.8
+++ t/results/macro/macro_no_argument.pl 29 Oct 2010 21:20:47 -0000
1.9
@@ -8,6 +8,11 @@
'extra' => {
'arg_line' => ''
},
+ 'line_nr' => {
+ 'file_name' => '',
+ 'line_nr' => 1,
+ 'macro' => ''
+ },
'parent' => {}
}
],
Index: t/results/macro/macro_not_closed.pl
===================================================================
RCS file: /sources/texinfo/texinfo/tp/t/results/macro/macro_not_closed.pl,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -b -r1.8 -r1.9
--- t/results/macro/macro_not_closed.pl 29 Oct 2010 07:12:00 -0000 1.8
+++ t/results/macro/macro_not_closed.pl 29 Oct 2010 21:20:47 -0000 1.9
@@ -23,6 +23,11 @@
'arg_line' => ' name
'
},
+ 'line_nr' => {
+ 'file_name' => '',
+ 'line_nr' => 1,
+ 'macro' => ''
+ },
'parent' => {}
}
],
Index: t/results/macro/macro_one_arg_end_of_file.pl
===================================================================
RCS file:
/sources/texinfo/texinfo/tp/t/results/macro/macro_one_arg_end_of_file.pl,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -b -r1.8 -r1.9
--- t/results/macro/macro_one_arg_end_of_file.pl 29 Oct 2010 07:12:00
-0000 1.8
+++ t/results/macro/macro_one_arg_end_of_file.pl 29 Oct 2010 21:20:47
-0000 1.9
@@ -33,6 +33,11 @@
'macrobody' => 'Arg \\arg\\.
'
},
+ 'line_nr' => {
+ 'file_name' => '',
+ 'line_nr' => 1,
+ 'macro' => ''
+ },
'parent' => {}
},
{
Index: t/results/macro/macro_zero.pl
===================================================================
RCS file: /sources/texinfo/texinfo/tp/t/results/macro/macro_zero.pl,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -b -r1.11 -r1.12
--- t/results/macro/macro_zero.pl 29 Oct 2010 07:12:00 -0000 1.11
+++ t/results/macro/macro_zero.pl 29 Oct 2010 21:20:47 -0000 1.12
@@ -25,6 +25,11 @@
'macrobody' => '0
'
},
+ 'line_nr' => {
+ 'file_name' => '',
+ 'line_nr' => 1,
+ 'macro' => ''
+ },
'parent' => {}
},
{
Index: t/results/macro/nested_macro_call.pl
===================================================================
RCS file: /sources/texinfo/texinfo/tp/t/results/macro/nested_macro_call.pl,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -b -r1.11 -r1.12
--- t/results/macro/nested_macro_call.pl 29 Oct 2010 07:12:00 -0000
1.11
+++ t/results/macro/nested_macro_call.pl 29 Oct 2010 21:20:47 -0000
1.12
@@ -25,6 +25,11 @@
'macrobody' => '(machin)
'
},
+ 'line_nr' => {
+ 'file_name' => '',
+ 'line_nr' => 1,
+ 'macro' => ''
+ },
'parent' => {}
},
{
@@ -69,6 +74,11 @@
'
},
+ 'line_nr' => {
+ 'file_name' => '',
+ 'line_nr' => 5,
+ 'macro' => ''
+ },
'parent' => {}
},
{
Index: t/results/macro/no_macrobody.pl
===================================================================
RCS file: /sources/texinfo/texinfo/tp/t/results/macro/no_macrobody.pl,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -b -r1.13 -r1.14
--- t/results/macro/no_macrobody.pl 29 Oct 2010 07:12:00 -0000 1.13
+++ t/results/macro/no_macrobody.pl 29 Oct 2010 21:20:47 -0000 1.14
@@ -25,6 +25,11 @@
},
'macrobody' => ''
},
+ 'line_nr' => {
+ 'file_name' => '',
+ 'line_nr' => 1,
+ 'macro' => ''
+ },
'parent' => {}
},
{
Index: t/results/macro/paragraph_and_macro.pl
===================================================================
RCS file: /sources/texinfo/texinfo/tp/t/results/macro/paragraph_and_macro.pl,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -b -r1.11 -r1.12
--- t/results/macro/paragraph_and_macro.pl 29 Oct 2010 07:12:00 -0000
1.11
+++ t/results/macro/paragraph_and_macro.pl 29 Oct 2010 21:20:48 -0000
1.12
@@ -17,6 +17,11 @@
',
'macrobody' => ''
},
+ 'line_nr' => {
+ 'file_name' => '',
+ 'line_nr' => 1,
+ 'macro' => ''
+ },
'parent' => {}
},
{
@@ -54,6 +59,11 @@
'macrobody' => '
'
},
+ 'line_nr' => {
+ 'file_name' => '',
+ 'line_nr' => 4,
+ 'macro' => ''
+ },
'parent' => {}
},
{
@@ -91,6 +101,11 @@
'macrobody' => 'a word
'
},
+ 'line_nr' => {
+ 'file_name' => '',
+ 'line_nr' => 8,
+ 'macro' => ''
+ },
'parent' => {}
},
{
Index: t/results/macro/protect_comma_macro_line.pl
===================================================================
RCS file:
/sources/texinfo/texinfo/tp/t/results/macro/protect_comma_macro_line.pl,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -b -r1.10 -r1.11
--- t/results/macro/protect_comma_macro_line.pl 29 Oct 2010 07:12:00 -0000
1.10
+++ t/results/macro/protect_comma_macro_line.pl 29 Oct 2010 21:20:48 -0000
1.11
@@ -54,6 +54,11 @@
and a last in another paragraph
'
},
+ 'line_nr' => {
+ 'file_name' => '',
+ 'line_nr' => 1,
+ 'macro' => ''
+ },
'parent' => {}
},
{
Index: t/results/macro/protect_in_body.pl
===================================================================
RCS file: /sources/texinfo/texinfo/tp/t/results/macro/protect_in_body.pl,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -b -r1.11 -r1.12
--- t/results/macro/protect_in_body.pl 29 Oct 2010 07:12:00 -0000 1.11
+++ t/results/macro/protect_in_body.pl 29 Oct 2010 21:20:48 -0000 1.12
@@ -39,6 +39,11 @@
'macrobody' => 'result: @emph{\\arg1\\} protected \\\\ -> \\\\arg1\\\\
@emph{\\arg2\\}
'
},
+ 'line_nr' => {
+ 'file_name' => '',
+ 'line_nr' => 1,
+ 'macro' => ''
+ },
'parent' => {}
},
{
Index: t/results/macro/protect_in_body_line_arg.pl
===================================================================
RCS file:
/sources/texinfo/texinfo/tp/t/results/macro/protect_in_body_line_arg.pl,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -b -r1.11 -r1.12
--- t/results/macro/protect_in_body_line_arg.pl 29 Oct 2010 07:12:00 -0000
1.11
+++ t/results/macro/protect_in_body_line_arg.pl 29 Oct 2010 21:20:48 -0000
1.12
@@ -39,6 +39,11 @@
'macrobody' => 'result: @emph{\\arg1\\} protected \\\\ -> \\\\arg1\\\\
@emph{\\arg2\\}
'
},
+ 'line_nr' => {
+ 'file_name' => '',
+ 'line_nr' => 1,
+ 'macro' => ''
+ },
'parent' => {}
},
{
Index: t/results/macro/protect_in_body_one_arg.pl
===================================================================
RCS file:
/sources/texinfo/texinfo/tp/t/results/macro/protect_in_body_one_arg.pl,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -b -r1.12 -r1.13
--- t/results/macro/protect_in_body_one_arg.pl 29 Oct 2010 07:12:00 -0000
1.12
+++ t/results/macro/protect_in_body_one_arg.pl 29 Oct 2010 21:20:48 -0000
1.13
@@ -39,6 +39,11 @@
'macrobody' => 'result: @emph{\\arg1\\} protected \\\\ -> \\\\arg1\\\\
@emph{\\arg2\\}
'
},
+ 'line_nr' => {
+ 'file_name' => '',
+ 'line_nr' => 1,
+ 'macro' => ''
+ },
'parent' => {}
},
{
Index: t/results/macro/simple_imbricated_macro.pl
===================================================================
RCS file:
/sources/texinfo/texinfo/tp/t/results/macro/simple_imbricated_macro.pl,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -b -r1.5 -r1.6
--- t/results/macro/simple_imbricated_macro.pl 29 Oct 2010 07:12:00 -0000
1.5
+++ t/results/macro/simple_imbricated_macro.pl 29 Oct 2010 21:20:48 -0000
1.6
@@ -50,6 +50,11 @@
@end macro
'
},
+ 'line_nr' => {
+ 'file_name' => '',
+ 'line_nr' => 1,
+ 'macro' => ''
+ },
'parent' => {}
},
{
@@ -94,6 +99,11 @@
'macrobody' => 'bidule.
'
},
+ 'line_nr' => {
+ 'file_name' => '',
+ 'line_nr' => 8,
+ 'macro' => 'truc'
+ },
'parent' => {}
},
{
Index: t/results/macro/space_macro_after_end.pl
===================================================================
RCS file: /sources/texinfo/texinfo/tp/t/results/macro/space_macro_after_end.pl,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -b -r1.8 -r1.9
--- t/results/macro/space_macro_after_end.pl 29 Oct 2010 07:12:00 -0000
1.8
+++ t/results/macro/space_macro_after_end.pl 29 Oct 2010 21:20:48 -0000
1.9
@@ -25,6 +25,11 @@
'macrobody' => '
'
},
+ 'line_nr' => {
+ 'file_name' => '',
+ 'line_nr' => 1,
+ 'macro' => ''
+ },
'parent' => {}
},
{
Index: t/results/macro/text_before_after.pl
===================================================================
RCS file: /sources/texinfo/texinfo/tp/t/results/macro/text_before_after.pl,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -b -r1.11 -r1.12
--- t/results/macro/text_before_after.pl 29 Oct 2010 07:12:00 -0000
1.11
+++ t/results/macro/text_before_after.pl 29 Oct 2010 21:20:48 -0000
1.12
@@ -31,6 +31,11 @@
'macrobody' => 'in macro
'
},
+ 'line_nr' => {
+ 'file_name' => '',
+ 'line_nr' => 1,
+ 'macro' => ''
+ },
'parent' => {}
},
{
Index: t/results/macro/too_much_args.pl
===================================================================
RCS file: /sources/texinfo/texinfo/tp/t/results/macro/too_much_args.pl,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -b -r1.11 -r1.12
--- t/results/macro/too_much_args.pl 29 Oct 2010 07:12:00 -0000 1.11
+++ t/results/macro/too_much_args.pl 29 Oct 2010 21:20:48 -0000 1.12
@@ -46,6 +46,11 @@
second arg: \\second\\
'
},
+ 'line_nr' => {
+ 'file_name' => '',
+ 'line_nr' => 1,
+ 'macro' => ''
+ },
'parent' => {}
},
{
Index: t/results/macro/two_macros_on_a_line.pl
===================================================================
RCS file: /sources/texinfo/texinfo/tp/t/results/macro/two_macros_on_a_line.pl,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -b -r1.12 -r1.13
--- t/results/macro/two_macros_on_a_line.pl 29 Oct 2010 07:12:00 -0000
1.12
+++ t/results/macro/two_macros_on_a_line.pl 29 Oct 2010 21:20:48 -0000
1.13
@@ -25,6 +25,11 @@
'macrobody' => 'in mymacro
'
},
+ 'line_nr' => {
+ 'file_name' => '',
+ 'line_nr' => 1,
+ 'macro' => ''
+ },
'parent' => {}
},
{
@@ -84,6 +89,11 @@
after
'
},
+ 'line_nr' => {
+ 'file_name' => '',
+ 'line_nr' => 5,
+ 'macro' => ''
+ },
'parent' => {}
},
{
Index: t/results/macro/zero_argument.pl
===================================================================
RCS file: /sources/texinfo/texinfo/tp/t/results/macro/zero_argument.pl,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -b -r1.10 -r1.11
--- t/results/macro/zero_argument.pl 29 Oct 2010 07:12:00 -0000 1.10
+++ t/results/macro/zero_argument.pl 29 Oct 2010 21:20:48 -0000 1.11
@@ -25,6 +25,11 @@
'macrobody' => 'in foo
'
},
+ 'line_nr' => {
+ 'file_name' => '',
+ 'line_nr' => 1,
+ 'macro' => ''
+ },
'parent' => {}
},
{
@@ -62,6 +67,11 @@
'macrobody' => 'in bar
'
},
+ 'line_nr' => {
+ 'file_name' => '',
+ 'line_nr' => 5,
+ 'macro' => ''
+ },
'parent' => {}
},
{
Index: t/results/raw/nested_macros.pl
===================================================================
RCS file: /sources/texinfo/texinfo/tp/t/results/raw/nested_macros.pl,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -b -r1.13 -r1.14
--- t/results/raw/nested_macros.pl 29 Oct 2010 07:12:01 -0000 1.13
+++ t/results/raw/nested_macros.pl 29 Oct 2010 21:20:48 -0000 1.14
@@ -81,6 +81,11 @@
@end macro
'
},
+ 'line_nr' => {
+ 'file_name' => '',
+ 'line_nr' => 1,
+ 'macro' => ''
+ },
'parent' => {}
},
{
Index: t/results/value_and_macro/comma_value_in_macro_arg.pl
===================================================================
RCS file:
/sources/texinfo/texinfo/tp/t/results/value_and_macro/comma_value_in_macro_arg.pl,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -b -r1.12 -r1.13
--- t/results/value_and_macro/comma_value_in_macro_arg.pl 29 Oct 2010
07:12:02 -0000 1.12
+++ t/results/value_and_macro/comma_value_in_macro_arg.pl 29 Oct 2010
21:20:49 -0000 1.13
@@ -65,6 +65,11 @@
'macrobody' => 'result: @emph{\\arg1\\} protected \\\\ -> \\\\arg1\\\\
@emph{\\arg2\\}
'
},
+ 'line_nr' => {
+ 'file_name' => '',
+ 'line_nr' => 3,
+ 'macro' => ''
+ },
'parent' => {}
},
{
Index: t/results/value_and_macro/macro_in_value.pl
===================================================================
RCS file:
/sources/texinfo/texinfo/tp/t/results/value_and_macro/macro_in_value.pl,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -b -r1.10 -r1.11
--- t/results/value_and_macro/macro_in_value.pl 29 Oct 2010 07:12:02 -0000
1.10
+++ t/results/value_and_macro/macro_in_value.pl 29 Oct 2010 21:20:49 -0000
1.11
@@ -39,6 +39,11 @@
b
'
},
+ 'line_nr' => {
+ 'file_name' => '',
+ 'line_nr' => 1,
+ 'macro' => ''
+ },
'parent' => {}
},
{
Index: t/results/value_and_macro/value_in_macro_body.pl
===================================================================
RCS file:
/sources/texinfo/texinfo/tp/t/results/value_and_macro/value_in_macro_body.pl,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -b -r1.12 -r1.13
--- t/results/value_and_macro/value_in_macro_body.pl 29 Oct 2010 07:12:02
-0000 1.12
+++ t/results/value_and_macro/value_in_macro_body.pl 29 Oct 2010 21:20:49
-0000 1.13
@@ -59,6 +59,11 @@
'macrobody' => 'result: @address@hidden }
'
},
+ 'line_nr' => {
+ 'file_name' => '',
+ 'line_nr' => 3,
+ 'macro' => ''
+ },
'parent' => {}
},
{
Index: t/results/value_and_macro/value_in_macro_formal_arg.pl
===================================================================
RCS file:
/sources/texinfo/texinfo/tp/t/results/value_and_macro/value_in_macro_formal_arg.pl,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -b -r1.12 -r1.13
--- t/results/value_and_macro/value_in_macro_formal_arg.pl 29 Oct 2010
07:12:02 -0000 1.12
+++ t/results/value_and_macro/value_in_macro_formal_arg.pl 29 Oct 2010
21:20:49 -0000 1.13
@@ -65,6 +65,11 @@
'macrobody' => 'result: @emph{\\arg\\} the \\the\\ thearg \\thearg\\
with value address@hidden
'
},
+ 'line_nr' => {
+ 'file_name' => '',
+ 'line_nr' => 3,
+ 'macro' => ''
+ },
'parent' => {}
},
{
Index: t/results/macro/double_macro_definition.pl
===================================================================
RCS file: t/results/macro/double_macro_definition.pl
diff -N t/results/macro/double_macro_definition.pl
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ t/results/macro/double_macro_definition.pl 29 Oct 2010 21:20:43 -0000
1.1
@@ -0,0 +1,111 @@
+use vars qw(%result_texis %result_texts %result_trees %result_errors
%results_indices);
+
+$result_trees{'double_macro_definition'} = {
+ 'contents' => [
+ {
+ 'args' => [
+ {
+ 'parent' => {},
+ 'text' => 'foo',
+ 'type' => 'macro_name'
+ }
+ ],
+ 'cmdname' => 'macro',
+ 'contents' => [],
+ 'extra' => {
+ 'arg_line' => ' foo
+',
+ 'macrobody' => ''
+ },
+ 'line_nr' => {
+ 'file_name' => '',
+ 'line_nr' => 1,
+ 'macro' => ''
+ },
+ 'parent' => {}
+ },
+ {
+ 'parent' => {},
+ 'text' => '
+',
+ 'type' => 'empty_line_after_command'
+ },
+ {
+ 'parent' => {},
+ 'text' => '
+',
+ 'type' => 'empty_line'
+ },
+ {
+ 'args' => [
+ {
+ 'parent' => {},
+ 'text' => 'foo',
+ 'type' => 'macro_name'
+ }
+ ],
+ 'cmdname' => 'macro',
+ 'contents' => [],
+ 'extra' => {
+ 'arg_line' => ' foo
+',
+ 'macrobody' => ''
+ },
+ 'line_nr' => {
+ 'file_name' => '',
+ 'line_nr' => 4,
+ 'macro' => ''
+ },
+ 'parent' => {}
+ },
+ {
+ 'parent' => {},
+ 'text' => '
+',
+ 'type' => 'empty_line_after_command'
+ }
+ ],
+ 'type' => 'text_root'
+};
+$result_trees{'double_macro_definition'}{'contents'}[0]{'args'}[0]{'parent'} =
$result_trees{'double_macro_definition'}{'contents'}[0];
+$result_trees{'double_macro_definition'}{'contents'}[0]{'parent'} =
$result_trees{'double_macro_definition'};
+$result_trees{'double_macro_definition'}{'contents'}[1]{'parent'} =
$result_trees{'double_macro_definition'};
+$result_trees{'double_macro_definition'}{'contents'}[2]{'parent'} =
$result_trees{'double_macro_definition'};
+$result_trees{'double_macro_definition'}{'contents'}[3]{'args'}[0]{'parent'} =
$result_trees{'double_macro_definition'}{'contents'}[3];
+$result_trees{'double_macro_definition'}{'contents'}[3]{'parent'} =
$result_trees{'double_macro_definition'};
+$result_trees{'double_macro_definition'}{'contents'}[4]{'parent'} =
$result_trees{'double_macro_definition'};
+
+$result_texis{'double_macro_definition'} = '@macro foo
address@hidden macro
+
address@hidden foo
address@hidden macro
+';
+
+
+$result_texts{'double_macro_definition'} = '
+';
+
+$result_errors{'double_macro_definition'} = [
+ {
+ 'error_line' => ':4: warning: macro `foo\' previously defined
+',
+ 'file_name' => '',
+ 'line_nr' => 4,
+ 'macro' => '',
+ 'text' => 'macro `foo\' previously defined',
+ 'type' => 'warning'
+ },
+ {
+ 'error_line' => ':1: warning: here is the previous definition of `foo\'
+',
+ 'file_name' => '',
+ 'line_nr' => 1,
+ 'macro' => '',
+ 'text' => 'here is the previous definition of `foo\'',
+ 'type' => 'warning'
+ }
+];
+
+
+1;