X-Git-Url: http://git.chise.org/gitweb/?p=chise%2Fxemacs-chise.git.1;a=blobdiff_plain;f=src%2Fregex.c;h=fe1907643e22b20e59ae61db221319425a8da417;hp=d70f7d6546c68c024b16da310da3311ac9ebc461;hb=a5812bf2ff9a9cf40f4ff78dcb83f5b4c295bd18;hpb=ac7d0619aad74b1d57c4748ebb3ab29d9c32e3d8

diff --git a/src/regex.c b/src/regex.c
index d70f7d6..fe19076 100644
--- a/src/regex.c
+++ b/src/regex.c
@@ -6,6 +6,7 @@
    Copyright (C) 1993, 1994, 1995 Free Software Foundation, Inc.
    Copyright (C) 1995 Sun Microsystems, Inc.
    Copyright (C) 1995 Ben Wing.
+   Copyright (C) 1999,2000,2001 MORIOKA Tomohiko
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
@@ -3362,8 +3363,12 @@ compile_extended_range (re_char **p_ptr, re_char *pend,
      ranges entirely within the first 256 chars. */
 
   if ((range_start >= 0x100 || range_end >= 0x100)
-      && CHAR_LEADING_BYTE (range_start) !=
-      CHAR_LEADING_BYTE (range_end))
+#ifdef UTF2000
+      && CHAR_CHARSET_ID (range_start) != CHAR_CHARSET_ID (range_end)
+#else
+      && CHAR_LEADING_BYTE (range_start) != CHAR_LEADING_BYTE (range_end)
+#endif
+      )
     return REG_ERANGESPAN;
 
   /* As advertised, translations only work over the 0 - 0x7F range.
@@ -3655,19 +3660,30 @@ re_compile_fastmap (struct re_pattern_buffer *bufp)
 #endif
 	  matchsyntax:
 #ifdef MULE
+#ifdef UTF2000
+	  for (j = 0; j < 0x80; j++)
+	    if (SYNTAX_UNSAFE
+		(XCHAR_TABLE
+		 (regex_emacs_buffer->syntax_table), j) ==
+		(enum syntaxcode) k)
+	      fastmap[j] = 1;
+#else
 	  for (j = 0; j < 0x80; j++)
 	    if (SYNTAX_UNSAFE
 		(XCHAR_TABLE
 		 (regex_emacs_buffer->mirror_syntax_table), j) ==
 		(enum syntaxcode) k)
 	      fastmap[j] = 1;
+#endif
 	  for (j = 0x80; j < 0xA0; j++)
 	    {
+#ifndef UTF2000
 	      if (LEADING_BYTE_PREFIX_P(j))
 		/* too complicated to calculate this right */
 		fastmap[j] = 1;
 	      else
 		{
+#endif
 		  int multi_p;
 		  Lisp_Object cset;
 
@@ -3679,7 +3695,9 @@ re_compile_fastmap (struct re_pattern_buffer *bufp)
 			  == Sword || multi_p)
 			fastmap[j] = 1;
 		    }
+#ifndef UTF2000
 		}
+#endif
 	    }
 #else /* not MULE */
 	  for (j = 0; j < (1 << BYTEWIDTH); j++)
@@ -3698,19 +3716,30 @@ re_compile_fastmap (struct re_pattern_buffer *bufp)
 #endif
 	  matchnotsyntax:
 #ifdef MULE
+#ifdef UTF2000
+	  for (j = 0; j < 0x80; j++)
+	    if (SYNTAX_UNSAFE
+		(XCHAR_TABLE
+		 (regex_emacs_buffer->syntax_table), j) !=
+		(enum syntaxcode) k)
+	      fastmap[j] = 1;
+#else
 	  for (j = 0; j < 0x80; j++)
 	    if (SYNTAX_UNSAFE
 		(XCHAR_TABLE
 		 (regex_emacs_buffer->mirror_syntax_table), j) !=
 		(enum syntaxcode) k)
 	      fastmap[j] = 1;
+#endif
 	  for (j = 0x80; j < 0xA0; j++)
 	    {
+#ifndef UTF2000
 	      if (LEADING_BYTE_PREFIX_P(j))
 		/* too complicated to calculate this right */
 		fastmap[j] = 1;
 	      else
 		{
+#endif
 		  int multi_p;
 		  Lisp_Object cset;
 
@@ -3722,7 +3751,9 @@ re_compile_fastmap (struct re_pattern_buffer *bufp)
 			  != Sword || multi_p)
 			fastmap[j] = 1;
 		    }
+#ifndef UTF2000
 		}
+#endif
 	    }
 #else /* not MULE */
 	  for (j = 0; j < (1 << BYTEWIDTH); j++)
@@ -4242,9 +4273,15 @@ re_search_2 (struct re_pattern_buffer *bufp, const char *str1,
 #define POS_AFTER_GAP_UNSAFE(d) ((d) == end1 ? string2 : (d))
 
 /* Test if CH is a word-constituent character. (XEmacs change) */
+#ifdef UTF2000
+#define WORDCHAR_P_UNSAFE(ch)					   \
+  (SYNTAX_UNSAFE (XCHAR_TABLE (regex_emacs_buffer->syntax_table),  \
+                               ch) == Sword)
+#else
 #define WORDCHAR_P_UNSAFE(ch)						   \
   (SYNTAX_UNSAFE (XCHAR_TABLE (regex_emacs_buffer->mirror_syntax_table),   \
                                ch) == Sword)
+#endif
 
 /* Free everything we malloc.  */
 #ifdef MATCH_MAY_ALLOCATE
@@ -5719,8 +5756,13 @@ re_match_2_internal (struct re_pattern_buffer *bufp, re_char *string1,
 #endif
 
 	    emch = charptr_emchar ((const Bufbyte *) d);
+#ifdef UTF2000
+	    matches = (SYNTAX_FROM_CACHE (XCHAR_TABLE (regex_emacs_buffer->syntax_table),
+			emch) == (enum syntaxcode) mcnt);
+#else
 	    matches = (SYNTAX_FROM_CACHE (XCHAR_TABLE (regex_emacs_buffer->mirror_syntax_table),
 			emch) == (enum syntaxcode) mcnt);
+#endif
 	    INC_CHARPTR (d);
 	    if (matches != should_succeed)
 	      goto fail;