texinfo/tp TODO Texinfo/Parser.pm t/60macro.t t...

[Patrice Dumas]

CVSROOT:        /sources/texinfo
Module name:    texinfo
Changes by:     Patrice Dumas <pertusus>        12/01/07 09:43:03

Modified files:
        tp             : TODO 
        tp/Texinfo     : Parser.pm 
        tp/t           : 60macro.t 
Added files:
        tp/t/results/macro: empty_macro_no_arg.pl 
Removed files:
        tp/t/results/macro: empty_macro.pl 

Log message:
        Reorganize empty macro tests with a better test name.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/TODO?cvsroot=texinfo&r1=1.238&r2=1.239
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/Texinfo/Parser.pm?cvsroot=texinfo&r1=1.349&r2=1.350
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/60macro.t?cvsroot=texinfo&r1=1.37&r2=1.38
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/macro/empty_macro_no_arg.pl?cvsroot=texinfo&rev=1.1
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/macro/empty_macro.pl?cvsroot=texinfo&r1=1.16&r2=0

Patches:
Index: TODO
===================================================================
RCS file: /sources/texinfo/texinfo/tp/TODO,v
retrieving revision 1.238
retrieving revision 1.239
diff -u -b -r1.238 -r1.239
--- TODO        6 Jan 2012 00:13:13 -0000       1.238
+++ TODO        7 Jan 2012 09:43:02 -0000       1.239
@@ -97,6 +97,8 @@
 or value expansion.  Maybe call the key for these elements
 'sourcemark'?
 
+In a similar way, keep the information about aliases in the tree?
+
 Right now VERBOSE is almost not used.
 
 Handle better @exdent in html? (there is a FIXME in the code)

