From d95b687045920c7d7fed5da1fe03b0feac86327a Mon Sep 17 00:00:00 2001
From: Brice Figureau <brice-puppet@daysofwonder.com>
Date: Thu, 23 Jul 2009 23:09:34 +0200
Subject: Fix #2439 - let puppetdoc use loaded_code

Since there isn't any unit test for puppetdoc rdoc code (my fault),
nobody noticed it was using direct access to the parser AST array.
This changeset fixes the way puppetdoc uses the parser results.

Signed-off-by: Brice Figureau <brice-puppet@daysofwonder.com>
---
 lib/puppet/parser/loaded_code.rb | 6 ++++++
 lib/puppet/util/rdoc/parser.rb   | 6 +++---
 2 files changed, 9 insertions(+), 3 deletions(-)

(limited to 'lib/puppet')

diff --git a/lib/puppet/parser/loaded_code.rb b/lib/puppet/parser/loaded_code.rb
index 7c918d4c3..6c519613f 100644
--- a/lib/puppet/parser/loaded_code.rb
+++ b/lib/puppet/parser/loaded_code.rb
@@ -65,6 +65,12 @@ class Puppet::Parser::LoadedCode
         find(namespace, name, :definition)
     end
 
+    [:hostclasses, :nodes, :definitions].each do |m|
+        define_method(m) do
+            instance_variable_get("@#{m}").dup
+        end
+    end
+
     private
 
     def find_fully_qualified(name, type)
diff --git a/lib/puppet/util/rdoc/parser.rb b/lib/puppet/util/rdoc/parser.rb
index 1d4fa966a..7954865f8 100644
--- a/lib/puppet/util/rdoc/parser.rb
+++ b/lib/puppet/util/rdoc/parser.rb
@@ -281,7 +281,7 @@ class Parser
     # that contains the documentation
     def parse_elements(container)
         Puppet.debug "rdoc: scanning manifest"
-        @ast[:classes].values.sort { |a,b| a.classname <=> b.classname }.each do |klass|
+        @ast.hostclasses.values.sort { |a,b| a.classname <=> b.classname }.each do |klass|
             name = klass.classname
             if klass.file == @input_file_name
                 unless name.empty?
@@ -294,13 +294,13 @@ class Parser
             end
         end
 
-        @ast[:definitions].each do |name, define|
+        @ast.definitions.each do |name, define|
             if define.file == @input_file_name
                 document_define(name,define,container)
             end
         end
 
-        @ast[:nodes].each do |name, node|
+        @ast.nodes.each do |name, node|
             if node.file == @input_file_name
                 document_node(name,node,container)
             end
-- 
cgit