summaryrefslogtreecommitdiffstats
path: root/lib/puppet/parser/functions.rb
diff options
context:
space:
mode:
Diffstat (limited to 'lib/puppet/parser/functions.rb')
-rw-r--r--lib/puppet/parser/functions.rb12
1 files changed, 3 insertions, 9 deletions
diff --git a/lib/puppet/parser/functions.rb b/lib/puppet/parser/functions.rb
index 5b07a9c09..c86548bfb 100644
--- a/lib/puppet/parser/functions.rb
+++ b/lib/puppet/parser/functions.rb
@@ -40,9 +40,7 @@ module Puppet::Parser::Functions
def self.newfunction(name, options = {}, &block)
name = symbolize(name)
- if functions.include?(name)
- raise Puppet::DevError, "Function #{name} already defined"
- end
+ raise Puppet::DevError, "Function #{name} already defined" if functions.include?(name)
ftype = options[:type] || :statement
@@ -56,18 +54,14 @@ module Puppet::Parser::Functions
# Someday we'll support specifying an arity, but for now, nope
#functions[name] = {:arity => arity, :type => ftype}
functions[name] = {:type => ftype, :name => fname}
- if options[:doc]
- functions[name][:doc] = options[:doc]
- end
+ functions[name][:doc] = options[:doc] if options[:doc]
end
# Remove a function added by newfunction
def self.rmfunction(name)
name = symbolize(name)
- unless functions.include? name
- raise Puppet::DevError, "Function #{name} is not defined"
- end
+ raise Puppet::DevError, "Function #{name} is not defined" unless functions.include? name
functions.delete name