summaryrefslogtreecommitdiff
path: root/bin/meta-normalize-stdio
diff options
context:
space:
mode:
authorLuke Shumaker <lukeshu@lukeshu.com>2017-04-21 21:47:45 -0400
committerLuke Shumaker <lukeshu@lukeshu.com>2017-04-21 21:47:45 -0400
commit2da5c6fa9340cde1567cf826a004111b3c28f644 (patch)
treef21cb43cdaf1f641510ecafec1a37c954565081d /bin/meta-normalize-stdio
parenta4f6795caea46360a1f8a2517778900b2d3cf41a (diff)
meta-normalize-stdio: Use '! is_a?' instead of 'class !='
Diffstat (limited to 'bin/meta-normalize-stdio')
-rwxr-xr-xbin/meta-normalize-stdio16
1 files 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")