Changes to m4/m4/macro.c,v

[Eric Blake]

CVSROOT:        /sources/m4
Module name:    m4
Changes by:     Eric Blake <ericb>      06/09/27 13:21:05

Index: m4/macro.c
===================================================================
RCS file: /sources/m4/m4/m4/macro.c,v
retrieving revision 1.54
retrieving revision 1.55
diff -u -b -r1.54 -r1.55
--- m4/macro.c  27 Sep 2006 12:24:53 -0000      1.54
+++ m4/macro.c  27 Sep 2006 13:21:05 -0000      1.55
@@ -608,45 +608,25 @@
           int argc, m4_symbol_value **argv)
 {
   int i;
-  const m4_builtin *bp;
 
   trace_header (context, id);
   trace_format (context, "%s", name);
 
   if ((argc > 1) && m4_is_debug_bit (context, M4_DEBUG_TRACE_ARGS))
     {
-      trace_format (context, "(");
+      bool quote = m4_is_debug_bit (context, M4_DEBUG_TRACE_QUOTE);
+      const char *lquote = m4_get_syntax_lquote (M4SYNTAX);
+      const char *rquote = m4_get_syntax_rquote (M4SYNTAX);
+      size_t arg_length = m4_get_max_debug_arg_length_opt (context);
 
+      trace_format (context, "(");
       for (i = 1; i < argc; i++)
        {
          if (i != 1)
            trace_format (context, ", ");
 
-         if (m4_is_symbol_value_text (argv[i]))
-           {
-             trace_format (context, "%l%S%r", M4ARG (i));
-           }
-         else if (m4_is_symbol_value_func (argv[i]))
-           {
-             bp = m4_builtin_find_by_func (NULL,
-                                           m4_get_symbol_value_func(argv[i]));
-             if (bp == NULL)
-               {
-                 assert (!"INTERNAL ERROR: builtin not found in table!");
-                 abort ();
-               }
-             trace_format (context, "<%s>", bp->name);
-           }
-         else if (m4_is_symbol_value_placeholder (argv[i]))
-           {
-             trace_format (context, "<placeholder for %s>",
-                           m4_get_symbol_value_placeholder (argv[i]));
-           }
-         else
-           {
-             assert (!"INTERNAL ERROR: bad token data type (trace_pre ())");
-             abort ();
-           }
+         m4_symbol_value_print (argv[i], &context->trace_messages,
+                                quote, lquote, rquote, arg_length);
        }
       trace_format (context, ")");
     }