37-fyi-rm-symbol-popdef-delete.patch

[Akim Demaille]

I'm not sure how to remove the trailing ones.

Index: ChangeLog
from  Akim Demaille  <address@hidden>

        * m4/m4module.h (m4_symbol_lookup_t): Remove `M4_SYMBOL_POPDEF'
        and `M4_SYMBOL_DELETE'.
        * m4/symtab.c (m4_lookup_symbol, symtab_debug): Adjust.
        * src/main.c (main): Adjust.

Index: src/main.c
--- src/main.c Wed, 05 Sep 2001 15:55:59 +0200 akim
+++ src/main.c Wed, 05 Sep 2001 16:01:27 +0200 akim
@@ -439,7 +439,7 @@ Debugging:\n\
          break;

        case 'U':
-         m4_lookup_symbol (defines->macro, M4_SYMBOL_DELETE);
+         m4_symbol_delete (defines->macro);
          break;

        case 't':
Index: m4/m4module.h
--- m4/m4module.h Tue, 04 Sep 2001 12:18:17 +0200 akim
+++ m4/m4module.h Wed, 05 Sep 2001 16:02:43 +0200 akim
@@ -53,9 +53,7 @@
 typedef enum
 {
   M4_SYMBOL_INSERT,
-  M4_SYMBOL_DELETE,
-  M4_SYMBOL_PUSHDEF,
-  M4_SYMBOL_POPDEF,
+  M4_SYMBOL_PUSHDEF
 } m4_symbol_lookup_t;

 typedef struct {
Index: m4/symtab.c
--- m4/symtab.c Tue, 04 Sep 2001 12:18:17 +0200 akim
+++ m4/symtab.c Wed, 05 Sep 2001 16:02:37 +0200 akim
@@ -146,14 +146,6 @@

     case M4_SYMBOL_PUSHDEF:
       return m4_symbol_pushdef (name);
-
-    case M4_SYMBOL_POPDEF:
-      m4_symbol_popdef (name);
-      return 0;
-
-    case M4_SYMBOL_DELETE:
-      m4_symbol_delete (name);
-      return 0;
     }

   assert (0);
@@ -347,9 +339,9 @@
        printf (_("Name `%s' is unknown\n"), text);

       if (delete)
-       (void) m4_lookup_symbol (text, M4_SYMBOL_DELETE);
+       (void) m4_symbol_delete (text);
       else
-       (void) m4_lookup_symbol (text, M4_SYMBOL_INSERT);
+       (void) m4_symbol_insert (text);
     }
   m4_symtab_apply (symtab_print_list, 0);
 }
Index: modules/m4.c
--- modules/m4.c Tue, 04 Sep 2001 12:31:15 +0200 akim
+++ modules/m4.c Wed, 05 Sep 2001 16:08:01 +0200 akim
@@ -126,10 +126,9 @@
    individual arguments to the macro.  Please note that in general
    argv[argc] != NULL.  */

-/* The function macro_install is common for the builtins "define",
-   "undefine", "pushdef" and "popdef".  ARGC and ARGV is as for the caller,
-   and MODE argument determines how the macro name is entered into the
-   symbol table.  */
+/* The function macro_install is common for the builtins "define" and
+   "pushdef".  ARGC and ARGV is as for the caller, and MODE argument
+   determines how the macro name is entered into the symbol table.  */

 static void
 macro_install (int argc, m4_token_data **argv, m4_symbol_lookup_t mode)