texinfo/tp texi2any.pl Texinfo/Parser.pm

[Patrice Dumas]

CVSROOT:        /sources/texinfo
Module name:    texinfo
Changes by:     Patrice Dumas <pertusus>        11/02/23 22:53:22

Modified files:
        tp             : texi2any.pl 
        tp/Texinfo     : Parser.pm 

Log message:
        Better names and messages, thanks Karl.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/texi2any.pl?cvsroot=texinfo&r1=1.18&r2=1.19
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/Texinfo/Parser.pm?cvsroot=texinfo&r1=1.207&r2=1.208

Patches:
Index: texi2any.pl
===================================================================
RCS file: /sources/texinfo/texinfo/tp/texi2any.pl,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -b -r1.18 -r1.19
--- texi2any.pl 23 Feb 2011 22:12:29 -0000      1.18
+++ texi2any.pl 23 Feb 2011 22:53:22 -0000      1.19
@@ -218,7 +218,7 @@
   'PROGRAM_NAME_IN_FOOTER', 'NODE_FILENAMES', 'DEFAULT_ENCODING',
   'OUT_ENCODING', 'ENCODING_NAME', 'EXTERNAL_CROSSREF_SPLIT', 'BODYTEXT',
   'CSS_LINES', 'RENAMED_NODES_REDIRECTIONS', 'RENAMED_NODES_FILE',
-  'TEXI2DVI', 'DUMP_TREE', 'MAX_NESTED_MACROS');
+  'TEXI2DVI', 'DUMP_TREE', 'MAX_MACRO_CALL_NESTING');
 
 my %valid_options;
 foreach my $var (@document_settable_at_commands, @document_global_at_commands,
@@ -555,8 +555,8 @@
     unless (grep {$_ eq $format} 
@{$parser_default_options->{'expanded_formats'}});
 }
 
-$parser_default_options->{'MAX_NESTED_MACROS'} = get_conf('MAX_NESTED_MACROS') 
-  if (defined(get_conf('MAX_NESTED_MACROS')));
+$parser_default_options->{'MAX_MACRO_CALL_NESTING'} = 
get_conf('MAX_MACRO_CALL_NESTING') 
+  if (defined(get_conf('MAX_MACRO_CALL_NESTING')));
 
 
 

Index: Texinfo/Parser.pm
===================================================================
RCS file: /sources/texinfo/texinfo/tp/Texinfo/Parser.pm,v
retrieving revision 1.207
retrieving revision 1.208
diff -u -b -r1.207 -r1.208
--- Texinfo/Parser.pm   23 Feb 2011 22:12:29 -0000      1.207
+++ Texinfo/Parser.pm   23 Feb 2011 22:53:22 -0000      1.208
@@ -247,7 +247,7 @@
                               # Current documentlanguage set by 
                               # @documentlanguage
   'ENABLE_ENCODING' => 1,     # corresponds to --enable-encoding.
-  'MAX_NESTED_MACROS' => 100000, # max number of nested macro calls
+  'MAX_MACRO_CALL_NESTING' => 100000, # max number of nested macro calls
 );
 
 # The commands in initialization_overrides are not set in the document if
@@ -2828,10 +2828,10 @@
         if ($expanded eq '') {
           next;
         }
-        if ($self->{'MAX_NESTED_MACROS'}
-            and scalar(@{$self->{'macro_stack'}}) > 
$self->{'MAX_NESTED_MACROS'}) {
+        if ($self->{'MAX_MACRO_CALL_NESTING'}
+            and scalar(@{$self->{'macro_stack'}}) > 
$self->{'MAX_MACRO_CALL_NESTING'}) {
           $self->line_warn (sprintf($self->
-              __("Too many nested macro call (if correct, set 
MAX_NESTED_MACROS, now set to %d)"), $self->{'MAX_NESTED_MACROS'}), $line_nr);
+              __("Macro call nested too deeply (set MAX_NESTED_MACROS to 
override; current value %d)"), $self->{'MAX_MACRO_CALL_NESTING'}), $line_nr);
           next;
         }
         if ($expanded_macro->{'cmdname'} eq 'macro') {