[whimsy] branch master updated: Avoid ambiguous first argument warnings

[sebb]

This is an automated email from the ASF dual-hosted git repository.

sebb pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/whimsy.git


The following commit(s) were added to refs/heads/master by this push:
     new 1d0e9ad  Avoid ambiguous first argument warnings
1d0e9ad is described below

commit 1d0e9ad4390912eb1bfc23c47e712d2f4fdaf707
Author: Sebb <s...@apache.org>
AuthorDate: Sun Jan 12 22:08:58 2020 +0000

    Avoid ambiguous first argument warnings
---
 lib/whimsy/asf/person.rb | 82 ++++++++++++++++++++++++------------------------
 1 file changed, 41 insertions(+), 41 deletions(-)

diff --git a/lib/whimsy/asf/person.rb b/lib/whimsy/asf/person.rb
index 0203c86..5cfd60c 100644
--- a/lib/whimsy/asf/person.rb
+++ b/lib/whimsy/asf/person.rb
@@ -12,55 +12,55 @@ module ASF
     # sort support
 
     def self.asciize(name)
-      if name.match /[^\x00-\x7F]/
+      if name.match %r{[^\x00-\x7F]}
         # digraphs.  May be culturally sensitive
-        name.gsub! /\u00df/, 'ss'
-        name.gsub! /\u00e4|a\u0308/, 'ae'
-        name.gsub! /\u00e5|a\u030a/, 'aa'
-        name.gsub! /\u00e6/, 'ae'
-        name.gsub! /\u00f1|n\u0303/, 'ny'
-        name.gsub! /\u00f6|o\u0308/, 'oe'
-        name.gsub! /\u00fc|u\u0308/, 'ue'
+        name.gsub! %r{\u00df}, 'ss'
+        name.gsub! %r{\u00e4|a\u0308}, 'ae'
+        name.gsub! %r{\u00e5|a\u030a}, 'aa'
+        name.gsub! %r{\u00e6}, 'ae'
+        name.gsub! %r{\u00f1|n\u0303}, 'ny'
+        name.gsub! %r{\u00f6|o\u0308}, 'oe'
+        name.gsub! %r{\u00fc|u\u0308}, 'ue'
 
         # latin 1
-        name.gsub! /\u00c9/, 'e'
-        name.gsub! /\u00d3/, 'o'
-        name.gsub! /[\u00e0-\u00e5]/, 'a'
-        name.gsub! /\u00e7/, 'c'
-        name.gsub! /[\u00e8-\u00eb]/, 'e'
-        name.gsub! /[\u00ec-\u00ef]/, 'i'
-        name.gsub! /[\u00f2-\u00f6]|\u00f8/, 'o'
-        name.gsub! /[\u00f9-\u00fc]/, 'u'
-        name.gsub! /[\u00fd\u00ff]/, 'y'
+        name.gsub! %r{\u00c9}, 'e'
+        name.gsub! %r{\u00d3}, 'o'
+        name.gsub! %r{[\u00e0-\u00e5]}, 'a'
+        name.gsub! %r{\u00e7}, 'c'
+        name.gsub! %r{[\u00e8-\u00eb]}, 'e'
+        name.gsub! %r{[\u00ec-\u00ef]}, 'i'
+        name.gsub! %r{[\u00f2-\u00f6]|\u00f8}, 'o'
+        name.gsub! %r{[\u00f9-\u00fc]}, 'u'
+        name.gsub! %r{[\u00fd\u00ff]}, 'y'
 
         # Latin Extended-A
-        name.gsub! /[\u0100-\u0105]/, 'a'
-        name.gsub! /[\u0106-\u010d]/, 'c'
-        name.gsub! /[\u010e-\u0111]/, 'd'
-        name.gsub! /[\u0112-\u011b]/, 'e'
-        name.gsub! /[\u011c-\u0123]/, 'g'
-        name.gsub! /[\u0124-\u0127]/, 'h'
-        name.gsub! /[\u0128-\u0131]/, 'i'
-        name.gsub! /[\u0132-\u0133]/, 'ij'
-        name.gsub! /[\u0134-\u0135]/, 'j'
-        name.gsub! /[\u0136-\u0138]/, 'k'
-        name.gsub! /[\u0139-\u0142]/, 'l'
-        name.gsub! /[\u0143-\u014b]/, 'n'
-        name.gsub! /[\u014C-\u0151]/, 'o'
-        name.gsub! /[\u0152-\u0153]/, 'oe'
-        name.gsub! /[\u0154-\u0159]/, 'r'
-        name.gsub! /[\u015a-\u0162]/, 's'
-        name.gsub! /[\u0162-\u0167]/, 't'
-        name.gsub! /[\u0168-\u0173]/, 'u'
-        name.gsub! /[\u0174-\u0175]/, 'w'
-        name.gsub! /[\u0176-\u0178]/, 'y'
-        name.gsub! /[\u0179-\u017e]/, 'z'
+        name.gsub! %r{[\u0100-\u0105]}, 'a'
+        name.gsub! %r{[\u0106-\u010d]}, 'c'
+        name.gsub! %r{[\u010e-\u0111]}, 'd'
+        name.gsub! %r{[\u0112-\u011b]}, 'e'
+        name.gsub! %r{[\u011c-\u0123]}, 'g'
+        name.gsub! %r{[\u0124-\u0127]}, 'h'
+        name.gsub! %r{[\u0128-\u0131]}, 'i'
+        name.gsub! %r{[\u0132-\u0133]}, 'ij'
+        name.gsub! %r{[\u0134-\u0135]}, 'j'
+        name.gsub! %r{[\u0136-\u0138]}, 'k'
+        name.gsub! %r{[\u0139-\u0142]}, 'l'
+        name.gsub! %r{[\u0143-\u014b]}, 'n'
+        name.gsub! %r{[\u014C-\u0151]}, 'o'
+        name.gsub! %r{[\u0152-\u0153]}, 'oe'
+        name.gsub! %r{[\u0154-\u0159]}, 'r'
+        name.gsub! %r{[\u015a-\u0162]}, 's'
+        name.gsub! %r{[\u0162-\u0167]}, 't'
+        name.gsub! %r{[\u0168-\u0173]}, 'u'
+        name.gsub! %r{[\u0174-\u0175]}, 'w'
+        name.gsub! %r{[\u0176-\u0178]}, 'y'
+        name.gsub! %r{[\u0179-\u017e]}, 'z'
 
         # denormalized diacritics
-        name.gsub! /[\u0300-\u036f]/, ''
+        name.gsub! %r{[\u0300-\u036f]}, ''
       end
 
-      name.strip.gsub /[^\w]+/, '-'
+      name.strip.gsub %r{[^\w]+}, '-'
     end
 
     # generational suffixes
@@ -73,7 +73,7 @@ module ASF
       suffix += ' ' + name.shift if name.first =~ SUFFIXES
       name << name.shift
       # name << name.shift if name.first=='van'
-      name.last.sub! /^IJ/, 'Ij'
+      name.last.sub! %r{^IJ}, 'Ij'
       name.unshift(suffix) if suffix
       name.map! {|word| asciize(word)}
       name.reverse.join(' ').downcase