From 2da5c6fa9340cde1567cf826a004111b3c28f644 Mon Sep 17 00:00:00 2001 From: Luke Shumaker Date: Fri, 21 Apr 2017 21:47:45 -0400 Subject: meta-normalize-stdio: Use '! is_a?' instead of 'class !=' --- bin/meta-normalize-stdio | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/bin/meta-normalize-stdio b/bin/meta-normalize-stdio index a7ca381..ac5d51a 100755 --- a/bin/meta-normalize-stdio +++ b/bin/meta-normalize-stdio @@ -37,7 +37,7 @@ end def semiordered_list(cnt, validator) lambda {|name,ary| - if ary.class != Array + if !ary.is_a?(Array) error "`#{name}' must be a list" else ary.each_index{|i| ary[i] = validator.call("#{name}[#{i}]", ary[i])} @@ -57,7 +57,7 @@ def _unknown(map_name, key) end def unordered_map1(validator) lambda {|name,hash| - if hash.class != Hash + if !hash.is_a?(Hash) error "`#{name}' must be a map" else order = Hash[[*validator.keys.map.with_index]] @@ -74,7 +74,7 @@ end def unordered_map2(key_validator, val_validator) lambda {|name,hash| - if hash.class != Hash + if !hash.is_a?(Hash) error "`#{name}' must be a map" else hash = Hash[hash.sort_by{|k,v| k}] @@ -88,7 +88,7 @@ def unordered_map2(key_validator, val_validator) end string = lambda {|name,str| - if str.class != String + if !str.is_a?(String) error "`#{name}' must be a string" else str @@ -98,7 +98,7 @@ string = lambda {|name,str| # Regular Expression String def restring(re) lambda {|name,str| - if str.class != String + if !str.is_a?(String) error "`#{name}' must be a string" else unless re =~ str @@ -113,7 +113,7 @@ end # Specific validators/formatters year = lambda {|name, num| - if num.class != Fixnum + if !num.is_a?(Fixnum) error "`#{name}' must be a year" else if (num < 1900 || num > 3000) @@ -126,7 +126,7 @@ year = lambda {|name, num| # This regex is taken from http://www.w3.org/TR/html5/forms.html#valid-e-mail-address _email_regex = /^[a-zA-Z0-9.!\#$%&'*+\/=?^_`{|}~-]+@[a-zA-Z0-9](?:[a-zA-Z0-9-]{0,61}[a-zA-Z0-9])?(?:\.[a-zA-Z0-9](?:[a-zA-Z0-9-]{0,61}[a-zA-Z0-9])?)*$/ email_list = lambda {|name, ary| - if ary.class != Array + if !ary.is_a?(Array) error "`#{name}' must be a list" elsif not ary.empty? preserve = 1 @@ -139,7 +139,7 @@ email_list = lambda {|name, ary| } shell = lambda {|name, sh| - if sh.class != String + if !sh.is_a?(String) error "`#{name}' must be a string" else @valid_shells ||= open("/etc/shells").read.split("\n") -- cgit v1.2.2