From 22270b6d4b233c5426e7e40870106f82ead8636a Mon Sep 17 00:00:00 2001
From: nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>
Date: Mon, 18 Mar 2002 02:04:23 +0000
Subject: * 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/trunk@2218 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
---
 parse.y | 32 ++++++++++++++++++++------------
 1 file changed, 20 insertions(+), 12 deletions(-)

(limited to 'parse.y')

diff --git a/parse.y b/parse.y
index c09fa4102e..5cd2011053 100644
--- a/parse.y
+++ b/parse.y
@@ -2608,6 +2608,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;
 
@@ -2635,10 +2639,6 @@ parse_string(func, term, paren)
   	    }
 	    continue;
 	}
-	if (paren) {
-	    if (c == paren) nest++;
-	    if (c == term && nest-- == 0) break;
-	}
 	tokadd(c);
     }
 
@@ -2682,6 +2682,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;
 
@@ -2709,10 +2713,6 @@ parse_qstring(term, paren)
 		tokadd('\\');
 	    }
 	}
-	if (paren) {
-	    if (c == paren) nest++;
-	    if (c == term && nest-- == 0) break;
-	}
 	tokadd(c);
     }
 
@@ -2743,6 +2743,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;
 
@@ -2782,10 +2786,6 @@ parse_quotedwords(term, paren)
 	    pushback(c);
 	    continue;
 	}
-	if (paren) {
-	    if (c == paren) nest++;
-	    if (c == term && nest-- == 0) break;
-	}
 	tokadd(c);
     }
 
@@ -4107,6 +4107,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;
-- 
cgit v1.2.3