range: remove dead code
Since a ParseError is always thrown for zero arguments, the if and all dependent code can be removed.
This commit is contained in:
parent
9bae8356fd
commit
063c58a992
1 changed files with 6 additions and 30 deletions
|
@ -41,29 +41,9 @@ Will return: [0,2,4,6,8]
|
|||
raise(Puppet::ParseError, "range(): Wrong number of " +
|
||||
"arguments given (#{arguments.size} for 1)") if arguments.size < 1
|
||||
|
||||
if arguments.size > 1
|
||||
start = arguments[0]
|
||||
stop = arguments[1]
|
||||
step = arguments[2].nil? ? 1 : arguments[2].to_i.abs
|
||||
|
||||
type = '..' # We select simplest type for Range available in Ruby ...
|
||||
|
||||
elsif arguments.size > 0
|
||||
value = arguments[0]
|
||||
|
||||
if m = value.match(/^(\w+)(\.\.\.?|\-)(\w+)$/)
|
||||
start = m[1]
|
||||
stop = m[3]
|
||||
|
||||
type = m[2]
|
||||
|
||||
elsif value.match(/^.+$/)
|
||||
raise(Puppet::ParseError, 'range(): Unable to compute range ' +
|
||||
'from the value given')
|
||||
else
|
||||
raise(Puppet::ParseError, 'range(): Unknown format of range given')
|
||||
end
|
||||
end
|
||||
start = arguments[0]
|
||||
stop = arguments[1]
|
||||
step = arguments[2].nil? ? 1 : arguments[2].to_i.abs
|
||||
|
||||
# Check whether we have integer value if so then make it so ...
|
||||
if start.to_s.match(/^\d+$/)
|
||||
|
@ -74,14 +54,10 @@ Will return: [0,2,4,6,8]
|
|||
stop = stop.to_s
|
||||
end
|
||||
|
||||
range = case type
|
||||
when /^(\.\.|\-)$/ then (start .. stop)
|
||||
when /^(\.\.\.)$/ then (start ... stop) # Exclusive of last element ...
|
||||
end
|
||||
# We select simplest type for Range available in Ruby ...
|
||||
range = (start .. stop)
|
||||
|
||||
result = range.step(step).collect { |i| i } # Get them all ... Pokemon ...
|
||||
|
||||
return result
|
||||
range.step(step).collect { |i| i } # Get them all ... Pokemon ...
|
||||
end
|
||||
end
|
||||
|
||||
|
|
Loading…
Reference in a new issue