index b5ae203ab8061e396e8c980a57bab6fc3a3001cb..abec593751d9333da338da939aafebd7d8d95a53 100644 (file)
+2008年02月22日 Gary V. Vaughan <gary@gnu.org>
+
+ 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 <ebb9@byu.net>
Stage 16: cache quotes and improve m4_arg_print.
index 381f38d588c59aec640359a33c74bf850adc02b6..fdfccc811ecedb7f699717acad38ce47d37fe90e 100644 (file)
@@ -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