[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
Changes to m4/modules/m4.c,v
From: |
Eric Blake |
Subject: |
Changes to m4/modules/m4.c,v |
Date: |
Mon, 18 Sep 2006 13:16:55 +0000 |
CVSROOT: /sources/m4
Module name: m4
Changes by: Eric Blake <ericb> 06/09/18 13:16:45
Index: modules/m4.c
===================================================================
RCS file: /sources/m4/m4/modules/m4.c,v
retrieving revision 1.70
retrieving revision 1.71
diff -u -b -r1.70 -r1.71
--- modules/m4.c 15 Sep 2006 03:37:54 -0000 1.70
+++ modules/m4.c 18 Sep 2006 13:16:44 -0000 1.71
@@ -107,8 +107,6 @@
static void include (m4 *context, int argc, m4_symbol_value **argv,
bool silent);
static int dumpdef_cmp_CB (const void *s1, const void *s2);
-static void * set_trace_CB (m4_symbol_table *symtab, const char *ignored,
- m4_symbol *symbol, void *userdata);
static void * dump_symbol_CB (m4_symbol_table *ignored, const char*name,
m4_symbol *symbol, void *userdata);
static const char *ntoa (number value, int radix);
@@ -743,33 +741,16 @@
Tracing is disabled by default, when a macro is defined. This can be
overridden by the "t" debug flag. */
-/* Set_trace () is used by "traceon" and "traceoff" to enable and disable
- tracing of a macro. It disables tracing if DATA is NULL, otherwise it
- enable tracing. */
-static void *
-set_trace_CB (m4_symbol_table *hash, const char *ignored, m4_symbol *symbol,
- void *userdata)
-{
- m4_set_symbol_traced (symbol, (bool) (userdata != NULL));
- return NULL;
-}
-
M4BUILTIN_HANDLER (traceon)
{
int i;
if (argc == 1)
- m4_symtab_apply (M4SYMTAB, set_trace_CB, (void *) obs);
+ m4_set_debug_level_opt (context, (m4_get_debug_level_opt (context)
+ | M4_DEBUG_TRACE_ALL));
else
for (i = 1; i < argc; i++)
- {
- const char *name = M4ARG (i);
- m4_symbol *symbol = m4_symbol_lookup (M4SYMTAB, name);
- if (symbol != NULL)
- set_trace_CB (NULL, NULL, symbol, (char *) obs);
- else
- m4_warn (context, 0, _("%s: undefined macro `%s'"), M4ARG (0), name);
- }
+ m4_set_symbol_name_traced (M4SYMTAB, M4ARG (i), true);
}
/* Disable tracing of all specified macros, or all, if none is specified. */
@@ -778,17 +759,11 @@
int i;
if (argc == 1)
- m4_symtab_apply (M4SYMTAB, set_trace_CB, NULL);
+ m4_set_debug_level_opt (context, (m4_get_debug_level_opt (context)
+ & ~M4_DEBUG_TRACE_ALL));
else
for (i = 1; i < argc; i++)
- {
- const char *name = M4ARG (i);
- m4_symbol *symbol = m4_symbol_lookup (M4SYMTAB, name);
- if (symbol != NULL)
- set_trace_CB (NULL, NULL, symbol, NULL);
- else
- m4_warn (context, 0, _("%s: undefined macro `%s'"), M4ARG (0), name);
- }
+ m4_set_symbol_name_traced (M4SYMTAB, M4ARG (i), false);
}
- Changes to m4/modules/m4.c,v, Eric Blake, 2006/09/07
- Changes to m4/modules/m4.c,v, Eric Blake, 2006/09/14
- Changes to m4/modules/m4.c,v,
Eric Blake <=
- Changes to m4/modules/m4.c,v, Eric Blake, 2006/09/26
- Changes to m4/modules/m4.c,v, Eric Blake, 2006/09/26
- Changes to m4/modules/m4.c,v, Eric Blake, 2006/09/27
- Changes to m4/modules/m4.c,v, Eric Blake, 2006/09/27
- Changes to m4/modules/m4.c,v, Eric Blake, 2006/09/28
- Changes to m4/modules/m4.c,v, Eric Blake, 2006/09/29