summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDavid Schmitt <david.schmitt@puppetlabs.com>2015-04-22 16:21:21 -0700
committerDavid Schmitt <david.schmitt@puppetlabs.com>2015-05-05 13:30:57 +0100
commit063c58a992c1b5441b7e7b2a2e4886531035bb25 (patch)
tree1f6f56f686fb57b621a9eee99f23d169339728d1
parent9bae8356fded9d1c7aaea96cba246709bfe1a516 (diff)
range: remove dead code
Since a ParseError is always thrown for zero arguments, the if and all dependent code can be removed.
-rw-r--r--lib/puppet/parser/functions/range.rb36
1 files changed, 6 insertions, 30 deletions
diff --git a/lib/puppet/parser/functions/range.rb b/lib/puppet/parser/functions/range.rb
index 49fba21..16d189f 100644
--- a/lib/puppet/parser/functions/range.rb
+++ b/lib/puppet/parser/functions/range.rb
@@ -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
-
- result = range.step(step).collect { |i| i } # Get them all ... Pokemon ...
+ # We select simplest type for Range available in Ruby ...
+ range = (start .. stop)
- return result
+ range.step(step).collect { |i| i } # Get them all ... Pokemon ...
end
end