texinfo-commits
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

[7133] remove args_index extra value


From: Gavin D. Smith
Subject: [7133] remove args_index extra value
Date: Sun, 24 Apr 2016 14:45:08 +0000

Revision: 7133
          http://svn.sv.gnu.org/viewvc/?view=rev&root=texinfo&revision=7133
Author:   gavin
Date:     2016-04-24 14:45:07 +0000 (Sun, 24 Apr 2016)
Log Message:
-----------
remove args_index extra value

Modified Paths:
--------------
    trunk/ChangeLog
    trunk/tp/Texinfo/Parser.pm
    trunk/tp/t/results/include/macro_in_early_commands.pl
    trunk/tp/t/results/macro/arg_body_expansion_order.pl
    trunk/tp/t/results/macro/arg_not_closed.pl
    trunk/tp/t/results/macro/backslash_in_arg.pl
    trunk/tp/t/results/macro/complex_argument.pl
    trunk/tp/t/results/macro/double_recursive_macro_call.pl
    trunk/tp/t/results/macro/empty_end.pl
    trunk/tp/t/results/macro/expand_two_same.pl
    trunk/tp/t/results/macro/expansion_order.pl
    trunk/tp/t/results/macro/form_feeds.pl
    trunk/tp/t/results/macro/ifclear_in_macro.pl
    trunk/tp/t/results/macro/ifset_in_macro.pl
    trunk/tp/t/results/macro/ifset_in_macro_set.pl
    trunk/tp/t/results/macro/implicit_quoting_one_arg.pl
    trunk/tp/t/results/macro/implicit_quoting_recursion.pl
    trunk/tp/t/results/macro/macro_expands_to_empty.pl
    trunk/tp/t/results/macro/macro_expansion.pl
    trunk/tp/t/results/macro/macro_in_ifset.pl
    trunk/tp/t/results/macro/macro_in_ifset_end_in_arg.pl
    trunk/tp/t/results/macro/macro_in_macro_arg.pl
    trunk/tp/t/results/macro/macro_in_macro_arg_simpler.pl
    trunk/tp/t/results/macro/macro_name_with_digit.pl
    trunk/tp/t/results/macro/macro_name_with_hyphen.pl
    trunk/tp/t/results/macro/macro_one_arg_end_of_file.pl
    trunk/tp/t/results/macro/macro_with_error_at_end_line_after_macro.pl
    trunk/tp/t/results/macro/no_macrobody.pl
    trunk/tp/t/results/macro/protect_comma_macro_line.pl
    trunk/tp/t/results/macro/protect_in_body.pl
    trunk/tp/t/results/macro/protect_in_body_line_arg.pl
    trunk/tp/t/results/macro/protect_in_body_one_arg.pl
    trunk/tp/t/results/macro/recursive_call_in_argument.pl
    trunk/tp/t/results/macro/recursive_call_in_macro.pl
    trunk/tp/t/results/macro/redefine_texinfo_macro.pl
    trunk/tp/t/results/macro/too_much_args.pl
    trunk/tp/t/results/macro/two_macros_on_a_line.pl
    trunk/tp/t/results/misc_commands/test_allowcodebreaks.pl
    trunk/tp/t/results/raw/nested_macros.pl
    trunk/tp/t/results/value_and_macro/comma_value_in_macro_arg.pl
    trunk/tp/t/results/value_and_macro/value_in_macro_body.pl
    trunk/tp/t/results/xml_tests/macro_and_args.pl

Modified: trunk/ChangeLog
===================================================================
--- trunk/ChangeLog     2016-04-24 14:16:21 UTC (rev 7132)
+++ trunk/ChangeLog     2016-04-24 14:45:07 UTC (rev 7133)
@@ -1,5 +1,13 @@
 2016-04-24  Gavin Smith  <address@hidden>
 
+       * tp/Texinfo/Parser.pm (_expand_macro_body, _parse_texi):
+       Place 'args_index' hash as a value in the elements of
+       $self->{'macro'}, instead of being stored as an 'extra' value.
+       This change is because the 'arg_index' hash is not used outside 
+       of Parser.pm.
+
+2016-04-24  Gavin Smith  <address@hidden>
+
        * tp/Texinfo/Parser.pm (_expand_macro_arguments)
        (_expand_macro_body, _end_line <insertcopying>, parse_texi):
        Make $self->{'macros'} hash contain hashes which refer to the 