Index: Texinfo/Parser.pm
===================================================================
RCS file: /sources/texinfo/texinfo/tp/Texinfo/Parser.pm,v
retrieving revision 1.349
retrieving revision 1.350
diff -u -b -r1.349 -r1.350
--- Texinfo/Parser.pm   6 Jan 2012 00:20:28 -0000       1.349
+++ Texinfo/Parser.pm   7 Jan 2012 09:43:02 -0000       1.350
@@ -3504,8 +3504,11 @@
                        $self->{'macros'}->{$self->{'aliases'}->{$1}}))) {
         $line =~ s/^\@([[:alnum:]][[:alnum:]-]*)//o;
         my $command = $1;
-        $command = $self->{'aliases'}->{$command} 
-           if (exists($self->{'aliases'}->{$command}));
+        my $alias_command;
+        if (exists($self->{'aliases'}->{$command})) {
+          $alias_command = $command;
+          $command = $self->{'aliases'}->{$command};
+        }
 
         my $expanded_macro = $self->{'macros'}->{$command};
         my $args_number = scalar(@{$expanded_macro->{'args'}}) -1;
@@ -3752,8 +3755,11 @@
       } elsif ($line =~ s/^\@(["'address@hidden,\.!\?\s\*\-\^`=:\|\/\\])//o 
                or $line =~ s/^\@([[:alnum:]][[:alnum:]-]*)//o) {
         my $command = $1;
-        $command = $self->{'aliases'}->{$command} 
-           if (exists($self->{'aliases'}->{$command}));
+        my $alias_command;
+        if (exists($self->{'aliases'}->{$command})) {
+          $alias_command = $command;
+          $command = $self->{'aliases'}->{$command};
+        }
         print STDERR "COMMAND $command\n" if ($self->{'DEBUG'});
 
         if ($command eq 'value') {

Index: t/60macro.t
===================================================================
RCS file: /sources/texinfo/texinfo/tp/t/60macro.t,v
retrieving revision 1.37
retrieving revision 1.38
diff -u -b -r1.37 -r1.38
--- t/60macro.t 5 Jan 2012 21:27:41 -0000       1.37
+++ t/60macro.t 7 Jan 2012 09:43:02 -0000       1.38
@@ -24,6 +24,25 @@
 
 @no-macrobody{arg brace}.
 '],
+['empty_macro_no_arg',
+'@macro foo
address@hidden macro
+
address@hidden
+
address@hidden
+'],
+['empty_macro_in_text_no_arg',
+'@macro texnl{}
address@hidden macro
+
+ address@hidden  It.
+
address@hidden texnl2
address@hidden macro
+
+This 2 address@hidden  A.
+'],
 ['empty_end','@macro foo {aaa, }
 in foo
 @end macro'],
@@ -82,25 +101,6 @@
 
 @test1 abc
 '],
-['empty_macro',
-'@macro foo
address@hidden macro
-
address@hidden
-
address@hidden
-'],
-['empty_macro_in_text_no_arg',
-'@macro texnl{}
address@hidden macro
-
- address@hidden  It.
-
address@hidden texnl2
address@hidden macro
-
-This 2 address@hidden  A.
-'],
 ['macro_one_arg_end_of_file',
 '@macro one-arg{arg}
 Arg \arg\.

Index: t/results/macro/empty_macro_no_arg.pl
===================================================================
RCS file: t/results/macro/empty_macro_no_arg.pl
diff -N t/results/macro/empty_macro_no_arg.pl
--- /dev/null   1 Jan 1970 00:00:00 -0000
+++ t/results/macro/empty_macro_no_arg.pl       7 Jan 2012 09:43:03 -0000       
1.1
@@ -0,0 +1,95 @@
+use vars qw(%result_texis %result_texts %result_trees %result_errors 
+   %result_indices %result_sectioning %result_nodes %result_menus
+   %result_floats %result_converted %result_converted_errors 
+   %result_elements %result_directions_text);
+
+use utf8;
+
+$result_trees{'empty_macro_no_arg'} = {
+  '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' => {}
+    },
+    {
+      'extra' => {
+        'command' => {}
+      },
+      'parent' => {},
+      'text' => '
+',
+      'type' => 'empty_line_after_command'
+    },
+    {
+      'parent' => {},
+      'text' => '
+',
+      'type' => 'empty_line'
+    },
+    {
+      'parent' => {},
+      'text' => '
+',
+      'type' => 'empty_line'
+    },
+    {
+      'parent' => {},
+      'text' => '
+',
+      'type' => 'empty_line'
+    },
+    {
+      'parent' => {},
+      'text' => '
+',
+      'type' => 'empty_line'
+    }
+  ],
+  'type' => 'text_root'
+};
+$result_trees{'empty_macro_no_arg'}{'contents'}[0]{'args'}[0]{'parent'} = 
$result_trees{'empty_macro_no_arg'}{'contents'}[0];
+$result_trees{'empty_macro_no_arg'}{'contents'}[0]{'parent'} = 
$result_trees{'empty_macro_no_arg'};
+$result_trees{'empty_macro_no_arg'}{'contents'}[1]{'extra'}{'command'} = 
$result_trees{'empty_macro_no_arg'}{'contents'}[0];
+$result_trees{'empty_macro_no_arg'}{'contents'}[1]{'parent'} = 
$result_trees{'empty_macro_no_arg'};
+$result_trees{'empty_macro_no_arg'}{'contents'}[2]{'parent'} = 
$result_trees{'empty_macro_no_arg'};
+$result_trees{'empty_macro_no_arg'}{'contents'}[3]{'parent'} = 
$result_trees{'empty_macro_no_arg'};
+$result_trees{'empty_macro_no_arg'}{'contents'}[4]{'parent'} = 
$result_trees{'empty_macro_no_arg'};
+$result_trees{'empty_macro_no_arg'}{'contents'}[5]{'parent'} = 
$result_trees{'empty_macro_no_arg'};
+
+$result_texis{'empty_macro_no_arg'} = '@macro foo
address@hidden macro
+
+
+
+
+';
+
+
+$result_texts{'empty_macro_no_arg'} = '
+
+
+
+';
+
+$result_errors{'empty_macro_no_arg'} = [];
+
+
+1;

Index: t/results/macro/empty_macro.pl
===================================================================
RCS file: t/results/macro/empty_macro.pl
diff -N t/results/macro/empty_macro.pl
--- t/results/macro/empty_macro.pl      3 Jul 2011 14:50:58 -0000       1.16
+++ /dev/null   1 Jan 1970 00:00:00 -0000
@@ -1,95 +0,0 @@
-use vars qw(%result_texis %result_texts %result_trees %result_errors 
-   %result_indices %result_sectioning %result_nodes %result_menus
-   %result_floats %result_converted %result_converted_errors 
-   %result_elements %result_directions_text);
-
-use utf8;
-
-$result_trees{'empty_macro'} = {
-  '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' => {}
-    },
-    {
-      'extra' => {
-        'command' => {}
-      },
-      'parent' => {},
-      'text' => '
-',
-      'type' => 'empty_line_after_command'
-    },
-    {
-      'parent' => {},
-      'text' => '
-',
-      'type' => 'empty_line'
-    },
-    {
-      'parent' => {},
-      'text' => '
-',
-      'type' => 'empty_line'
-    },
-    {
-      'parent' => {},
-      'text' => '
-',
-      'type' => 'empty_line'
-    },
-    {
-      'parent' => {},
-      'text' => '
-',
-      'type' => 'empty_line'
-    }
-  ],
-  'type' => 'text_root'
-};
-$result_trees{'empty_macro'}{'contents'}[0]{'args'}[0]{'parent'} = 
$result_trees{'empty_macro'}{'contents'}[0];
-$result_trees{'empty_macro'}{'contents'}[0]{'parent'} = 
$result_trees{'empty_macro'};
-$result_trees{'empty_macro'}{'contents'}[1]{'extra'}{'command'} = 
$result_trees{'empty_macro'}{'contents'}[0];
-$result_trees{'empty_macro'}{'contents'}[1]{'parent'} = 
$result_trees{'empty_macro'};
-$result_trees{'empty_macro'}{'contents'}[2]{'parent'} = 
$result_trees{'empty_macro'};
-$result_trees{'empty_macro'}{'contents'}[3]{'parent'} = 
$result_trees{'empty_macro'};
-$result_trees{'empty_macro'}{'contents'}[4]{'parent'} = 
$result_trees{'empty_macro'};
-$result_trees{'empty_macro'}{'contents'}[5]{'parent'} = 
$result_trees{'empty_macro'};
-
-$result_texis{'empty_macro'} = '@macro foo
address@hidden macro
-
-
-
-
-';
-
-
-$result_texts{'empty_macro'} = '
-
-
-
-';
-
-$result_errors{'empty_macro'} = [];
-
-
-1;