Changes to m4/m4/m4private.h,v

[Eric Blake]

CVSROOT:        /sources/m4
Module name:    m4
Changes by:     Eric Blake <ericb>      06/10/27 17:03:51

Index: m4/m4private.h
===================================================================
RCS file: /sources/m4/m4/m4/m4private.h,v
retrieving revision 1.68
retrieving revision 1.69
diff -u -b -r1.68 -r1.69
--- m4/m4private.h      27 Oct 2006 04:03:28 -0000      1.68
+++ m4/m4private.h      27 Oct 2006 17:03:51 -0000      1.69
@@ -181,7 +181,7 @@
   m4__symbol_type      type;
   union {
     const char *       text; /* Valid when type is TEXT, PLACEHOLDER.  */
-    m4_builtin_func *  func; /* Valid when type is FUNC.  */
+    const m4_builtin * builtin; /* Valid when type is FUNC.  */
   } u;
 };
 
@@ -217,16 +217,18 @@
 #  define m4_is_symbol_value_placeholder(V)                            \
                                        ((V)->type == M4_SYMBOL_PLACEHOLDER)
 #  define m4_get_symbol_value_text(V)  ((V)->u.text)
-#  define m4_get_symbol_value_func(V)  ((V)->u.func)
+#  define m4_get_symbol_value_func(V)  ((V)->u.builtin->func)
+#  define m4_get_symbol_value_builtin(V) ((V)->u.builtin)
 #  define m4_get_symbol_value_placeholder(V)                           \
                                        ((V)->u.text)
+#  define m4_get_symbol_value_module(V)        (VALUE_HANDLE (V))
 #  define m4_symbol_value_groks_macro(V) (BIT_TEST ((V)->flags,                
\
                                                    VALUE_MACRO_ARGS_BIT))
 
 #  define m4_set_symbol_value_text(V, T)                               \
        ((V)->type = M4_SYMBOL_TEXT, (V)->u.text = (T))
-#  define m4_set_symbol_value_func(V, F)                               \
-       ((V)->type = M4_SYMBOL_FUNC, (V)->u.func = (F))
+#  define m4_set_symbol_value_builtin(V, B)                            \
+       ((V)->type = M4_SYMBOL_FUNC, (V)->u.builtin = (B))
 #  define m4_set_symbol_value_placeholder(V, T)                                
\
        ((V)->type = M4_SYMBOL_PLACEHOLDER, (V)->u.text = (T))
 #endif