Committing both the finalization of the config code, plus all of the code necessary to get basic isomorphism from code to transportables and back. Mostly keyword and autoname stuff.

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

1 files changed, 5 insertions, 4 deletions

diff --git a/lib/puppet/parser/ast/nodedef.rb b/lib/puppet/parser/ast/nodedef.rb
index c0e1ee63e..da93069b2 100644
--- a/lib/puppet/parser/ast/nodedef.rb
+++ b/lib/puppet/parser/ast/nodedef.rb
@@ -3,7 +3,7 @@ class Puppet::Parser::AST
     # specified node, and this parse tree is only ever looked up when
     # a client connects.
     class NodeDef < AST::Branch
-        attr_accessor :names, :code, :parentclass
+        attr_accessor :names, :code, :parentclass, :keyword
 
         def each
             [@names,@code].each { |child| yield child }
@@ -30,9 +30,9 @@ class Puppet::Parser::AST
                 end
 
                 begin
-                    scope.setnode(name,
-                        Node.new(arghash)
-                    )
+                    node = Node.new(arghash)
+                    node.keyword = true
+                    scope.setnode(name, node)
                 rescue Puppet::ParseError => except
                     except.line = self.line
                     except.file = self.file
@@ -48,6 +48,7 @@ class Puppet::Parser::AST
 
         def initialize(hash)
             @parentclass = nil
+            @keyword = "node"
             super
         end