Modified: trunk/tp/Texinfo/Parser.pm
===================================================================
--- trunk/tp/Texinfo/Parser.pm  2016-04-24 14:16:21 UTC (rev 7132)
+++ trunk/tp/Texinfo/Parser.pm  2016-04-24 14:45:07 UTC (rev 7133)
@@ -2144,7 +2144,7 @@
 
   my $macrobody = $macro->{'macrobody'};
   my $args_total = scalar(@{$macro->{'element'}->{'args'}}) -1;
-  my $args_index = $macro->{'element'}->{'extra'}->{'args_index'};
+  my $args_index = $macro->{'args_index'};
 
   my $i;
   for ($i=0; $i<=$args_total; $i++) {
@@ -3817,10 +3817,18 @@
                                   "redefining Texinfo language command: 
address@hidden"), 
                                           $name), $current->{'line_nr'});
               }
-              $self->{'macros'}->{$name} = {
-                'element' => $current,
-                'macrobody' => $macrobody
-              } unless ($current->{'extra'}->{'invalid_syntax'});
+              if (!$current->{'extra'}->{'invalid_syntax'}) {
+                $self->{'macros'}->{$name} = {
+                  'element' => $current,
+                  'macrobody' => $macrobody
+                };
+                # Don't need 'args_index' in final tree.
+                if (defined $current->{'extra'}->{'args_index'}) {
+                  $self->{'macros'}->{$name}->{'args_index'}
+                                       = $current->{'extra'}->{'args_index'};
+                  delete $current->{'extra'}->{'args_index'};
+                }
+              }
             }
           }
           $current = $current->{'parent'};
@@ -6426,8 +6434,7 @@
    'args' => [{'text' => 'mymacro', 'type' => 'macro_name'},
               {'text' => 'arg', 'type' => 'macro_arg}],
    'contents' => [{'text' => "coucou \arg\ after arg\n", 'type' => 'raw'}],
-   'extra' => {'arg_line' => " mymacro{arg}\n",
-               'macrobody' => "coucou \arg\ after arg\n"}}
+   'extra' => {'arg_line' => " mymacro{arg}\n", }}
 
 = item merged_indices
 
@@ -6998,10 +7005,7 @@
 =item C<@macro>
 
 I<invalid_syntax> is set if there was an error on the C<@macro>
-line.  The key I<args_index> associates format arguments with
-their index on the @macro line formal arguments definition.
-The I<macrobody> holds the @macro body.  I<arg_line> holds the
-line after C<@macro>.
+line.  I<arg_line> holds the line after C<@macro>.
 
 =item C<@node>
 

