* enum.c (enum_find): catch a value before recycle.

* enum.c (enum_min): ditto.

* enum.c (enum_max): ditto.

* parse.y (parse_string): part of multi-byte sequence must not
  match to paren.

* parse.y (parse_qstring): ditto.

* parse.y (parse_quotedwords): ditto.

* parse.y (str_extend): handle multi-byte characters.


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_6@2217 b2dd03c8-39d4-4d8f-98ff-823fe69b080e

ChangeLog

@@ -1,3 +1,20 @@
+Mon Mar 18 10:55:03 2002  Nobuyoshi Nakada  <nobu.nakada@nifty.ne.jp>
+
+	* enum.c (enum_find): catch a value before recycle.
+
+	* enum.c (enum_min): ditto.
+
+	* enum.c (enum_max): ditto.
+
+	* parse.y (parse_string): part of multi-byte sequence must not
+	  match to paren.
+
+	* parse.y (parse_qstring): ditto.
+
+	* parse.y (parse_quotedwords): ditto.
+
+	* parse.y (str_extend): handle multi-byte characters.
+
 Thu Mar 14 16:42:37 2002  Yukihiro Matsumoto  <matz@ruby-lang.org>
 
 	* class.c (rb_define_class): should handle autoload.

enum.c

@@ -84,8 +84,9 @@ enum_find(argc, argv, obj)
     rb_scan_args(argc, argv, "01", &if_none);
     rb_iterate(rb_each, obj, find_i, (VALUE)memo);
     if (memo->u2.value) {
+	VALUE result = memo->u1.value;
 	rb_gc_force_recycle((VALUE)memo);
-	return memo->u1.value;
+	return result;
     }
     if (!NIL_P(if_none)) {
 	rb_eval_cmd(if_none, rb_ary_new2(0));
@@ -223,11 +224,13 @@ static VALUE
 enum_min(obj)
     VALUE obj;
 {
+    VALUE result;
     NODE *memo = rb_node_newnode(NODE_MEMO, Qnil, 0, 0);
 
     rb_iterate(rb_each, obj, rb_block_given_p()?min_ii:min_i, (VALUE)memo);
+    result = memo->u1.value;
     rb_gc_force_recycle((VALUE)memo);
-    return memo->u1.value;
+    return result;
 }
 
 static VALUE
@@ -268,11 +271,13 @@ static VALUE
 enum_max(obj)
     VALUE obj;
 {
+    VALUE result;
     NODE *memo = rb_node_newnode(NODE_MEMO, Qnil, 0, 0);
 
     rb_iterate(rb_each, obj, rb_block_given_p()?max_ii:max_i, (VALUE)memo);
+    result = memo->u1.value;
     rb_gc_force_recycle((VALUE)memo);
-    return memo->u1.value;
+    return result;
 }
 
 static VALUE
@@ -292,7 +297,6 @@ enum_member(obj, val)
     VALUE obj, val;
 {
     VALUE result;
-
     NODE *memo = rb_node_newnode(NODE_MEMO, val, Qfalse, 0);
 
     rb_iterate(rb_each, obj, member_i, (VALUE)memo);

parse.y

@@ -2466,6 +2466,10 @@ parse_string(func, term, paren)
 	    rb_compile_error("unterminated string meets end of file");
 	    return 0;
 	}
+	if (paren) {
+	    if (c == paren) nest++;
+	    if (c == term && nest-- == 0) break;
+	}
 	if (ismbchar(c)) {
 	    int i, len = mbclen(c)-1;
 
@@ -2493,10 +2497,6 @@ parse_string(func, term, paren)
   	    }
 	    continue;
 	}
-	if (paren) {
-	    if (c == paren) nest++;
-	    if (c == term && nest-- == 0) break;
-	}
 	tokadd(c);
     }
 
@@ -2540,6 +2540,10 @@ parse_qstring(term, paren)
 	    rb_compile_error("unterminated string meets end of file");
 	    return 0;
 	}
+	if (paren) {
+	    if (c == paren) nest++;
+	    if (c == term && nest-- == 0) break;
+	}
 	if (ismbchar(c)) {
 	    int i, len = mbclen(c)-1;
 
@@ -2567,10 +2571,6 @@ parse_qstring(term, paren)
 		tokadd('\\');
 	    }
 	}
-	if (paren) {
-	    if (c == paren) nest++;
-	    if (c == term && nest-- == 0) break;
-	}
 	tokadd(c);
     }
 
@@ -2601,6 +2601,10 @@ parse_quotedwords(term, paren)
 	    rb_compile_error("unterminated string meets end of file");
 	    return 0;
 	}
+	if (paren) {
+	    if (c == paren) nest++;
+	    if (c == term && nest-- == 0) break;
+	}
 	if (ismbchar(c)) {
 	    int i, len = mbclen(c)-1;
 
@@ -2640,10 +2644,6 @@ parse_quotedwords(term, paren)
 	    pushback(c);
 	    continue;
 	}
-	if (paren) {
-	    if (c == paren) nest++;
-	    if (c == term && nest-- == 0) break;
-	}
 	tokadd(c);
     }
 
@@ -3948,6 +3948,14 @@ str_extend(list, term, paren)
 		    newtok();
 		    return list;
 		}
+		else if (ismbchar(c)) {
+		    int i, len = mbclen(c)-1;
+
+		    for (i = 0; i < len; i++) {
+			tokadd(c);
+			c = nextc();
+		    }
+		}
 	      case '\n':
 		tokadd(c);
 		break;

version.h

@@ -1,4 +1,4 @@
 #define RUBY_VERSION "1.6.7"
-#define RUBY_RELEASE_DATE "2002-03-15"
+#define RUBY_RELEASE_DATE "2002-03-18"
 #define RUBY_VERSION_CODE 167
-#define RUBY_RELEASE_CODE 20020315
+#define RUBY_RELEASE_CODE 20020318