From 90ab1ee023ecdc16913e3aa9ca013eb7781068c1 Mon Sep 17 00:00:00 2001
From: duerst <duerst@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>
Date: Thu, 4 May 2017 01:36:52 +0000
Subject: move definition of String#unicode_normalize! to C to make sure it is
 documented

* lib/unicode_normalize.rb: Remove definition of String#unicode_normalize!
  (including documentation)
* string.c: Define String#unicode_normalize! in rb_str_unicode_normalize_bang in C,
  (including documentation)
* lib/unicode_normalize/normalize.rb: Remove (re)definition of
  String#unicode_normalize! to avoid warnings (when $VERBOSE==true) and
  problems when String is frozen

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@58553 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
---
 string.c | 24 +++++++++++++++++++++++-
 1 file changed, 23 insertions(+), 1 deletion(-)

(limited to 'string.c')

diff --git a/string.c b/string.c
index 6b8f2eaf6f..0d8b62780b 100644
--- a/string.c
+++ b/string.c
@@ -9615,7 +9615,6 @@ rb_str_unicode_normalize(int argc, VALUE *argv, VALUE str)
 	rb_require("unicode_normalize/normalize.rb");
 	UnicodeNormalizeRequired = 1;
     }
-    /* return rb_funcall2(str, id_unicode_normalize, argc, argv); */
     if (argc==0)
 	return rb_funcall(mUnicodeNormalize, id_normalize, 1, str);
     else if (argc==1)
@@ -9624,6 +9623,28 @@ rb_str_unicode_normalize(int argc, VALUE *argv, VALUE str)
 	rb_raise(rb_eArgError, "too many arguments to unicode_normalize");
 }
 
+/*
+ *  call-seq:
+ *    str.unicode_normalize!(form=:nfc)
+ *
+ *  Destructive version of String#unicode_normalize, doing Unicode
+ *  normalization in place.
+ */
+static VALUE
+rb_str_unicode_normalize_bang(int argc, VALUE *argv, VALUE str)
+{
+    if (!UnicodeNormalizeRequired) {
+	rb_require("unicode_normalize/normalize.rb");
+	UnicodeNormalizeRequired = 1;
+    }
+    if (argc==0)
+	return rb_str_replace(str, rb_funcall(mUnicodeNormalize, id_normalize, 1, str));
+    else if (argc==1)
+	return rb_str_replace(str, rb_funcall(mUnicodeNormalize, id_normalize, 2, str, argv[0]));
+    else
+	rb_raise(rb_eArgError, "too many arguments to unicode_normalize!");
+}
+
 /**********************************************************************
  * Document-class: Symbol
  *
@@ -10277,6 +10298,7 @@ Init_String(void)
     id_normalize               = rb_intern("normalize");
 
     rb_define_method(rb_cString, "unicode_normalize", rb_str_unicode_normalize, -1);
+    rb_define_method(rb_cString, "unicode_normalize!", rb_str_unicode_normalize_bang, -1);
 
     rb_fs = Qnil;
     rb_define_hooked_variable("$;", &rb_fs, 0, rb_fs_setter);
-- 
cgit v1.2.3