diff options
| author | James Turnbull <james@lovedthanlost.net> | 2009-04-06 11:45:23 +1000 |
|---|---|---|
| committer | James Turnbull <james@lovedthanlost.net> | 2009-04-06 11:45:23 +1000 |
| commit | 3aedfd8bbcefcdb92af57e4661a360be9aee2716 (patch) | |
| tree | f44e6bd75fca39f2fd6c87e5d0b6e84ee14dd8e0 /lib/puppet/parser/ast.rb | |
| parent | 173b5f0a162d8dd7f72e1cab257069bc65382960 (diff) | |
| parent | a677e26eb1452c08d7724047a18e50f4a654d2cd (diff) | |
| download | puppet-3aedfd8bbcefcdb92af57e4661a360be9aee2716.tar.gz puppet-3aedfd8bbcefcdb92af57e4661a360be9aee2716.tar.xz puppet-3aedfd8bbcefcdb92af57e4661a360be9aee2716.zip | |
Merge branch 'master' of git://reductivelabs.com/puppet
Diffstat (limited to 'lib/puppet/parser/ast.rb')
| -rw-r--r-- | lib/puppet/parser/ast.rb | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/lib/puppet/parser/ast.rb b/lib/puppet/parser/ast.rb index 303d75bac..ab23dd1f8 100644 --- a/lib/puppet/parser/ast.rb +++ b/lib/puppet/parser/ast.rb @@ -2,6 +2,7 @@ require 'puppet' require 'puppet/util/autoload' +require 'puppet/file_collection/lookup' # The base class for all of the objects that make up the parse trees. # Handles things like file name, line #, and also does the initialization @@ -10,11 +11,13 @@ class Puppet::Parser::AST # Do this so I don't have to type the full path in all of the subclasses AST = Puppet::Parser::AST + include Puppet::FileCollection::Lookup + include Puppet::Util::Errors include Puppet::Util::MethodHelper include Puppet::Util::Docs - attr_accessor :line, :file, :parent, :scope + attr_accessor :parent, :scope # don't fetch lexer comment by default def use_docs @@ -82,8 +85,6 @@ class Puppet::Parser::AST # method for them. This is probably pretty inefficient and should # likely be changed at some point. def initialize(args) - @file = nil - @line = nil set_options(args) end end |