From b832d815c3211f22945cbce56dfbf61116f7a792 Mon Sep 17 00:00:00 2001 From: Brice Figureau Date: Wed, 4 Nov 2009 20:21:16 +0100 Subject: Fix #2784 - puppetdoc/rdoc didn't parse mono-instruction class content class klass { include a, b, c } wasn't producing any rdoc documentation. We were thinking code was always embedded in an array which is not the case for mono-instruction code. Signed-off-by: Brice Figureau --- lib/puppet/util/rdoc/parser.rb | 3 +++ 1 file changed, 3 insertions(+) (limited to 'lib/puppet') diff --git a/lib/puppet/util/rdoc/parser.rb b/lib/puppet/util/rdoc/parser.rb index aa34335cc..d7e1c30fa 100644 --- a/lib/puppet/util/rdoc/parser.rb +++ b/lib/puppet/util/rdoc/parser.rb @@ -148,6 +148,7 @@ class Parser # create documentation for include statements we can find in +code+ # and associate it with +container+ def scan_for_include_or_require(container, code) + code = [code] unless code.is_a?(Array) code.each do |stmt| scan_for_include_or_require(container,stmt.children) if stmt.is_a?(Puppet::Parser::AST::ASTArray) @@ -163,6 +164,7 @@ class Parser # create documentation for global variables assignements we can find in +code+ # and associate it with +container+ def scan_for_vardef(container, code) + code = [code] unless code.is_a?(Array) code.each do |stmt| scan_for_vardef(container,stmt.children) if stmt.is_a?(Puppet::Parser::AST::ASTArray) @@ -176,6 +178,7 @@ class Parser # create documentation for resources we can find in +code+ # and associate it with +container+ def scan_for_resource(container, code) + code = [code] unless code.is_a?(Array) code.each do |stmt| scan_for_resource(container,stmt.children) if stmt.is_a?(Puppet::Parser::AST::ASTArray) -- cgit