summaryrefslogtreecommitdiffstats
path: root/lib/puppet/parser/parser_support.rb
diff options
context:
space:
mode:
authorJames Turnbull <james@lovedthanlost.net>2008-02-03 04:55:36 +1100
committerJames Turnbull <james@lovedthanlost.net>2008-02-03 04:55:36 +1100
commitf33c4061ebdf1908176eabd6b524a948de1fbd38 (patch)
tree83e10078a3defad22f87f0684d65d8166feeeedb /lib/puppet/parser/parser_support.rb
parent047ec5435ef81139b60fc60a5a2668c0a7c4ee85 (diff)
parent6ff9423c7ebaf759fcee28a3009cd59bed3ea886 (diff)
downloadpuppet-f33c4061ebdf1908176eabd6b524a948de1fbd38.tar.gz
puppet-f33c4061ebdf1908176eabd6b524a948de1fbd38.tar.xz
puppet-f33c4061ebdf1908176eabd6b524a948de1fbd38.zip
Merge branch '0.24.x' of git://reductivelabs.com/puppet into 0.24.x
Diffstat (limited to 'lib/puppet/parser/parser_support.rb')
-rw-r--r--lib/puppet/parser/parser_support.rb7
1 files changed, 2 insertions, 5 deletions
diff --git a/lib/puppet/parser/parser_support.rb b/lib/puppet/parser/parser_support.rb
index acf3c9f7c..b543cd3ec 100644
--- a/lib/puppet/parser/parser_support.rb
+++ b/lib/puppet/parser/parser_support.rb
@@ -47,11 +47,8 @@ class Puppet::Parser::Parser
# Create an AST object, and automatically add the file and line information if
# available.
- def ast(klass, hash = nil)
- hash ||= {}
- unless hash.include?(:line)
- hash[:line] = @lexer.line
- end
+ def ast(klass, hash = {})
+ hash[:line] = @lexer.line unless hash.include?(:line)
unless hash.include?(:file)
if file = @lexer.file