Fixing #314 and #729; here's the changelog:

    Refactored how the parser and interpreter relate,
    so parsing is now effectively an atomic process (thus
    fixing #314 and #729).  This makes the interpreter less
    prone to error and less prone to show the error to the
    clients.  Note that this means that if a configuration
    fails to parse, then the previous, parseable configuration
    will be used instead, so the client will not know that
    the configuration failed to parse.



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

2 files changed, 3 insertions, 3 deletions

diff --git a/lib/puppet/parser/ast/component.rb b/lib/puppet/parser/ast/component.rb
index 43ca85e4a..65f310212 100644
--- a/lib/puppet/parser/ast/component.rb
+++ b/lib/puppet/parser/ast/component.rb
@@ -16,7 +16,7 @@ class Puppet::Parser::AST
         @name = :definition
 
         attr_accessor :classname, :arguments, :code, :scope, :keyword
-        attr_accessor :exported, :namespace, :interp, :virtual
+        attr_accessor :exported, :namespace, :parser, :virtual
 
         # These are retrieved when looking up the superclass
         attr_accessor :name
@@ -140,7 +140,7 @@ class Puppet::Parser::AST
         end
 
         def find_parentclass
-            @interp.findclass(namespace, parentclass)
+            @parser.findclass(namespace, parentclass)
         end
 
         # Set our parent class, with a little check to avoid some potential
diff --git a/lib/puppet/parser/ast/node.rb b/lib/puppet/parser/ast/node.rb
index e873cac46..b9052168a 100644
--- a/lib/puppet/parser/ast/node.rb
+++ b/lib/puppet/parser/ast/node.rb
@@ -56,7 +56,7 @@ class Puppet::Parser::AST
         private
         # Search for the object matching our parent class.
         def find_parentclass
-            @interp.nodesearch(parentclass)
+            @parser.findnode(parentclass)
         end
     end
 end