m4-commit
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

Changes to m4/m4/input.c,v


From: Eric Blake
Subject: Changes to m4/m4/input.c,v
Date: Sat, 11 Nov 2006 16:21:26 +0000

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

Index: m4/input.c
===================================================================
RCS file: /sources/m4/m4/m4/input.c,v
retrieving revision 1.57
retrieving revision 1.58
diff -u -b -r1.57 -r1.58
--- m4/input.c  11 Nov 2006 14:00:28 -0000      1.57
+++ m4/input.c  11 Nov 2006 16:21:25 -0000      1.58
@@ -106,7 +106,7 @@
 static void    composite_print         (m4_input_block *, m4 *, m4_obstack *);
 
 static void    init_builtin_token      (m4 *, m4_symbol_value *);
-static bool    match_input             (m4 *, const unsigned char *, bool);
+static bool    match_input             (m4 *, const char *, bool);
 static int     next_char               (m4 *, bool);
 static int     peek_char               (m4 *);
 static void    pop_input               (m4 *);
@@ -863,16 +863,16 @@
    not properly restore the current input file and line when we
    restore unconsumed characters.  */
 static bool
-match_input (m4 *context, const unsigned char *s, bool consume)
+match_input (m4 *context, const char *s, bool consume)
 {
   int n;                       /* number of characters matched */
   int ch;                      /* input character */
-  const unsigned char *t;
+  const char *t;
   m4_obstack *st;
   bool result = false;
 
   ch = peek_char (context);
-  if (ch != *s)
+  if (ch != to_uchar (*s))
     return false;                      /* fail */
 
   if (s[1] == '\0')
@@ -883,7 +883,7 @@
     }
 
   next_char (context, true);
-  for (n = 1, t = s++; (ch = peek_char (context)) == *s++; )
+  for (n = 1, t = s++; (ch = peek_char (context)) == to_uchar (*s++); )
     {
       next_char (context, true);
       n++;
@@ -911,7 +911,7 @@
   will discard the matched string.  Otherwise, CH is the result of
   peek_char, and the input stream is effectively unchanged.  */
 #define MATCH(C, ch, s, consume)                                       \
-  ((s)[0] == (ch)                                                      \
+  (to_uchar ((s)[0]) == (ch)                                           \
    && (ch) != '\0'                                                     \
    && ((s)[1] == '\0' || (match_input (C, (s) + (consume), consume))))
 




reply via email to

[Prev in Thread] Current Thread [Next in Thread]