[SCM] GNU M4 source repository branch, master, updated. cvs-readonly-72-g47f7469

[Gary V. Vaughan]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "GNU M4 source repository".

http://git.sv.gnu.org/gitweb/?p=m4.git;a=commitdiff;h=47f7469edbec86cf88d98f448c58ce1916bab812

The branch, master has been updated
       via  47f7469edbec86cf88d98f448c58ce1916bab812 (commit)
      from  def1f82375ed7f310bdd8d8e1ce0c2cd9c64e2c6 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit 47f7469edbec86cf88d98f448c58ce1916bab812
Author: Gary V. Vaughan <address@hidden>
Date:   Fri Feb 22 00:15:28 2008 +0800

    Fix regression in argument collection, from 2008-01-21.
    
    * m4/input.c (m4__next_token): When DEBUG_INPUT is defined,
    undo argument collection optimisation for strings, so that
    m4_print_token doesn't abort when it otherwise receives an
    unprintable M4_SYMBOL_VOID type token.

-----------------------------------------------------------------------

Summary of changes:
 ChangeLog  |    8 ++++++++
 m4/input.c |    9 +++++++++
 2 files changed, 17 insertions(+), 0 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index b5ae203..abec593 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2008-02-22  Gary V. Vaughan  <address@hidden>
+
+       Fix regression in argument collection, from 2008-01-21.
+       * m4/input.c (m4__next_token): When DEBUG_INPUT is defined,
+       undo argument collection optimisation for strings, so that
+       m4_print_token doesn't abort when it otherwise receives an
+       unprintable M4_SYMBOL_VOID type token.
+
 2008-02-20  Eric Blake  <address@hidden>
 
        Stage 16: cache quotes and improve m4_arg_print.
diff --git a/m4/input.c b/m4/input.c
index 381f38d..fdfccc8 100644
--- a/m4/input.c
+++ b/m4/input.c
@@ -1746,6 +1746,15 @@ m4__next_token (m4 *context, m4_symbol_value *token, int 
*line,
   VALUE_MAX_ARGS (token) = -1;
 
 #ifdef DEBUG_INPUT
+  if (token->type == M4_SYMBOL_VOID)
+    {
+      len = obstack_object_size (&token_stack);
+      obstack_1grow (&token_stack, '\0');
+
+      m4_set_symbol_value_text (token, obstack_finish (&token_stack), len,
+                               m4__quote_age (M4SYNTAX));
+    }
+
   m4_print_token (context, "next_token", type, token);
 #endif
 


hooks/post-receive
--
GNU M4 source repository