33-fyi-rm-m4-symbol-lookup.patch

[Akim Demaille]

Index: ChangeLog
from  Akim Demaille  <address@hidden>
        * m4/m4module.h (m4_symbol_lookup): Remove M4_SYMBOL_LOOKUP.
        * m4/macro.c, m4/symtab.c: Adjust.
        
        
Index: m4/m4module.h
--- m4/m4module.h Tue, 04 Sep 2001 10:45:00 +0200 akim
+++ m4/m4module.h Tue, 04 Sep 2001 10:46:26 +0200 akim
@@ -52,7 +52,6 @@
 /* Operation modes for m4_lookup_symbol ().  */
 typedef enum
 {
-  M4_SYMBOL_LOOKUP,
   M4_SYMBOL_INSERT,
   M4_SYMBOL_DELETE,
   M4_SYMBOL_PUSHDEF,
Index: m4/macro.c
--- m4/macro.c Mon, 03 Sep 2001 15:40:52 +0200 akim
+++ m4/macro.c Tue, 04 Sep 2001 10:46:06 +0200 akim
@@ -73,7 +73,7 @@
        if (M4_IS_ESCAPE(*p))
          ++p;
 
-       symbol = m4_lookup_symbol (p, M4_SYMBOL_LOOKUP);
+       symbol = m4_symbol_lookup (p);
        if (symbol == NULL || M4_SYMBOL_TYPE (symbol) == M4_TOKEN_VOID
            || (M4_SYMBOL_TYPE (symbol) == M4_TOKEN_FUNC
                && M4_SYMBOL_BLIND_NO_ARGS (symbol)
Index: m4/symtab.c
--- m4/symtab.c Tue, 04 Sep 2001 10:45:00 +0200 akim
+++ m4/symtab.c Tue, 04 Sep 2001 10:47:48 +0200 akim
@@ -141,9 +141,6 @@
 {
   switch (mode)
     {
-    case M4_SYMBOL_LOOKUP:
-      return m4_symbol_lookup (name);
-
     case M4_SYMBOL_INSERT:
       return m4_symbol_insert (name);
 
@@ -211,7 +208,7 @@
 
 /* Return a slot associated to NAME, creating it if needed.  */
 m4_symbol *
-m4_lookup_insert (const char *name)
+m4_symbol_insert (const char *name)
 {
   return (m4_symbol *) (m4_symbol_lookup (name) || m4_symbol_pushdef (name));
 }
@@ -351,7 +348,7 @@
       else
        delete = 0;
 
-      s = m4_lookup_symbol (text, M4_SYMBOL_LOOKUP);
+      s = m4_symbol_lookup (text);
 
       if (s == NULL)
        printf (_("Name `%s' is unknown\n"), text);
Index: m4/utility.c
--- m4/utility.c Mon, 03 Sep 2001 15:40:52 +0200 akim
+++ m4/utility.c Tue, 04 Sep 2001 10:45:52 +0200 akim
@@ -263,7 +263,7 @@
 
       for (i = 1; i < argc; i++)
        {
-         symbol = m4_lookup_symbol (M4_TOKEN_DATA_TEXT (argv[i]), 
M4_SYMBOL_LOOKUP);
+         symbol = m4_symbol_lookup (M4_TOKEN_DATA_TEXT (argv[i]));
          if (symbol != NULL && M4_SYMBOL_TYPE (symbol) != M4_TOKEN_VOID)
            m4_dump_symbol (M4_TOKEN_DATA_TEXT (argv[i]), symbol, data);
          else if (complain)