2000-05-30

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

1 files changed, 40 insertions, 5 deletions

diff --git a/re.c b/re.c
index e167d7a063..17d4ea9601 100644
--- a/re.c
+++ b/re.c
@@ -211,17 +211,17 @@ rb_reg_expr_str(str, s, len)
     int len;
 {
     const char *p, *pend;
-    int slash = 0;
+    int need_escape = 0;
 
     p = s; pend = p + len;
     while (p<pend) {
-	if (*p == '/') {
-	    slash = 1;
+	if (*p == '/' || (!ISPRINT(*p) && !ismbchar(*p))) {
+	    need_escape = 1;
 	    break;
 	}
 	p++;
     }
-    if (!slash) {
+    if (!need_escape) {
 	rb_str_cat(str, s, len);
     }
     else {
@@ -232,9 +232,44 @@ rb_reg_expr_str(str, s, len)
 		rb_str_cat(str, &c, 1);
 		rb_str_cat(str, p, 1);
 	    }
-	    else {
+	    else if (ismbchar(*p)) {
+	    	rb_str_cat(str, p, mbclen(*p));
+		p += mbclen(*p);
+		continue;
+	    }
+	    else if (ISPRINT(*p)) {
 		rb_str_cat(str, p, 1);
 	    }
+	    else {
+		char b[8];
+		switch (*p) {
+		case '\r':
+		    rb_str_cat(str, "\\r", 2);
+		    break;
+		case '\n':
+		    rb_str_cat(str, "\\n", 2);
+		    break;
+		case '\t':
+		    rb_str_cat(str, "\\t", 2);
+		    break;
+		case '\f':
+		    rb_str_cat(str, "\\f", 2);
+		    break;
+		case 007:
+		    rb_str_cat(str, "\\a", 2);
+		    break;
+		case 013:
+		    rb_str_cat(str, "\\v", 2);
+		    break;
+		case 033:
+		    rb_str_cat(str, "\\e", 2);
+		    break;
+		default:
+		    sprintf(b, "\\%03o", *p & 0377);
+		    rb_str_cat(str, b, 4);
+		    break;
+		}
+	    }
 	    p++;
 	}
     }