Changes to m4/src/freeze.c,v

[Eric Blake]

CVSROOT:        /sources/m4
Module name:    m4
Changes by:     Eric Blake <ericb>      07/02/28 21:31:13

Index: src/freeze.c
===================================================================
RCS file: /sources/m4/m4/src/freeze.c,v
retrieving revision 1.61
retrieving revision 1.62
diff -u -b -r1.61 -r1.62
--- src/freeze.c        25 Feb 2007 23:19:32 -0000      1.61
+++ src/freeze.c        28 Feb 2007 21:31:12 -0000      1.62
@@ -239,12 +239,12 @@
       || strcmp (m4_get_syntax_rquote (M4SYNTAX), DEF_RQUOTE))
     {
       fprintf (file, "Q%lu,%lu\n",
-              (unsigned long int) context->syntax->lquote.length,
-              (unsigned long int) context->syntax->rquote.length);
-      produce_mem_dump (file, context->syntax->lquote.string,
-                       context->syntax->lquote.length);
-      produce_mem_dump (file, context->syntax->rquote.string,
-                       context->syntax->rquote.length);
+              (unsigned long int) M4SYNTAX->lquote.length,
+              (unsigned long int) M4SYNTAX->rquote.length);
+      produce_mem_dump (file, M4SYNTAX->lquote.string,
+                       M4SYNTAX->lquote.length);
+      produce_mem_dump (file, M4SYNTAX->rquote.string,
+                        M4SYNTAX->rquote.length);
       fputc ('\n', file);
     }
 
@@ -254,12 +254,10 @@
       || strcmp (m4_get_syntax_ecomm (M4SYNTAX), DEF_ECOMM))
     {
       fprintf (file, "C%lu,%lu\n",
-              (unsigned long int) context->syntax->bcomm.length,
-              (unsigned long int) context->syntax->ecomm.length);
-      produce_mem_dump (file, context->syntax->bcomm.string,
-                       context->syntax->bcomm.length);
-      produce_mem_dump (file, context->syntax->ecomm.string,
-                       context->syntax->ecomm.length);
+              (unsigned long int) M4SYNTAX->bcomm.length,
+              (unsigned long int) M4SYNTAX->ecomm.length);
+      produce_mem_dump (file, M4SYNTAX->bcomm.string, M4SYNTAX->bcomm.length);
+      produce_mem_dump (file, M4SYNTAX->ecomm.string, M4SYNTAX->ecomm.length);
       fputc ('\n', file);
     }
 
@@ -495,7 +493,7 @@
        m4__module_open (context, "gnu", NULL);
       /* Disable { and } categories, since ${11} was not supported in
          1.4.x.  */
-      m4_set_syntax (context->syntax, 'O', '+', "{}");
+      m4_set_syntax (M4SYNTAX, 'O', '+', "{}");
       break;
     default:
       if (version > 2)
@@ -646,7 +644,7 @@
 
          /* Syntax under M4_SYNTAX_MASKS is handled specially; all
             other characters are additive.  */
-         if ((m4_set_syntax (context->syntax, syntax,
+         if ((m4_set_syntax (M4SYNTAX, syntax,
                              (m4_syntax_code (syntax) & M4_SYNTAX_MASKS
                               ? '=' : '+'), string[0]) < 0)
              && (syntax != '\0'))