Modified: trunk/tp/t/results/include/macro_in_early_commands.pl
===================================================================
--- trunk/tp/t/results/include/macro_in_early_commands.pl       2016-04-24 
14:16:21 UTC (rev 7132)
+++ trunk/tp/t/results/include/macro_in_early_commands.pl       2016-04-24 
14:45:07 UTC (rev 7133)
@@ -82,9 +82,6 @@
           'extra' => {
             'arg_line' => ' end-file-name {ext}
 ',
-            'args_index' => {
-              'ext' => 0
-            },
             'spaces_after_command' => {
               'extra' => {
                 'command' => {}

Modified: trunk/tp/t/results/macro/arg_body_expansion_order.pl
===================================================================
--- trunk/tp/t/results/macro/arg_body_expansion_order.pl        2016-04-24 
14:16:21 UTC (rev 7132)
+++ trunk/tp/t/results/macro/arg_body_expansion_order.pl        2016-04-24 
14:45:07 UTC (rev 7133)
@@ -129,9 +129,6 @@
       'extra' => {
         'arg_line' => ' redefineothermacro {arg}
 ',
-        'args_index' => {
-          'arg' => 0
-        },
         'spaces_after_command' => {
           'extra' => {
             'command' => {}

Modified: trunk/tp/t/results/macro/arg_not_closed.pl
===================================================================
--- trunk/tp/t/results/macro/arg_not_closed.pl  2016-04-24 14:16:21 UTC (rev 
7132)
+++ trunk/tp/t/results/macro/arg_not_closed.pl  2016-04-24 14:45:07 UTC (rev 
7133)
@@ -37,9 +37,6 @@
       'extra' => {
         'arg_line' => ' foo {arg}
 ',
-        'args_index' => {
-          'arg' => 0
-        },
         'spaces_after_command' => {
           'extra' => {
             'command' => {}

Modified: trunk/tp/t/results/macro/backslash_in_arg.pl
===================================================================
--- trunk/tp/t/results/macro/backslash_in_arg.pl        2016-04-24 14:16:21 UTC 
(rev 7132)
+++ trunk/tp/t/results/macro/backslash_in_arg.pl        2016-04-24 14:45:07 UTC 
(rev 7133)
@@ -77,9 +77,6 @@
           'extra' => {
             'arg_line' => ' funindex {TEXT}
 ',
-            'args_index' => {
-              'TEXT' => 0
-            },
             'spaces_after_command' => {
               'extra' => {
                 'command' => {}

Modified: trunk/tp/t/results/macro/complex_argument.pl
===================================================================
--- trunk/tp/t/results/macro/complex_argument.pl        2016-04-24 14:16:21 UTC 
(rev 7132)
+++ trunk/tp/t/results/macro/complex_argument.pl        2016-04-24 14:45:07 UTC 
(rev 7133)
@@ -37,9 +37,6 @@
       'extra' => {
         'arg_line' => ' macrotwo{arg}
 ',
-        'args_index' => {
-          'arg' => 0
-        },
         'spaces_after_command' => {
           'extra' => {
             'command' => {}
@@ -172,10 +169,6 @@
       'extra' => {
         'arg_line' => ' macrothree{text, arg}
 ',
-        'args_index' => {
-          'arg' => 1,
-          'text' => 0
-        },
         'spaces_after_command' => {
           'extra' => {
             'command' => {}
@@ -473,9 +466,6 @@
       'extra' => {
         'arg_line' => ' macroseven {truc}
 ',
-        'args_index' => {
-          'truc' => 0
-        },
         'spaces_after_command' => {
           'extra' => {
             'command' => {}

Modified: trunk/tp/t/results/macro/double_recursive_macro_call.pl
===================================================================
--- trunk/tp/t/results/macro/double_recursive_macro_call.pl     2016-04-24 
14:16:21 UTC (rev 7132)
+++ trunk/tp/t/results/macro/double_recursive_macro_call.pl     2016-04-24 
14:45:07 UTC (rev 7133)
@@ -43,9 +43,6 @@
       'extra' => {
         'arg_line' => ' macone {arg}
 ',
-        'args_index' => {
-          'arg' => 0
-        },
         'spaces_after_command' => {
           'extra' => {
             'command' => {}
@@ -100,9 +97,6 @@
       'extra' => {
         'arg_line' => ' mactwo{arg}
 ',
-        'args_index' => {
-          'arg' => 0
-        },
         'spaces_after_command' => {
           'extra' => {
             'command' => {}

Modified: trunk/tp/t/results/macro/empty_end.pl
===================================================================
--- trunk/tp/t/results/macro/empty_end.pl       2016-04-24 14:16:21 UTC (rev 
7132)
+++ trunk/tp/t/results/macro/empty_end.pl       2016-04-24 14:45:07 UTC (rev 
7133)
@@ -37,9 +37,6 @@
       'extra' => {
         'arg_line' => ' foo {aaa, }
 ',
-        'args_index' => {
-          'aaa' => 0
-        },
         'spaces_after_command' => {
           'extra' => {
             'command' => {}

Modified: trunk/tp/t/results/macro/expand_two_same.pl
===================================================================
--- trunk/tp/t/results/macro/expand_two_same.pl 2016-04-24 14:16:21 UTC (rev 
7132)
+++ trunk/tp/t/results/macro/expand_two_same.pl 2016-04-24 14:45:07 UTC (rev 
7133)
@@ -43,9 +43,6 @@
       'extra' => {
         'arg_line' => ' macrotwo { arg }
 ',
-        'args_index' => {
-          'arg' => 0
-        },
         'spaces_after_command' => {
           'extra' => {
             'command' => {}

Modified: trunk/tp/t/results/macro/expansion_order.pl
===================================================================
--- trunk/tp/t/results/macro/expansion_order.pl 2016-04-24 14:16:21 UTC (rev 
7132)
+++ trunk/tp/t/results/macro/expansion_order.pl 2016-04-24 14:45:07 UTC (rev 
7133)
@@ -37,9 +37,6 @@
       'extra' => {
         'arg_line' => ' bidule{arg}
 ',
-        'args_index' => {
-          'arg' => 0
-        },
         'spaces_after_command' => {
           'extra' => {
             'command' => {}

Modified: trunk/tp/t/results/macro/form_feeds.pl
===================================================================
--- trunk/tp/t/results/macro/form_feeds.pl      2016-04-24 14:16:21 UTC (rev 
7132)
+++ trunk/tp/t/results/macro/form_feeds.pl      2016-04-24 14:45:07 UTC (rev 
7133)
@@ -42,10 +42,6 @@
       'extra' => {
         'arg_line' => ' mymacro{a, b}
 ',
-        'args_index' => {
-          'a' => 0,
-          'b' => 1
-        },
         'spaces_after_command' => {
           'extra' => {
             'command' => {}
@@ -100,9 +96,6 @@
       'extra' => {
         'arg_line' => ' oneargmacro{c}
 ',
-        'args_index' => {
-          'c' => 0
-        },
         'spaces_after_command' => {
           'extra' => {
             'command' => {}

Modified: trunk/tp/t/results/macro/ifclear_in_macro.pl
===================================================================
--- trunk/tp/t/results/macro/ifclear_in_macro.pl        2016-04-24 14:16:21 UTC 
(rev 7132)
+++ trunk/tp/t/results/macro/ifclear_in_macro.pl        2016-04-24 14:45:07 UTC 
(rev 7133)
@@ -49,9 +49,6 @@
       'extra' => {
         'arg_line' => ' note {arg}
 ',
-        'args_index' => {
-          'arg' => 0
-        },
         'spaces_after_command' => {
           'extra' => {
             'command' => {}

Modified: trunk/tp/t/results/macro/ifset_in_macro.pl
===================================================================
--- trunk/tp/t/results/macro/ifset_in_macro.pl  2016-04-24 14:16:21 UTC (rev 
7132)
+++ trunk/tp/t/results/macro/ifset_in_macro.pl  2016-04-24 14:45:07 UTC (rev 
7133)
@@ -49,9 +49,6 @@
       'extra' => {
         'arg_line' => ' note {arg}
 ',
-        'args_index' => {
-          'arg' => 0
-        },
         'spaces_after_command' => {
           'extra' => {
             'command' => {}

Modified: trunk/tp/t/results/macro/ifset_in_macro_set.pl
===================================================================
--- trunk/tp/t/results/macro/ifset_in_macro_set.pl      2016-04-24 14:16:21 UTC 
(rev 7132)
+++ trunk/tp/t/results/macro/ifset_in_macro_set.pl      2016-04-24 14:45:07 UTC 
(rev 7133)
@@ -49,9 +49,6 @@
       'extra' => {
         'arg_line' => ' note {arg}
 ',
-        'args_index' => {
-          'arg' => 0
-        },
         'spaces_after_command' => {
           'extra' => {
             'command' => {}

Modified: trunk/tp/t/results/macro/implicit_quoting_one_arg.pl
===================================================================
--- trunk/tp/t/results/macro/implicit_quoting_one_arg.pl        2016-04-24 
14:16:21 UTC (rev 7132)
+++ trunk/tp/t/results/macro/implicit_quoting_one_arg.pl        2016-04-24 
14:45:07 UTC (rev 7133)
@@ -43,9 +43,6 @@
       'extra' => {
         'arg_line' => ' FIXME{a}
 ',
-        'args_index' => {
-          'a' => 0
-        },
         'spaces_after_command' => {
           'extra' => {
             'command' => {}

Modified: trunk/tp/t/results/macro/implicit_quoting_recursion.pl
===================================================================
--- trunk/tp/t/results/macro/implicit_quoting_recursion.pl      2016-04-24 
14:16:21 UTC (rev 7132)
+++ trunk/tp/t/results/macro/implicit_quoting_recursion.pl      2016-04-24 
14:45:07 UTC (rev 7133)
@@ -42,10 +42,6 @@
       'extra' => {
         'arg_line' => ' cat{a,b}
 ',
-        'args_index' => {
-          'a' => 0,
-          'b' => 1
-        },
         'spaces_after_command' => {
           'extra' => {
             'command' => {}

Modified: trunk/tp/t/results/macro/macro_expands_to_empty.pl
===================================================================
--- trunk/tp/t/results/macro/macro_expands_to_empty.pl  2016-04-24 14:16:21 UTC 
(rev 7132)
+++ trunk/tp/t/results/macro/macro_expands_to_empty.pl  2016-04-24 14:45:07 UTC 
(rev 7133)
@@ -37,9 +37,6 @@
       'extra' => {
         'arg_line' => ' foo {arg}
 ',
-        'args_index' => {
-          'arg' => 0
-        },
         'spaces_after_command' => {
           'extra' => {
             'command' => {}

Modified: trunk/tp/t/results/macro/macro_expansion.pl
===================================================================
--- trunk/tp/t/results/macro/macro_expansion.pl 2016-04-24 14:16:21 UTC (rev 
7132)
+++ trunk/tp/t/results/macro/macro_expansion.pl 2016-04-24 14:45:07 UTC (rev 
7133)
@@ -66,10 +66,6 @@
       'extra' => {
         'arg_line' => ' macroone {arg1, arg2 }
 ',
-        'args_index' => {
-          'arg1' => 0,
-          'arg2' => 1
-        },
         'spaces_after_command' => {
           'extra' => {
             'command' => {}

Modified: trunk/tp/t/results/macro/macro_in_ifset.pl
===================================================================
--- trunk/tp/t/results/macro/macro_in_ifset.pl  2016-04-24 14:16:21 UTC (rev 
7132)
+++ trunk/tp/t/results/macro/macro_in_ifset.pl  2016-04-24 14:45:07 UTC (rev 
7133)
@@ -37,9 +37,6 @@
       'extra' => {
         'arg_line' => ' macroone {arg}
 ',
-        'args_index' => {
-          'arg' => 0
-        },
         'spaces_after_command' => {
           'extra' => {
             'command' => {}

Modified: trunk/tp/t/results/macro/macro_in_ifset_end_in_arg.pl
===================================================================
--- trunk/tp/t/results/macro/macro_in_ifset_end_in_arg.pl       2016-04-24 
14:16:21 UTC (rev 7132)
+++ trunk/tp/t/results/macro/macro_in_ifset_end_in_arg.pl       2016-04-24 
14:45:07 UTC (rev 7133)
@@ -37,9 +37,6 @@
       'extra' => {
         'arg_line' => ' macroone {arg}
 ',
-        'args_index' => {
-          'arg' => 0
-        },
         'spaces_after_command' => {
           'extra' => {
             'command' => {}

Modified: trunk/tp/t/results/macro/macro_in_macro_arg.pl
===================================================================
--- trunk/tp/t/results/macro/macro_in_macro_arg.pl      2016-04-24 14:16:21 UTC 
(rev 7132)
+++ trunk/tp/t/results/macro/macro_in_macro_arg.pl      2016-04-24 14:45:07 UTC 
(rev 7133)
@@ -92,9 +92,6 @@
       'extra' => {
         'arg_line' => ' macrotwo{arg}
 ',
-        'args_index' => {
-          'arg' => 0
-        },
         'spaces_after_command' => {
           'extra' => {
             'command' => {}
@@ -160,10 +157,6 @@
       'extra' => {
         'arg_line' => ' macrothree{text, arg}
 ',
-        'args_index' => {
-          'arg' => 1,
-          'text' => 0
-        },
         'spaces_after_command' => {
           'extra' => {
             'command' => {}

Modified: trunk/tp/t/results/macro/macro_in_macro_arg_simpler.pl
===================================================================
--- trunk/tp/t/results/macro/macro_in_macro_arg_simpler.pl      2016-04-24 
14:16:21 UTC (rev 7132)
+++ trunk/tp/t/results/macro/macro_in_macro_arg_simpler.pl      2016-04-24 
14:45:07 UTC (rev 7133)
@@ -97,10 +97,6 @@
       'extra' => {
         'arg_line' => ' macrothree{text, arg}
 ',
-        'args_index' => {
-          'arg' => 1,
-          'text' => 0
-        },
         'spaces_after_command' => {
           'extra' => {
             'command' => {}

Modified: trunk/tp/t/results/macro/macro_name_with_digit.pl
===================================================================
--- trunk/tp/t/results/macro/macro_name_with_digit.pl   2016-04-24 14:16:21 UTC 
(rev 7132)
+++ trunk/tp/t/results/macro/macro_name_with_digit.pl   2016-04-24 14:45:07 UTC 
(rev 7133)
@@ -86,9 +86,6 @@
       'extra' => {
         'arg_line' => ' macro11 {arg}
 ',
-        'args_index' => {
-          'arg' => 0
-        },
         'spaces_after_command' => {
           'extra' => {
             'command' => {}

Modified: trunk/tp/t/results/macro/macro_name_with_hyphen.pl
===================================================================
--- trunk/tp/t/results/macro/macro_name_with_hyphen.pl  2016-04-24 14:16:21 UTC 
(rev 7132)
+++ trunk/tp/t/results/macro/macro_name_with_hyphen.pl  2016-04-24 14:45:07 UTC 
(rev 7133)
@@ -42,10 +42,6 @@
       'extra' => {
         'arg_line' => ' macro-one {arg-one, arg2}
 ',
-        'args_index' => {
-          'arg-one' => 0,
-          'arg2' => 1
-        },
         'spaces_after_command' => {
           'extra' => {
             'command' => {}

Modified: trunk/tp/t/results/macro/macro_one_arg_end_of_file.pl
===================================================================
--- trunk/tp/t/results/macro/macro_one_arg_end_of_file.pl       2016-04-24 
14:16:21 UTC (rev 7132)
+++ trunk/tp/t/results/macro/macro_one_arg_end_of_file.pl       2016-04-24 
14:45:07 UTC (rev 7133)
@@ -37,9 +37,6 @@
       'extra' => {
         'arg_line' => ' onearg{arg}
 ',
-        'args_index' => {
-          'arg' => 0
-        },
         'spaces_after_command' => {
           'extra' => {
             'command' => {}

Modified: trunk/tp/t/results/macro/macro_with_error_at_end_line_after_macro.pl
===================================================================
--- trunk/tp/t/results/macro/macro_with_error_at_end_line_after_macro.pl        
2016-04-24 14:16:21 UTC (rev 7132)
+++ trunk/tp/t/results/macro/macro_with_error_at_end_line_after_macro.pl        
2016-04-24 14:45:07 UTC (rev 7133)
@@ -37,9 +37,6 @@
       'extra' => {
         'arg_line' => ' witherror{string}
 ',
-        'args_index' => {
-          'string' => 0
-        },
         'spaces_after_command' => {
           'extra' => {
             'command' => {}

Modified: trunk/tp/t/results/macro/no_macrobody.pl
===================================================================
--- trunk/tp/t/results/macro/no_macrobody.pl    2016-04-24 14:16:21 UTC (rev 
7132)
+++ trunk/tp/t/results/macro/no_macrobody.pl    2016-04-24 14:45:07 UTC (rev 
7133)
@@ -25,9 +25,6 @@
       'extra' => {
         'arg_line' => ' nomacrobody {arg}
 ',
-        'args_index' => {
-          'arg' => 0
-        },
         'spaces_after_command' => {
           'extra' => {
             'command' => {}

Modified: trunk/tp/t/results/macro/protect_comma_macro_line.pl
===================================================================
--- trunk/tp/t/results/macro/protect_comma_macro_line.pl        2016-04-24 
14:16:21 UTC (rev 7132)
+++ trunk/tp/t/results/macro/protect_comma_macro_line.pl        2016-04-24 
14:45:07 UTC (rev 7133)
@@ -55,9 +55,6 @@
       'extra' => {
         'arg_line' => ' macrotwo { arg }
 ',
-        'args_index' => {
-          'arg' => 0
-        },
         'spaces_after_command' => {
           'extra' => {
             'command' => {}

Modified: trunk/tp/t/results/macro/protect_in_body.pl
===================================================================
--- trunk/tp/t/results/macro/protect_in_body.pl 2016-04-24 14:16:21 UTC (rev 
7132)
+++ trunk/tp/t/results/macro/protect_in_body.pl 2016-04-24 14:45:07 UTC (rev 
7133)
@@ -42,10 +42,6 @@
       'extra' => {
         'arg_line' => ' macroone { arg1 , arg2 }
 ',
-        'args_index' => {
-          'arg1' => 0,
-          'arg2' => 1
-        },
         'spaces_after_command' => {
           'extra' => {
             'command' => {}

Modified: trunk/tp/t/results/macro/protect_in_body_line_arg.pl
===================================================================
--- trunk/tp/t/results/macro/protect_in_body_line_arg.pl        2016-04-24 
14:16:21 UTC (rev 7132)
+++ trunk/tp/t/results/macro/protect_in_body_line_arg.pl        2016-04-24 
14:45:07 UTC (rev 7133)
@@ -42,10 +42,6 @@
       'extra' => {
         'arg_line' => ' macroone { arg1 , arg2 }
 ',
-        'args_index' => {
-          'arg1' => 0,
-          'arg2' => 1
-        },
         'spaces_after_command' => {
           'extra' => {
             'command' => {}

Modified: trunk/tp/t/results/macro/protect_in_body_one_arg.pl
===================================================================
--- trunk/tp/t/results/macro/protect_in_body_one_arg.pl 2016-04-24 14:16:21 UTC 
(rev 7132)
+++ trunk/tp/t/results/macro/protect_in_body_one_arg.pl 2016-04-24 14:45:07 UTC 
(rev 7133)
@@ -42,10 +42,6 @@
       'extra' => {
         'arg_line' => ' macroone { arg1 , arg2 }
 ',
-        'args_index' => {
-          'arg1' => 0,
-          'arg2' => 1
-        },
         'spaces_after_command' => {
           'extra' => {
             'command' => {}

Modified: trunk/tp/t/results/macro/recursive_call_in_argument.pl
===================================================================
--- trunk/tp/t/results/macro/recursive_call_in_argument.pl      2016-04-24 
14:16:21 UTC (rev 7132)
+++ trunk/tp/t/results/macro/recursive_call_in_argument.pl      2016-04-24 
14:45:07 UTC (rev 7133)
@@ -37,9 +37,6 @@
       'extra' => {
         'arg_line' => ' anorecurse{arg}
 ',
-        'args_index' => {
-          'arg' => 0
-        },
         'spaces_after_command' => {
           'extra' => {
             'command' => {}

Modified: trunk/tp/t/results/macro/recursive_call_in_macro.pl
===================================================================
--- trunk/tp/t/results/macro/recursive_call_in_macro.pl 2016-04-24 14:16:21 UTC 
(rev 7132)
+++ trunk/tp/t/results/macro/recursive_call_in_macro.pl 2016-04-24 14:45:07 UTC 
(rev 7133)
@@ -37,9 +37,6 @@
       'extra' => {
         'arg_line' => ' anorecurse{arg}
 ',
-        'args_index' => {
-          'arg' => 0
-        },
         'spaces_after_command' => {
           'extra' => {
             'command' => {}

Modified: trunk/tp/t/results/macro/redefine_texinfo_macro.pl
===================================================================
--- trunk/tp/t/results/macro/redefine_texinfo_macro.pl  2016-04-24 14:16:21 UTC 
(rev 7132)
+++ trunk/tp/t/results/macro/redefine_texinfo_macro.pl  2016-04-24 14:45:07 UTC 
(rev 7133)
@@ -37,9 +37,6 @@
       'extra' => {
         'arg_line' => ' code{arg}
 ',
-        'args_index' => {
-          'arg' => 0
-        },
         'spaces_after_command' => {
           'extra' => {
             'command' => {}

Modified: trunk/tp/t/results/macro/too_much_args.pl
===================================================================
--- trunk/tp/t/results/macro/too_much_args.pl   2016-04-24 14:16:21 UTC (rev 
7132)
+++ trunk/tp/t/results/macro/too_much_args.pl   2016-04-24 14:45:07 UTC (rev 
7133)
@@ -48,10 +48,6 @@
       'extra' => {
         'arg_line' => ' twoargs {first, second}
 ',
-        'args_index' => {
-          'first' => 0,
-          'second' => 1
-        },
         'spaces_after_command' => {
           'extra' => {
             'command' => {}

Modified: trunk/tp/t/results/macro/two_macros_on_a_line.pl
===================================================================
--- trunk/tp/t/results/macro/two_macros_on_a_line.pl    2016-04-24 14:16:21 UTC 
(rev 7132)
+++ trunk/tp/t/results/macro/two_macros_on_a_line.pl    2016-04-24 14:45:07 UTC 
(rev 7133)
@@ -98,9 +98,6 @@
       'extra' => {
         'arg_line' => ' mymacrowithargs{arg}
 ',
-        'args_index' => {
-          'arg' => 0
-        },
         'spaces_after_command' => {
           'extra' => {
             'command' => {}

Modified: trunk/tp/t/results/misc_commands/test_allowcodebreaks.pl
===================================================================
--- trunk/tp/t/results/misc_commands/test_allowcodebreaks.pl    2016-04-24 
14:16:21 UTC (rev 7132)
+++ trunk/tp/t/results/misc_commands/test_allowcodebreaks.pl    2016-04-24 
14:45:07 UTC (rev 7133)
@@ -107,9 +107,6 @@
           'extra' => {
             'arg_line' => ' testallowcodebreakspara {nr}
 ',
-            'args_index' => {
-              'nr' => 0
-            },
             'spaces_after_command' => {
               'extra' => {
                 'command' => {}

Modified: trunk/tp/t/results/raw/nested_macros.pl
===================================================================
--- trunk/tp/t/results/raw/nested_macros.pl     2016-04-24 14:16:21 UTC (rev 
7132)
+++ trunk/tp/t/results/raw/nested_macros.pl     2016-04-24 14:45:07 UTC (rev 
7133)
@@ -87,10 +87,6 @@
       'extra' => {
         'arg_line' => ' truc   { arg,  ex}
 ',
-        'args_index' => {
-          'arg' => 0,
-          'ex' => 1
-        },
         'spaces_after_command' => {
           'extra' => {
             'command' => {}

Modified: trunk/tp/t/results/value_and_macro/comma_value_in_macro_arg.pl
===================================================================
--- trunk/tp/t/results/value_and_macro/comma_value_in_macro_arg.pl      
2016-04-24 14:16:21 UTC (rev 7132)
+++ trunk/tp/t/results/value_and_macro/comma_value_in_macro_arg.pl      
2016-04-24 14:45:07 UTC (rev 7133)
@@ -72,10 +72,6 @@
       'extra' => {
         'arg_line' => ' macro1 { arg1 , arg2 }
 ',
-        'args_index' => {
-          'arg1' => 0,
-          'arg2' => 1
-        },
         'spaces_after_command' => {
           'extra' => {
             'command' => {}

Modified: trunk/tp/t/results/value_and_macro/value_in_macro_body.pl
===================================================================
--- trunk/tp/t/results/value_and_macro/value_in_macro_body.pl   2016-04-24 
14:16:21 UTC (rev 7132)
+++ trunk/tp/t/results/value_and_macro/value_in_macro_body.pl   2016-04-24 
14:45:07 UTC (rev 7133)
@@ -67,9 +67,6 @@
       'extra' => {
         'arg_line' => ' testvaluebody { arg }
 ',
-        'args_index' => {
-          'arg' => 0
-        },
         'spaces_after_command' => {
           'extra' => {
             'command' => {}

Modified: trunk/tp/t/results/xml_tests/macro_and_args.pl
===================================================================
--- trunk/tp/t/results/xml_tests/macro_and_args.pl      2016-04-24 14:16:21 UTC 
(rev 7132)
+++ trunk/tp/t/results/xml_tests/macro_and_args.pl      2016-04-24 14:45:07 UTC 
(rev 7133)
@@ -30,10 +30,6 @@
       'extra' => {
         'arg_line' => ' good { aaa, 2b-bb}
 ',
-        'args_index' => {
-          '2b-bb' => 1,
-          'aaa' => 0
-        },
         'spaces_after_command' => {
           'extra' => {
             'command' => {}




reply via email to

[Prev in Thread] Current Thread [Next in Thread]