[7197] change order of error messges

[gavinsmith0123]

Revision: 7197
          http://svn.sv.gnu.org/viewvc/?view=rev&root=texinfo&revision=7197
Author:   gavin
Date:     2016-05-29 17:17:18 +0000 (Sun, 29 May 2016)
Log Message:
-----------
change order of error messges

Modified Paths:
--------------
    trunk/ChangeLog
    trunk/tp/Texinfo/Parser.pm
    trunk/tp/t/results/value_and_macro/value_in_macro_formal_arg.pl

Modified: trunk/ChangeLog
===================================================================
--- trunk/ChangeLog     2016-05-29 14:53:07 UTC (rev 7196)
+++ trunk/ChangeLog     2016-05-29 17:17:18 UTC (rev 7197)
@@ -1,5 +1,10 @@
 2016-05-29  Gavin Smith  <address@hidden>
 
+       * tp/Texinfo/Parser.pm (_parse_macro_command_line): Order of 
+       error messages changed.
+
+2016-05-29  Gavin Smith  <address@hidden>
+
        * tp/Texinfo/Parser.pm (_parse_texi) <@acronym, @abbr>: Don't
        set 'explained_commands' hash or 'explanation_contents' extra 
        value on elements.

Modified: trunk/tp/Texinfo/Parser.pm
===================================================================
--- trunk/tp/Texinfo/Parser.pm  2016-05-29 14:53:07 UTC (rev 7196)
+++ trunk/tp/Texinfo/Parser.pm  2016-05-29 17:17:18 UTC (rev 7197)
@@ -1177,14 +1177,6 @@
       @args = split(/\s*,\s*/, $1);
     }
  
-    # accept an @-command after the arguments in case there is a @c or
-    # @comment
-    if ($args_def =~ /address@hidden/) {
-      $self->line_error(sprintf($self->__("bad syntax for address@hidden 
argument: %s"), 
-                                 $command, $args_def),
-                        $line_nr);
-      $macro->{'extra'}->{'invalid_syntax'} = 1;
-    }
     print STDERR "MACRO address@hidden $macro_name\n" if ($self->{'DEBUG'});
 
     $macro->{'args'} = [ 
@@ -1203,6 +1195,14 @@
       $macro->{'extra'}->{'args_index'}->{$formal_arg} = $index;
       $index++;
     }
+    # accept an @-command after the arguments in case there is a @c or
+    # @comment
+    if ($args_def =~ /address@hidden/) {
+      $self->line_error(sprintf($self->__("bad syntax for address@hidden 
argument: %s"), 
+                                 $command, $args_def),
+                        $line_nr);
+      $macro->{'extra'}->{'invalid_syntax'} = 1;
+    }
   } elsif ($line !~ /\S/) {
     $self->line_error(sprintf($self->
                     __("%c%s requires a name"), ord('@'), $command), $line_nr);

Modified: trunk/tp/t/results/value_and_macro/value_in_macro_formal_arg.pl
===================================================================
--- trunk/tp/t/results/value_and_macro/value_in_macro_formal_arg.pl     
2016-05-29 14:53:07 UTC (rev 7196)
+++ trunk/tp/t/results/value_and_macro/value_in_macro_formal_arg.pl     
2016-05-29 17:17:18 UTC (rev 7197)
@@ -145,21 +145,21 @@
 
 $result_errors{'value_in_macro_formal_arg'} = [
   {
-    'error_line' => ':3: bad syntax for @macro argument: }
+    'error_line' => ':3: bad or empty @macro formal argument: address@hidden
 ',
     'file_name' => '',
     'line_nr' => 3,
     'macro' => '',
-    'text' => 'bad syntax for @macro argument: }',
+    'text' => 'bad or empty @macro formal argument: address@hidden',
     'type' => 'error'
   },
   {
-    'error_line' => ':3: bad or empty @macro formal argument: address@hidden
+    'error_line' => ':3: bad syntax for @macro argument: }
 ',
     'file_name' => '',
     'line_nr' => 3,
     'macro' => '',
-    'text' => 'bad or empty @macro formal argument: address@hidden',
+    'text' => 'bad syntax for @macro argument: }',
     'type' => 'error'
   },
   {