Changes to m4/m4/input.c,v

[Eric Blake]

CVSROOT:        /sources/m4
Module name:    m4
Changes by:     Eric Blake <ericb>      06/10/12 23:21:34

Index: m4/input.c
===================================================================
RCS file: /sources/m4/m4/m4/input.c,v
retrieving revision 1.51
retrieving revision 1.52
diff -u -b -r1.51 -r1.52
--- m4/input.c  12 Oct 2006 21:14:50 -0000      1.51
+++ m4/input.c  12 Oct 2006 23:21:34 -0000      1.52
@@ -104,6 +104,10 @@
 static void    unget_input             (int);
 static bool    consume_syntax          (m4 *, m4_obstack *, unsigned int);
 
+#ifdef DEBUG_INPUT
+static int m4_print_token (const char *, m4__token_type, m4_symbol_value *);
+#endif
+
 struct input_funcs
 {
   /* Peek at input, return CHAR_RETRY if none available.  */
@@ -1192,37 +1196,46 @@
 int
 m4_print_token (const char *s, m4__token_type type, m4_symbol_value *token)
 {
-  fprintf (stderr, "%s: ", s);
+  fprintf (stderr, "%s: ", s ? s : "m4input");
   switch (type)
     {                          /* TOKSW */
-    case M4_TOKEN_SIMPLE:
-      fprintf (stderr, "char\t\"%s\"\n",       m4_get_symbol_value_text 
(token));
+    case M4_TOKEN_EOF:
+      fprintf (stderr, "eof\n");
       break;
-
-    case M4_TOKEN_WORD:
-      fprintf (stderr, "word\t\"%s\"\n",       m4_get_symbol_value_text 
(token));
+    case M4_TOKEN_NONE:
+      fprintf (stderr, "none\n");
       break;
-
     case M4_TOKEN_STRING:
       fprintf (stderr, "string\t\"%s\"\n",     m4_get_symbol_value_text 
(token));
       break;
-
     case M4_TOKEN_SPACE:
       fprintf (stderr, "space\t\"%s\"\n",      m4_get_symbol_value_text 
(token));
       break;
-
-    case M4_TOKEN_MACDEF:
-      fprintf (stderr, "builtin 0x%x\n", (int) m4_get_symbol_value_func 
(token));
+    case M4_TOKEN_WORD:
+      fprintf (stderr, "word\t\"%s\"\n", m4_get_symbol_value_text (token));
       break;
-
-    case M4_TOKEN_EOF:
-      fprintf (stderr, "eof\n");
+    case M4_TOKEN_OPEN:
+      fprintf (stderr, "open\t\"%s\"\n", m4_get_symbol_value_text (token));
       break;
-
-    case M4_TOKEN_NONE:
-      fprintf (stderr, "none\n");
+    case M4_TOKEN_COMMA:
+      fprintf (stderr, "comma\t\"%s\"\n", m4_get_symbol_value_text (token));
+      break;
+    case M4_TOKEN_CLOSE:
+      fprintf (stderr, "close\t\"%s\"\n", m4_get_symbol_value_text (token));
+      break;
+    case M4_TOKEN_SIMPLE:
+      fprintf (stderr, "simple\t\"%s\"\n", m4_get_symbol_value_text (token));
+      break;
+    case M4_TOKEN_MACDEF:
+      {
+       const m4_builtin *bp;
+       bp = m4_builtin_find_by_func (NULL, m4_get_symbol_value_func (token));
+       assert (bp);
+       fprintf (stderr, "builtin\t<%s>{%s}\n", bp->name,
+                m4_get_module_name (VALUE_HANDLE (token)));
+      }
       break;
     }
   return 0;
 }
-#endif
+#endif /* DEBUG_INPUT */