And we have multiple environment support in the parser. The only remaining piece to make this complete is to add multiple environment support to the fileserver. I also renamed Configuration.rb to Compile.rb (that is, I fixed all the classes that used to know it as a configuration).

1 files changed, 2 insertions, 2 deletions

diff --git a/lib/puppet/parser/interpreter.rb b/lib/puppet/parser/interpreter.rb
index c0f9d32a7..b6c61d202 100644
--- a/lib/puppet/parser/interpreter.rb
+++ b/lib/puppet/parser/interpreter.rb
@@ -25,7 +25,7 @@ class Puppet::Parser::Interpreter
 
     # evaluate our whole tree
     def compile(node)
-        return Puppet::Parser::Configuration.new(node, parser(node.environment), :ast_nodes => usenodes?).compile
+        return Puppet::Parser::Compile.new(node, parser(node.environment), :ast_nodes => usenodes?).compile
     end
 
     # create our interpreter
@@ -62,7 +62,7 @@ class Puppet::Parser::Interpreter
     # Create a new parser object and pre-parse the configuration.
     def create_parser(environment)
         begin
-            parser = Puppet::Parser::Parser.new(environment)
+            parser = Puppet::Parser::Parser.new(:environment => environment)
             if self.code
                 parser.string = self.code
             elsif self.file