opuppet/puppetlabs-stdlib
4
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

range: remove dead code

Browse source 
Since a ParseError is always thrown for zero arguments, the if and all
dependent code can be removed.
This commit is contained in:
David Schmitt 2015-04-22 16:21:21 -07:00
parent 9bae8356fd
commit 063c58a992
1 changed files with 6 additions and 30 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

30
lib/puppet/parser/functions/range.rb
View file

@ -41,30 +41,10 @@ Will return: [0,2,4,6,8]
raise(Puppet::ParseError, "range(): Wrong number of " + raise(Puppet::ParseError, "range(): Wrong number of " +
"arguments given (#{arguments.size} for 1)") if arguments.size < 1 "arguments given (#{arguments.size} for 1)") if arguments.size < 1
if arguments.size > 1
start = arguments[0] start = arguments[0]
stop = arguments[1] stop = arguments[1]
step = arguments[2].nil? ? 1 : arguments[2].to_i.abs 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
# Check whether we have integer value if so then make it so ... # Check whether we have integer value if so then make it so ...
if start.to_s.match(/^\d+$/) if start.to_s.match(/^\d+$/)
start = start.to_i start = start.to_i
@ -74,14 +54,10 @@ Will return: [0,2,4,6,8]
stop = stop.to_s stop = stop.to_s
end end
range = case type # We select simplest type for Range available in Ruby ...
when /^(\.\.|\-)$/ then (start .. stop) range = (start .. stop)
when /^(\.\.\.)$/ then (start ... stop) # Exclusive of last element ...
end
result = range.step(step).collect { |i| i } # Get them all ... Pokemon ... range.step(step).collect { |i| i } # Get them all ... Pokemon ...
return result
end end
end end