2000-02-02

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

1 files changed, 55 insertions, 88 deletions

diff --git a/string.c b/string.c
index 7185f13aa6..a5a3f0324c 100644
--- a/string.c
+++ b/string.c
@@ -1043,11 +1043,9 @@ rb_str_sub(argc, argv, str)
     VALUE *argv;
     VALUE str;
 {
-    VALUE dup = rb_str_dup(str);
-
-    if (NIL_P(rb_str_sub_bang(argc, argv, dup)))
-	return str;
-    return dup;
+    str = rb_str_dup(str);
+    rb_str_sub_bang(argc, argv, str);
+    return str;
 }
 
 static VALUE
@@ -1151,11 +1149,10 @@ rb_str_gsub(argc, argv, str)
     VALUE *argv;
     VALUE str;
 {
-    VALUE dup = rb_str_dup(str);
+    str = rb_str_dup(str);
 
-    if (NIL_P(rb_str_gsub_bang(argc, argv, dup)))
-	return str;
-    return dup;
+    rb_str_gsub_bang(argc, argv, dup);
+    return str;
 }
 
 static VALUE
@@ -1197,13 +1194,11 @@ rb_f_sub(argc, argv)
     int argc;
     VALUE *argv;
 {
-    VALUE line = uscore_get();
-    VALUE dup = rb_str_dup(line);
+    VALUE str = rb_str_dup(uscore_get());
 
-    if (NIL_P(rb_str_sub_bang(argc, argv, dup)))
-	return line;
-    rb_lastline_set(dup);
-    return dup;
+    rb_str_sub_bang(argc, argv, str);
+    rb_lastline_set(str);
+    return str;
 }
 
 static VALUE
@@ -1219,13 +1214,11 @@ rb_f_gsub(argc, argv)
     int argc;
     VALUE *argv;
 {
-    VALUE line = uscore_get();
-    VALUE dup = rb_str_dup(line);
+    VALUE str = rb_str_dup(uscore_get());
 
-    if (NIL_P(rb_str_gsub_bang(argc, argv, dup)))
-	return line;
-    rb_lastline_set(dup);
-    return dup;
+    rb_str_gsub_bang(argc, argv, str);
+    rb_lastline_set(str);
+    return str;
 }
 
 static VALUE
@@ -1520,11 +1513,9 @@ static VALUE
 rb_str_upcase(str)
     VALUE str;
 {
-    VALUE dup = rb_str_dup(str);
-
-    if (NIL_P(rb_str_upcase_bang(dup)))
-	return str;
-    return dup;
+    str = rb_str_dup(str);
+    rb_str_upcase_bang(str);
+    return str;
 }
 
 static VALUE
@@ -1555,11 +1546,9 @@ static VALUE
 rb_str_downcase(str)
     VALUE str;
 {
-    VALUE dup = rb_str_dup(str);
-
-    if (NIL_P(rb_str_downcase_bang(dup)))
-	return str;
-    return dup;
+    str = rb_str_dup(str);
+    rb_str_downcase_bang(str);
+    return str;
 }
 
 static VALUE
@@ -1592,11 +1581,9 @@ static VALUE
 rb_str_capitalize(str)
     VALUE str;
 {
-    VALUE dup = rb_str_dup(str);
-
-    if (NIL_P(rb_str_capitalize_bang(dup)))
-	return str;
-    return dup;
+    str = rb_str_dup(str);
+    rb_str_capitalize_bang(str);
+    return str;
 }
 
 static VALUE
@@ -1631,11 +1618,9 @@ static VALUE
 rb_str_swapcase(str)
     VALUE str;
 {
-    VALUE dup = rb_str_dup(str);
-
-    if (NIL_P(rb_str_swapcase_bang(dup)))
-	return str;
-    return dup;
+    str = rb_str_dup(str);
+    rb_str_swapcase_bang(str);
+    return str;
 }
 
 typedef unsigned char *USTR;
