matz	2007-12-18 01:06:21 +0900 (Tue, 18 Dec 2007)

  New Revision: 14275

  Modified files:
    trunk/ChangeLog
    trunk/re.c
    trunk/string.c
    trunk/version.h

  Log:
    * re.c (rb_reg_initialize): raise error if non-Unicode fixed
      encoding option is specified for regexp literals with \u{}
      escapes.
    
    * string.c (rb_str_squeeze_bang): should squeeze multibyte
      characters as well.

  http://svn.ruby-lang.org/cgi-bin/viewvc.cgi/trunk/version.h?r1=14275&r2=14274
  http://svn.ruby-lang.org/cgi-bin/viewvc.cgi/trunk/string.c?r1=14275&r2=14274
  http://svn.ruby-lang.org/cgi-bin/viewvc.cgi/trunk/ChangeLog?r1=14275&r2=14274
  http://svn.ruby-lang.org/cgi-bin/viewvc.cgi/trunk/re.c?r1=14275&r2=14274

Index: re.c
===================================================================
--- re.c	(revision 14274)
+++ re.c	(revision 14275)
@@ -1971,7 +1971,7 @@
         return -1;
 
     if (fixed_enc) {
-	if (fixed_enc != enc && enc != d_enc && fixed_enc != d_enc) {
+	if (fixed_enc != enc && (options & ARG_ENCODING_FIXED)) {
 	    strcpy(err, "character encodings differ");
 	    return -1;
 	}
Index: ChangeLog
===================================================================
--- ChangeLog	(revision 14274)
+++ ChangeLog	(revision 14275)
@@ -1,3 +1,12 @@
+Tue Dec 18 00:26:12 2007  Yukihiro Matsumoto  <matz@r...>
+
+	* re.c (rb_reg_initialize): raise error if non-Unicode fixed
+	  encoding option is specified for regexp literals with \u{}
+	  escapes.
+
+	* string.c (rb_str_squeeze_bang): should squeeze multibyte
+	  characters as well.
+
 Mon Dec 17 21:41:25 2007  Nobuyoshi Nakada  <nobu@r...>
 
 	* win32/enc-setup.mak: extracts BUILTIN_ENCOBJS.
Index: string.c
===================================================================
--- string.c	(revision 14274)
+++ string.c	(revision 14275)
@@ -3846,7 +3846,6 @@
     int i;
 
     if (argc == 0) {
-	memset(squeez, 1, sizeof(squeez));
 	enc = rb_enc_get(str);
     }
     else {
@@ -3868,7 +3867,7 @@
 	int c = rb_enc_codepoint(s, send, enc);
 	int clen = rb_enc_codelen(c, enc);
 
-	if (c != save || !tr_find(c, squeez, del, nodel)) {
+	if (c != save || (argc > 0 && !tr_find(c, squeez, del, nodel))) {
 	    if (t != s) rb_enc_mbcput(c, t, enc);
 	    save = c;
 	    t += clen;
Index: version.h
===================================================================
--- version.h	(revision 14274)
+++ version.h	(revision 14275)
@@ -1,7 +1,7 @@
 #define RUBY_VERSION "1.9.0"
-#define RUBY_RELEASE_DATE "2007-12-17"
+#define RUBY_RELEASE_DATE "2007-12-18"
 #define RUBY_VERSION_CODE 190
-#define RUBY_RELEASE_CODE 20071217
+#define RUBY_RELEASE_CODE 20071218
 #define RUBY_PATCHLEVEL 0
 
 #define RUBY_VERSION_MAJOR 1
@@ -9,7 +9,7 @@
 #define RUBY_VERSION_TEENY 0
 #define RUBY_RELEASE_YEAR 2007
 #define RUBY_RELEASE_MONTH 12
-#define RUBY_RELEASE_DAY 17
+#define RUBY_RELEASE_DAY 18
 
 #ifdef RUBY_EXTERN
 RUBY_EXTERN const char ruby_version[];

--
ML: ruby-changes@q...
Info: http://www.atdot.net/~ko1/quickml