[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
FYI: 11-gary-more-api-rationalisation.patch
From: |
Gary V. Vaughan |
Subject: |
FYI: 11-gary-more-api-rationalisation.patch |
Date: |
Sat, 8 Sep 2001 03:03:28 +0100 |
User-agent: |
Mutt/1.3.22.1i |
Since we have define and pushdef in m4, it makes sense for the
underlying functions to follow the same convention. I've left the
equivalent hash.c functions as ^.*_insert$ since the hash module has
no concept of shadowing.
Index: ChangeLog
from Gary V. Vaughan <address@hidden>
* m4/m4module.h, m4/builtin.c, m4/symtab.c:
s/m4_symbol_insert/m4_symbol_define/g;
s/m4_builtin_insert/m4_builtin_define/g;
s/m4_macro_insert/m4_macro_define/g. Updated all callers.
Index: m4/builtin.c
===================================================================
RCS file: /cvsroot/m4/m4/m4/builtin.c,v
retrieving revision 1.11
diff -u -p -u -r1.11 builtin.c
--- m4/builtin.c 2001/09/08 01:40:47 1.11
+++ m4/builtin.c 2001/09/08 01:55:54
@@ -89,7 +89,7 @@ m4_builtin_pushdef (const char *name, lt
}
m4_symbol *
-m4_builtin_insert (const char *name, lt_dlhandle handle,
+m4_builtin_define (const char *name, lt_dlhandle handle,
const m4_builtin *bp)
{
m4_symbol *symbol;
@@ -98,7 +98,7 @@ m4_builtin_insert (const char *name, lt_
assert (handle);
assert (bp);
- symbol = m4_symbol_insert (name);
+ symbol = m4_symbol_define (name);
if (symbol)
m4_symbol_builtin (symbol, handle, bp);
@@ -153,14 +153,14 @@ m4_macro_pushdef (const char *name, lt_d
}
m4_symbol *
-m4_macro_insert (const char *name, lt_dlhandle handle, const char *text)
+m4_macro_define (const char *name, lt_dlhandle handle, const char *text)
{
m4_symbol *symbol;
assert (name);
assert (text);
- symbol = m4_symbol_insert (name);
+ symbol = m4_symbol_define (name);
if (symbol)
m4_symbol_macro (symbol, handle, text);
Index: m4/m4module.h
===================================================================
RCS file: /cvsroot/m4/m4/m4/m4module.h,v
retrieving revision 1.26
diff -u -p -u -r1.26 m4module.h
--- m4/m4module.h 2001/09/08 01:40:47 1.26
+++ m4/m4module.h 2001/09/08 01:55:55
@@ -72,14 +72,14 @@ extern lt_dlhandle m4_module_find_by_bu
extern m4_symbol *m4_macro_pushdef (const char *name, lt_dlhandle handle,
const char *text);
-extern m4_symbol *m4_macro_insert (const char *name, lt_dlhandle handle,
+extern m4_symbol *m4_macro_define (const char *name, lt_dlhandle handle,
const char *text);
extern void m4_macro_table_install (lt_dlhandle handle,
const m4_macro *table);
extern m4_symbol *m4_builtin_pushdef (const char *name, lt_dlhandle handle,
const m4_builtin *bp);
-extern m4_symbol *m4_builtin_insert (const char *name, lt_dlhandle handle,
+extern m4_symbol *m4_builtin_define (const char *name, lt_dlhandle handle,
const m4_builtin *bp);
extern void m4_builtin_table_install (lt_dlhandle handle,
const m4_builtin *table);
@@ -97,7 +97,7 @@ extern void m4_symtab_remove_module_refe
extern m4_symbol *m4_symbol_lookup (const char *);
extern m4_symbol *m4_symbol_pushdef (const char *);
-extern m4_symbol *m4_symbol_insert (const char *);
+extern m4_symbol *m4_symbol_define (const char *);
extern void m4_symbol_popdef (const char *);
extern void m4_symbol_delete (const char *);
extern void m4_symbol_builtin (m4_symbol *symbol, lt_dlhandle handle,
Index: m4/symtab.c
===================================================================
RCS file: /cvsroot/m4/m4/m4/symtab.c,v
retrieving revision 1.20
diff -u -p -u -r1.20 symtab.c
--- m4/symtab.c 2001/09/08 01:40:47 1.20
+++ m4/symtab.c 2001/09/08 01:55:56
@@ -165,7 +165,7 @@ m4_symbol_pushdef (const char *name)
/* Return a slot associated to NAME, creating it if needed. */
m4_symbol *
-m4_symbol_insert (const char *name)
+m4_symbol_define (const char *name)
{
m4_symbol *res = m4_symbol_lookup (name);
if (res)
@@ -348,7 +348,7 @@ symtab_debug (void)
if (delete)
(void) m4_symbol_delete (text);
else
- (void) m4_symbol_insert (text);
+ (void) m4_symbol_define (text);
}
m4_symtab_apply (symtab_print_list, 0);
}
Index: modules/m4.c
===================================================================
RCS file: /cvsroot/m4/m4/modules/m4.c,v
retrieving revision 1.19
diff -u -p -u -r1.19 m4.c
--- modules/m4.c 2001/09/08 01:40:47 1.19
+++ modules/m4.c 2001/09/08 01:55:58
@@ -136,14 +136,14 @@ M4BUILTIN_HANDLER (define)
if (argc == 2)
{
- m4_macro_insert (M4ARG (1), NULL, "");
+ m4_macro_define (M4ARG (1), NULL, "");
return;
}
switch (M4_TOKEN_DATA_TYPE (argv[2]))
{
case M4_TOKEN_TEXT:
- m4_macro_insert (M4ARG (1), NULL, M4ARG (2));
+ m4_macro_define (M4ARG (1), NULL, M4ARG (2));
return;
case M4_TOKEN_FUNC:
@@ -158,7 +158,7 @@ M4BUILTIN_HANDLER (define)
builtin = m4_builtin_find_by_func (m4_module_builtins (handle),
M4_TOKEN_DATA_FUNC (argv[2]));
- m4_builtin_insert (M4ARG (1), handle, builtin);
+ m4_builtin_define (M4ARG (1), handle, builtin);
}
return;
}
Index: src/main.c
===================================================================
RCS file: /cvsroot/m4/m4/src/main.c,v
retrieving revision 1.23
diff -u -p -u -r1.23 main.c
--- src/main.c 2001/09/08 01:40:47 1.23
+++ src/main.c 2001/09/08 01:55:58
@@ -435,7 +435,7 @@ warranty; not even for MERCHANTABILITY o
macro_value = "";
else
*macro_value++ = '\0';
- m4_macro_insert (defines->macro, NULL, macro_value);
+ m4_macro_define (defines->macro, NULL, macro_value);
break;
case 'U':
@@ -443,7 +443,7 @@ warranty; not even for MERCHANTABILITY o
break;
case 't':
- symbol = m4_symbol_insert (defines->macro);
+ symbol = m4_symbol_define (defines->macro);
M4_SYMBOL_TRACED (symbol) = TRUE;
break;
--
())_. Gary V. Vaughan gary@(oranda.demon.co.uk|gnu.org)
( '/ Research Scientist http://www.oranda.demon.co.uk ,_())____
/ )= GNU Hacker http://www.gnu.org/software/libtool \' `&
`(_~)_ Tech' Author http://sources.redhat.com/autobook =`---d__/
- FYI: 11-gary-more-api-rationalisation.patch,
Gary V. Vaughan <=