@@ -1783,11 +1768,9 @@ static VALUE
 rb_str_tr(str, src, repl)
     VALUE str, src, repl;
 {
-    VALUE dup = rb_str_dup(str);
-
-    if (NIL_P(tr_trans(dup, src, repl, 0)))
-	return str;
-    return dup;
+    str = rb_str_dup(str);
+    tr_trans(str, src, repl, 0);
+    return str;
 }
 
 static void
@@ -1868,11 +1851,9 @@ rb_str_delete(argc, argv, str)
     VALUE *argv;
     VALUE str;
 {
-    VALUE dup = rb_str_dup(str);
-
-    if (NIL_P(rb_str_delete_bang(argc, argv, dup)))
-	return str;
-    return dup;
+    str = rb_str_dup(str);
+    rb_str_delete_bang(argc, argv, str);
+    return str;
 }
 
 static VALUE
@@ -1930,11 +1911,9 @@ rb_str_squeeze(argc, argv, str)
     VALUE *argv;
     VALUE str;
 {
-    VALUE dup = rb_str_dup(str);
-
-    if (NIL_P(rb_str_squeeze_bang(argc, argv, dup)))
-	return str;
-    return dup;
+    str = rb_str_dup(str);
+    rb_str_squeeze_bang(argc, argv, str);
+    return str;
 }
 
 static VALUE
@@ -1948,11 +1927,9 @@ static VALUE
 rb_str_tr_s(str, src, repl)
     VALUE str, src, repl;
 {
-    VALUE dup = rb_str_dup(str);
-
-    if (NIL_P(tr_trans(dup, src, repl, 1)))
-	return str;
-    return dup;
+    str = rb_str_dup(str);
+    tr_trans(str, src, repl, 1);
+    return str;
 }
 
 static VALUE
@@ -2241,11 +2218,9 @@ static VALUE
 rb_str_chop(str)
     VALUE str;
 {
-    VALUE dup = rb_str_dup(str);
-
-    if (NIL_P(rb_str_chop_bang(dup)))
-	return str;
-    return dup;
+    str = rb_str_dup(str);
+    rb_str_chop_bang(str);
+    return str;
 }
 
 static VALUE
@@ -2258,13 +2233,11 @@ rb_f_chop_bang(str)
 static VALUE
 rb_f_chop()
 {
-    VALUE str = uscore_get();
-    VALUE dup = rb_str_dup(str);
+    VALUE str = rb_str_dup(uscore_get());
 
-    if (NIL_P(rb_str_chop_bang(dup)))
-	return str;
-    rb_lastline_set(dup);
-    return dup;
+    rb_str_chop_bang(str);
+    rb_lastline_set(str);
+    return str;
 }
 
 static VALUE
@@ -2316,11 +2289,9 @@ rb_str_chomp(argc, argv, str)
     VALUE *argv;
     VALUE str;
 {
-    VALUE dup = rb_str_dup(str);
-
-    if (NIL_P(rb_str_chomp_bang(argc, argv, dup)))
-	return str;
-    return dup;
+    str = rb_str_dup(str);
+    rb_str_chomp_bang(argc, argv, str);
+    return str;
 }
 
 static VALUE
@@ -2336,13 +2307,11 @@ rb_f_chomp(argc, argv)
     int argc;
     VALUE *argv;
 {
-    VALUE str = uscore_get();
-    VALUE dup = rb_str_dup(str);
+    VALUE str = rb_str_dup(uscore_get());
 
-    if (NIL_P(rb_str_chomp_bang(argc, argv, dup)))
-	return str;
-    rb_lastline_set(dup);
-    return dup;
+    rb_str_chomp_bang(argc, argv, str);
+    rb_lastline_set(str);
+    return str;
 }
 
 static VALUE
@@ -2385,11 +2354,9 @@ static VALUE
 rb_str_strip(str)
     VALUE str;
 {
-    VALUE dup = rb_str_dup(str);
-
-    if (NIL_P(rb_str_strip_bang(dup)))
-	return str;
-    return dup;
+    str = rb_str_dup(str);
+    rb_str_strip_bang(str);
+    return str;
 }
 
 static VALUE