From f47033e237cb474c43dea364698d8b327f4a0813 Mon Sep 17 00:00:00 2001
From: duerst <duerst@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>
Date: Thu, 4 May 2017 02:16:27 +0000
Subject: refactor common parts of unicode normalization functions into
 unicode_normalize_common

In string.c, refactor the common parts (requiring of unicode_normalize/normalize.rb,
check of number of arguments) of the unicode normalization functions
(rb_str_unicode_normalize, rb_str_unicode_normalize_bang, rb_str_unicode_normalized_p)
into the new function unicode_normalize_common.

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@58558 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
---
 string.c | 51 ++++++++++++++++++++-------------------------------
 1 file changed, 20 insertions(+), 31 deletions(-)

(limited to 'string.c')

diff --git a/string.c b/string.c
index e4229d2656..0979a89a74 100644
--- a/string.c
+++ b/string.c
@@ -9585,7 +9585,23 @@ str_scrub_bang(int argc, VALUE *argv, VALUE str)
 static VALUE id_normalize;
 static VALUE id_normalized_p;
 static VALUE mUnicodeNormalize;
-static int UnicodeNormalizeRequired = 0;
+
+static VALUE
+unicode_normalize_common(int argc, VALUE *argv, VALUE str, VALUE id)
+{
+    static int UnicodeNormalizeRequired = 0;
+
+    if (!UnicodeNormalizeRequired) {
+	rb_require("unicode_normalize/normalize.rb");
+	UnicodeNormalizeRequired = 1;
+    }
+    if (argc==0)
+	return rb_funcall(mUnicodeNormalize, id, 1, str);
+    else if (argc==1)
+	return rb_funcall(mUnicodeNormalize, id, 2, str, argv[0]);
+    else
+	rb_raise(rb_eArgError, "too many arguments to unicode normalization function");
+}
 
 /*
  *  call-seq:
@@ -9612,16 +9628,7 @@ static int UnicodeNormalizeRequired = 0;
 static VALUE
 rb_str_unicode_normalize(int argc, VALUE *argv, VALUE str)
 {
-    if (!UnicodeNormalizeRequired) {
-	rb_require("unicode_normalize/normalize.rb");
-	UnicodeNormalizeRequired = 1;
-    }
-    if (argc==0)
-	return rb_funcall(mUnicodeNormalize, id_normalize, 1, str);
-    else if (argc==1)
-	return rb_funcall(mUnicodeNormalize, id_normalize, 2, str, argv[0]);
-    else
-	rb_raise(rb_eArgError, "too many arguments to unicode_normalize");
+    return unicode_normalize_common(argc, argv, str, id_normalize);
 }
 
 /*
@@ -9634,16 +9641,7 @@ rb_str_unicode_normalize(int argc, VALUE *argv, VALUE str)
 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!");
+    return rb_str_replace(str, unicode_normalize_common(argc, argv, str, id_normalize));
 }
 
 /*  call-seq:
@@ -9666,16 +9664,7 @@ rb_str_unicode_normalize_bang(int argc, VALUE *argv, VALUE str)
 static VALUE
 rb_str_unicode_normalized_p(int argc, VALUE *argv, VALUE str)
 {
-    if (!UnicodeNormalizeRequired) {
-	rb_require("unicode_normalize/normalize.rb");
-	UnicodeNormalizeRequired = 1;
-    }
-    if (argc==0)
-	return rb_funcall(mUnicodeNormalize, id_normalized_p, 1, str);
-    else if (argc==1)
-	return rb_funcall(mUnicodeNormalize, id_normalized_p, 2, str, argv[0]);
-    else
-	rb_raise(rb_eArgError, "too many arguments to unicode_normalized?");
+    return unicode_normalize_common(argc, argv, str, id_normalized_p);
 }
 
 /**********************************************************************
-- 
cgit v1.2.3