The new parser configuration object works now,

but the rest of the compiling process is hosed
(although the parser itself should still be fine).

The configuration object is unifying a lot of work
that was scattered around either the interpreter or
the scopes, and it simplifies the whole system.

However, its new simplicity has made the complexity
of the rest of the system that much more apparent,
and I am resolved to fixing the system rather than
hacking it sufficiently to just make it work.

1 files changed, 4 insertions, 1 deletions

diff --git a/lib/puppet/parser/resource.rb b/lib/puppet/parser/resource.rb
index 18ec15ac0..371f56ec1 100644
--- a/lib/puppet/parser/resource.rb
+++ b/lib/puppet/parser/resource.rb
@@ -72,12 +72,15 @@ class Puppet::Parser::Resource
 
     # Add any overrides for this object.
     def addoverrides
-        overrides = scope.lookupoverrides(self)
+        overrides = scope.configuration.resource_overrides(self)
+        raise "fix this test"
 
         overrides.each do |over|
             self.merge(over)
         end
 
+        # Remove the overrides, so that the configuration knows there
+        # are none left.
         overrides.clear
     end