Merge pull request jruby#9232 from headius/intern_unicode_normalize

Internalize and threadsafetify String#unicode_normalize

Author: headius

core/src/main/ruby/jruby/kernel.rb

@@ -29,3 +29,4 @@ module JRuby
 load 'jruby/kernel/thread.rb'
 load 'jruby/kernel/integer.rb'
 load 'jruby/kernel/time.rb'
+load 'jruby/kernel/string.rb'

core/src/main/ruby/jruby/kernel/enc_prelude.rb

@@ -0,0 +1,27 @@
+# coding: utf-8
+# frozen_string_literal: false
+
+#--
+# additions to class String for Unicode normalization
+#++
+class String
+  def unicode_normalize(form = :nfc)
+    require 'unicode_normalize/normalize.rb'
+    String.send(:define_method, :unicode_normalize, ->(form = :nfc) { UnicodeNormalize.normalize(self, form) } )
+    UnicodeNormalize.normalize(self, form)
+  end
+
+  def unicode_normalize!(form = :nfc)
+    require 'unicode_normalize/normalize.rb'
+    String.send(:define_method, :unicode_normalize!, ->(form = :nfc) { replace(unicode_normalize(form)) } )
+    replace(unicode_normalize(form))
+  end
+
+
+  def unicode_normalized?(form = :nfc)
+    require 'unicode_normalize/normalize.rb'
+    String.send(:define_method, :unicode_normalized?, ->(form = :nfc) { UnicodeNormalize.normalized?(self, form) } )
+    UnicodeNormalize.normalized?(self, form)
+  end
+end
+

core/src/main/ruby/jruby/kernel/string.rb

@@ -1,4 +1,3 @@
 # Load preludes
 load 'jruby/kernel/prelude.rb'
-load 'jruby/kernel/enc_prelude.rb'
 load 'jruby/kernel/gem_prelude.rb'