X-Git-Url: http://erislabs.net/gitweb/?a=blobdiff_plain;f=regex.c;h=0983c17e795175b4835eb099396df47795301168;hb=2c6d91f6bcfffcaa7320af7ea4e2a9c970c0966e;hp=0dcdedec51768665172df0529634a8430a63fe5e;hpb=c62520bb9311b63e81a1cd3cc9f331dfdee4c698;p=gnulib.git

diff --git a/regex.c b/regex.c
index 0dcdedec5..0983c17e7 100644
--- a/regex.c
+++ b/regex.c
@@ -3323,9 +3323,11 @@ re_compile_fastmap (bufp)
 
 
 	case charset_not:
-	  /* Chars beyond end of map must be allowed.  End of map is
-	     `127' if bufp->multibyte is nonzero.  */
-	  simple_char_max = bufp->multibyte ? 0x80 : (1 << BYTEWIDTH);
+	  /* Chars beyond end of bitmap are possible matches.
+	     All the single-byte codes can occur in multibyte buffers.
+	     So any that are not listed in the charset
+	     are possible matches, even in multibyte buffers.  */
+	  simple_char_max = (1 << BYTEWIDTH);
 	  for (j = CHARSET_BITMAP_SIZE (&p[-1]) * BYTEWIDTH;
 	       j < simple_char_max; j++)
 	    fastmap[j] = 1;
@@ -3352,7 +3354,9 @@ re_compile_fastmap (bufp)
 
 
 	case wordchar:
-	  simple_char_max = bufp->multibyte ? 0x80 : (1 << BYTEWIDTH);
+	  /* All the single-byte codes can occur in multibyte buffers,
+	     and they may have word syntax.  So do consider them.  */
+	  simple_char_max = (1 << BYTEWIDTH);
 	  for (j = 0; j < simple_char_max; j++)
 	    if (SYNTAX (j) == Sword)
 	      fastmap[j] = 1;
@@ -3365,7 +3369,9 @@ re_compile_fastmap (bufp)
 
 
 	case notwordchar:
-	  simple_char_max = bufp->multibyte ? 0x80 : (1 << BYTEWIDTH);
+	  /* All the single-byte codes can occur in multibyte buffers,
+	     and they may not have word syntax.  So do consider them.  */
+	  simple_char_max = (1 << BYTEWIDTH);
 	  for (j = 0; j < simple_char_max; j++)
 	    if (SYNTAX (j) != Sword)
 	      fastmap[j] = 1;
@@ -3381,21 +3387,13 @@ re_compile_fastmap (bufp)
 	  {
 	    int fastmap_newline = fastmap['\n'];
 
-	    /* `.' matches anything (but if bufp->multibyte is
-	       nonzero, matches `\000' .. `\127' and possible multibyte
-	       character) ...  */
+	    /* `.' matches anything, except perhaps newline.
+	       Even in a multibyte buffer, it should match any
+	       conceivable byte value for the fastmap.  */
 	    if (bufp->multibyte)
-	      {
-		simple_char_max = 0x80;
-
-		for (j = 0x80; j < 0xA0; j++)
-		  if (BASE_LEADING_CODE_P (j))
-		    fastmap[j] = 1;
-		match_any_multibyte_characters = true;
-	      }
-	    else
-	      simple_char_max = (1 << BYTEWIDTH);
+	      match_any_multibyte_characters = true;
 
+	    simple_char_max = (1 << BYTEWIDTH);
 	    for (j = 0; j < simple_char_max; j++)
 	      fastmap[j] = 1;
 
@@ -3453,7 +3451,7 @@ re_compile_fastmap (bufp)
 
 	case categoryspec:
 	  k = *p++;
-	  simple_char_max = bufp->multibyte ? 0x80 : (1 << BYTEWIDTH);
+	  simple_char_max = (1 << BYTEWIDTH);
 	  for (j = 0; j < simple_char_max; j++)
 	    if (CHAR_HAS_CATEGORY (j, k))
 	      fastmap[j] = 1;
@@ -3467,7 +3465,7 @@ re_compile_fastmap (bufp)
 
 	case notcategoryspec:
 	  k = *p++;
-	  simple_char_max = bufp->multibyte ? 0x80 : (1 << BYTEWIDTH);
+	  simple_char_max = (1 << BYTEWIDTH);
 	  for (j = 0; j < simple_char_max; j++)
 	    if (!CHAR_HAS_CATEGORY (j, k))
 	      fastmap[j] = 1;