[7522] permit _ in macro name

[gavinsmith0123]

Revision: 7522
          http://svn.sv.gnu.org/viewvc/?view=rev&root=texinfo&revision=7522
Author:   gavin
Date:     2016-11-20 16:45:15 +0000 (Sun, 20 Nov 2016)
Log Message:
-----------
permit _ in macro name

Modified Paths:
--------------
    trunk/ChangeLog
    trunk/tp/Texinfo/Parser.pm
    trunk/tp/t/results/macro/bad_macro_name_with_underscore.pl

Modified: trunk/ChangeLog
===================================================================
--- trunk/ChangeLog     2016-11-20 16:36:27 UTC (rev 7521)
+++ trunk/ChangeLog     2016-11-20 16:45:15 UTC (rev 7522)
@@ -1,5 +1,10 @@
 2016-11-20  Gavin Smith  <address@hidden>
 
+       * tp/Texinfo/Parser.pm (_parse_macro_command_line): Permit _ in 
+       macro name.
+
+2016-11-20  Gavin Smith  <address@hidden>
+
        * tp/Texinfo/Parser.pm (_parse_special_misc_command) <@set>: 
        Treat form feed characters the same as any other whitespace.
 

Modified: trunk/tp/Texinfo/Parser.pm
===================================================================
--- trunk/tp/Texinfo/Parser.pm  2016-11-20 16:36:27 UTC (rev 7521)
+++ trunk/tp/Texinfo/Parser.pm  2016-11-20 16:45:15 UTC (rev 7522)
@@ -1158,7 +1158,7 @@
   my $macro = { 'cmdname' => $command, 'parent' => $parent, 'contents' => [],
                'extra' => {'arg_line' => $line}, 'line_nr' => $line_nr };
   # REMACRO
-  if ($line =~ /^\s+([[:alnum:]][[:alnum:]-]*)\s*(.*)/) {
+  if ($line =~ /^\s+([[:alnum:]][[:alnum:]-_]*)\s*(.*)/) {
     my $macro_name = $1;
     my $args_def = $2;
     my @args;

Modified: trunk/tp/t/results/macro/bad_macro_name_with_underscore.pl
===================================================================
--- trunk/tp/t/results/macro/bad_macro_name_with_underscore.pl  2016-11-20 
16:36:27 UTC (rev 7521)
+++ trunk/tp/t/results/macro/bad_macro_name_with_underscore.pl  2016-11-20 
16:45:15 UTC (rev 7522)
@@ -11,8 +11,18 @@
       'args' => [
         {
           'parent' => {},
-          'text' => 'the',
+          'text' => 'the_macro',
           'type' => 'macro_name'
+        },
+        {
+          'parent' => {},
+          'text' => 'arg1',
+          'type' => 'macro_arg'
+        },
+        {
+          'parent' => {},
+          'text' => 'arg2',
+          'type' => 'macro_arg'
         }
       ],
       'cmdname' => 'macro',
@@ -31,8 +41,7 @@
       ],
       'extra' => {
         'arg_line' => ' the_macro {arg1, arg2}
-',
-        'invalid_syntax' => 1
+'
       },
       'line_nr' => {
         'file_name' => '',
@@ -54,6 +63,8 @@
   'type' => 'text_root'
 };
 
$result_trees{'bad_macro_name_with_underscore'}{'contents'}[0]{'args'}[0]{'parent'}
 = $result_trees{'bad_macro_name_with_underscore'}{'contents'}[0];
+$result_trees{'bad_macro_name_with_underscore'}{'contents'}[0]{'args'}[1]{'parent'}
 = $result_trees{'bad_macro_name_with_underscore'}{'contents'}[0];
+$result_trees{'bad_macro_name_with_underscore'}{'contents'}[0]{'args'}[2]{'parent'}
 = $result_trees{'bad_macro_name_with_underscore'}{'contents'}[0];
 
$result_trees{'bad_macro_name_with_underscore'}{'contents'}[0]{'contents'}[0]{'parent'}
 = $result_trees{'bad_macro_name_with_underscore'}{'contents'}[0];
 
$result_trees{'bad_macro_name_with_underscore'}{'contents'}[0]{'contents'}[1]{'parent'}
 = $result_trees{'bad_macro_name_with_underscore'}{'contents'}[0];
 $result_trees{'bad_macro_name_with_underscore'}{'contents'}[0]{'parent'} = 
$result_trees{'bad_macro_name_with_underscore'};
@@ -68,17 +79,7 @@
 
 $result_texts{'bad_macro_name_with_underscore'} = '';
 
-$result_errors{'bad_macro_name_with_underscore'} = [
-  {
-    'error_line' => ':1: bad syntax for @macro argument: _macro {arg1, arg2}
-',
-    'file_name' => '',
-    'line_nr' => 1,
-    'macro' => '',
-    'text' => 'bad syntax for @macro argument: _macro {arg1, arg2}',
-    'type' => 'error'
-  }
-];
+$result_errors{'bad_macro_name_with_underscore'} = [];
 
 
 1;