The "collectable" syntax now works end-to-end -- the parser correctly recognizes it, the AST objects retain the settings, the scopes do the right conversion, the interpreter stores them all in the database, and then it strips the collectable objects out before sending the object list to the client

git-svn-id: https://reductivelabs.com/svn/puppet/trunk@1189 980ebf18-57e1-0310-9a29-db15c13687c0

1 files changed, 6 insertions, 1 deletions

diff --git a/lib/puppet/parser/ast/objectdef.rb b/lib/puppet/parser/ast/objectdef.rb
index 9acf56b49..f15a082e2 100644
--- a/lib/puppet/parser/ast/objectdef.rb
+++ b/lib/puppet/parser/ast/objectdef.rb
@@ -2,7 +2,7 @@ class Puppet::Parser::AST
     # Any normal puppet object declaration.  Can result in a class or a 
     # component, in addition to builtin types.
     class ObjectDef < AST::Branch
-        attr_accessor :name, :type
+        attr_accessor :name, :type, :collectable
         attr_reader :params
 
         # probably not used at all
@@ -93,6 +93,11 @@ class Puppet::Parser::AST
                         :file => @file,
                         :line => @line
                     )
+
+                    # Retain our collectable marking
+                    if self.collectable
+                        obj.collectable = true
+                    end
                 rescue Puppet::ParseError => except
                     except.line = self.line
                     except.file = self.file