Changes to m4/m4/syntax.c,v

[Eric Blake]

CVSROOT:        /sources/m4
Module name:    m4
Changes by:     Eric Blake <ericb>      06/11/11 16:21:25

Index: m4/syntax.c
===================================================================
RCS file: /sources/m4/m4/m4/syntax.c,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -b -r1.17 -r1.18
--- m4/syntax.c 12 Oct 2006 21:14:50 -0000      1.17
+++ m4/syntax.c 11 Nov 2006 16:21:25 -0000      1.18
@@ -140,10 +140,14 @@
   syntax->is_single_comments   = true;
   syntax->is_macro_escaped     = false;
 
-  add_syntax_attribute (syntax, syntax->lquote.string[0], M4_SYNTAX_LQUOTE);
-  add_syntax_attribute (syntax, syntax->rquote.string[0], M4_SYNTAX_RQUOTE);
-  add_syntax_attribute (syntax, syntax->bcomm.string[0], M4_SYNTAX_BCOMM);
-  add_syntax_attribute (syntax, syntax->ecomm.string[0], M4_SYNTAX_ECOMM);
+  add_syntax_attribute (syntax, to_uchar (syntax->lquote.string[0]),
+                       M4_SYNTAX_LQUOTE);
+  add_syntax_attribute (syntax, to_uchar (syntax->rquote.string[0]),
+                       M4_SYNTAX_RQUOTE);
+  add_syntax_attribute (syntax, to_uchar (syntax->bcomm.string[0]),
+                       M4_SYNTAX_BCOMM);
+  add_syntax_attribute (syntax, to_uchar (syntax->ecomm.string[0]),
+                       M4_SYNTAX_ECOMM);
 
   return syntax;
 }
@@ -228,7 +232,7 @@
 }
 
 int
-m4_set_syntax (m4_syntax_table *syntax, char key, const unsigned char *chars)
+m4_set_syntax (m4_syntax_table *syntax, const char key, const char *chars)
 {
   int ch, code;
 
@@ -242,7 +246,7 @@
     }
 
   if (*chars != '\0')
-    while ((ch = *chars++))
+    while ((ch = to_uchar (*chars++)))
       add_syntax_attribute (syntax, ch, code);
   else
     for (ch = 256; --ch > 0; )
@@ -299,8 +303,10 @@
 
   if (syntax->is_single_quotes)
     {
-      add_syntax_attribute (syntax, syntax->lquote.string[0], 
M4_SYNTAX_LQUOTE);
-      add_syntax_attribute (syntax, syntax->rquote.string[0], 
M4_SYNTAX_RQUOTE);
+      add_syntax_attribute (syntax, to_uchar (syntax->lquote.string[0]),
+                           M4_SYNTAX_LQUOTE);
+      add_syntax_attribute (syntax, to_uchar (syntax->rquote.string[0]),
+                           M4_SYNTAX_RQUOTE);
     }
 
   if (syntax->is_macro_escaped)
@@ -331,8 +337,10 @@
 
   if (syntax->is_single_comments)
     {
-      add_syntax_attribute (syntax, syntax->bcomm.string[0], M4_SYNTAX_BCOMM);
-      add_syntax_attribute (syntax, syntax->ecomm.string[0], M4_SYNTAX_ECOMM);
+      add_syntax_attribute (syntax, to_uchar (syntax->bcomm.string[0]),
+                           M4_SYNTAX_BCOMM);
+      add_syntax_attribute (syntax, to_uchar (syntax->ecomm.string[0]),
+                           M4_SYNTAX_ECOMM);
     }
 
   if (syntax->is_macro_escaped)