diff options
Diffstat (limited to 'lib/puppet')
| -rw-r--r-- | lib/puppet/parser/ast/definition.rb | 18 | ||||
| -rw-r--r-- | lib/puppet/parser/ast/hostclass.rb | 8 | ||||
| -rw-r--r-- | lib/puppet/parser/ast/node.rb | 10 | ||||
| -rw-r--r-- | lib/puppet/parser/ast/resourceoverride.rb | 2 | ||||
| -rw-r--r-- | lib/puppet/parser/compile.rb | 12 | ||||
| -rw-r--r-- | lib/puppet/parser/scope.rb | 71 |
6 files changed, 53 insertions, 68 deletions
diff --git a/lib/puppet/parser/ast/definition.rb b/lib/puppet/parser/ast/definition.rb index cd59da8af..c350c2cdb 100644 --- a/lib/puppet/parser/ast/definition.rb +++ b/lib/puppet/parser/ast/definition.rb @@ -32,7 +32,7 @@ class Puppet::Parser::AST resource = options[:resource] # Create a new scope. - scope = subscope(origscope, resource.title) + scope = subscope(origscope, resource) scope.virtual = true if resource.virtual or origscope.virtual? scope.exported = true if resource.exported or origscope.exported? @@ -125,14 +125,22 @@ class Puppet::Parser::AST end # Create a new subscope in which to evaluate our code. - def subscope(scope, name = nil) + def subscope(scope, resource = nil) + if resource + type = resource.type + else + type = self.classname + end args = { - :type => self.classname, + :resource => resource, + :type => type, :keyword => self.keyword, - :namespace => self.namespace + :namespace => self.namespace, + :source => self } - args[:name] = name if name + args[:name] = resource.title if resource + oldscope = scope scope = scope.newscope(args) scope.source = self diff --git a/lib/puppet/parser/ast/hostclass.rb b/lib/puppet/parser/ast/hostclass.rb index 8959dc900..41ca34432 100644 --- a/lib/puppet/parser/ast/hostclass.rb +++ b/lib/puppet/parser/ast/hostclass.rb @@ -24,7 +24,7 @@ class Puppet::Parser::AST scope = options[:scope] # Verify that we haven't already been evaluated. This is # what provides the singleton aspect. - if existing_scope = scope.class_scope(self) + if existing_scope = scope.compile.class_scope(self) Puppet.debug "%s class already evaluated" % @type return nil end @@ -38,7 +38,7 @@ class Puppet::Parser::AST end unless options[:nosubscope] - scope = subscope(scope) + scope = subscope(scope, options[:resource]) end if pnames @@ -49,7 +49,7 @@ class Puppet::Parser::AST # Set the class before we do anything else, so that it's set # during the evaluation and can be inspected. - scope.setclass(self) + scope.compile.class_set(self.classname, scope) # Now evaluate our code, yo. if self.code @@ -65,7 +65,7 @@ class Puppet::Parser::AST end def parent_scope(scope, klass) - if s = scope.class_scope(klass) + if s = scope.compile.class_scope(klass) return s else raise Puppet::DevError, "Could not find scope for %s" % klass.fqname diff --git a/lib/puppet/parser/ast/node.rb b/lib/puppet/parser/ast/node.rb index 695c15f42..d46df3cff 100644 --- a/lib/puppet/parser/ast/node.rb +++ b/lib/puppet/parser/ast/node.rb @@ -33,7 +33,7 @@ class Puppet::Parser::AST # Mark our node name as a class, too, but strip it of the domain # name. Make the mark before we evaluate the code, so that it is # marked within the code itself. - scope.setclass(self) + scope.compile.class_set(self.classname, scope) # And then evaluate our code if we have any if self.code @@ -53,6 +53,12 @@ class Puppet::Parser::AST end end + # Make sure node scopes are marked as such. + def subscope(*args) + scope = super + scope.nodescope = true + end + private # Search for the object matching our parent class. def find_parentclass @@ -60,5 +66,3 @@ class Puppet::Parser::AST end end end - -# $Id$ diff --git a/lib/puppet/parser/ast/resourceoverride.rb b/lib/puppet/parser/ast/resourceoverride.rb index 26d69ae97..418c9c8e4 100644 --- a/lib/puppet/parser/ast/resourceoverride.rb +++ b/lib/puppet/parser/ast/resourceoverride.rb @@ -44,7 +44,7 @@ class Puppet::Parser::AST # Now we tell the scope that it's an override, and it behaves as # necessary. - scope.setoverride(obj) + scope.compile.store_override(obj) obj end diff --git a/lib/puppet/parser/compile.rb b/lib/puppet/parser/compile.rb index 7159947bf..0ae712e57 100644 --- a/lib/puppet/parser/compile.rb +++ b/lib/puppet/parser/compile.rb @@ -111,20 +111,21 @@ class Puppet::Parser::Compile # Evaluate all of the classes specified by the node. def evaluate_node_classes - evaluate_classes(@node.classes, @parser.findclass("", "")) + evaluate_classes(@node.classes, @topscope) end # Evaluate each specified class in turn. If there are any classes we can't # find, just tag the configuration and move on. This method really just # creates resource objects that point back to the classes, and then the # resources are themselves evaluated later in the process. - def evaluate_classes(classes, source) + def evaluate_classes(classes, scope) found = [] classes.each do |name| + # If we can find the class, then make a resource that will evaluate it. if klass = @parser.findclass("", name) # This will result in class_set getting called, which # will in turn result in tags. Yay. - klass.safeevaluate(:scope => topscope) + klass.safeevaluate(:scope => scope) found << name else Puppet.info "Could not find class %s for %s" % [name, node.name] @@ -151,7 +152,7 @@ class Puppet::Parser::Compile @resource_table[string] end - # Set up our configuration. We require a parser + # Set up our compile. We require a parser # and a node object; the parser is so we can look up classes # and AST nodes, and the node has all of the client's info, # like facts and environment. @@ -457,6 +458,9 @@ class Puppet::Parser::Compile # Create our initial scope, our scope graph, and add the initial scope to the graph. @topscope = Puppet::Parser::Scope.new(:compile => self, :type => "main", :name => "top", :parser => self.parser) + #@main = @parser.findclass("", "") + #@main_resource = Puppet::Parser::Resource.new(:type => "class", :title => :main, :scope => @topscope, :source => @main) + #@topscope.resource = @main_resource # For maintaining scope relationships. @scope_graph = GRATR::Digraph.new diff --git a/lib/puppet/parser/scope.rb b/lib/puppet/parser/scope.rb index 635a471df..5f6f15ba6 100644 --- a/lib/puppet/parser/scope.rb +++ b/lib/puppet/parser/scope.rb @@ -15,14 +15,29 @@ class Puppet::Parser::Scope include Enumerable include Puppet::Util::Errors - attr_accessor :parent, :level, :parser, :source - attr_accessor :name, :type, :base, :keyword - attr_accessor :top, :translated, :exported, :virtual, :compile + attr_accessor :parent, :level, :parser, :source, :resource + attr_accessor :base, :keyword, :nodescope + attr_accessor :top, :translated, :compile + + # Temporary accessors. + attr_accessor :name, :type, :title, :exported, :virtual + def exported? + exported + end + def virtual? + virtual + end + #[:name, :type, :title, :exported?, :virtual].each do |method| + # define_method(method) do + # @resource.send(method) + # end + #end # Proxy accessors def host @compile.node.name end + def interpreter @compile.interpreter end @@ -56,20 +71,11 @@ class Puppet::Parser::Scope end end - # Retrieve a given class scope from the compile. - def class_scope(klass) - compile.class_scope(klass) - end - # Are we the top scope? def topscope? @level == 1 end - def exported? - self.exported - end - def findclass(name) @namespaces.each do |namespace| if r = parser.findclass(namespace, name) @@ -164,7 +170,7 @@ class Puppet::Parser::Scope unless klass raise Puppet::ParseError, "Could not find class %s" % klassname end - unless kscope = class_scope(klass) + unless kscope = compile.class_scope(klass) raise Puppet::ParseError, "Class %s has not been evaluated so its variables cannot be referenced" % klass.classname end return kscope.lookupvar(shortname, usestring) @@ -209,7 +215,7 @@ class Puppet::Parser::Scope # is required because of how often the names are used throughout # the system, including on the client. def nodescope? - defined?(@nodescope) and @nodescope + self.nodescope end # We probably shouldn't cache this value... But it's a lot faster @@ -231,37 +237,6 @@ class Puppet::Parser::Scope end end - def resources - @definedtable.values - end - - # Store the fact that we've evaluated a given class. We use a hash - # that gets inherited from the top scope down, rather than a global - # hash. We store the object ID, not class name, so that we - # can support multiple unrelated classes with the same name. - def setclass(klass) - if klass.is_a?(AST::HostClass) - unless name = klass.classname - raise Puppet::DevError, "Got a %s with no fully qualified name" % - klass.class - end - @compile.class_set(name, self) - else - raise Puppet::DevError, "Invalid class %s" % klass.inspect - end - if klass.is_a?(AST::Node) - @nodescope = true - end - nil - end - - # Override a parameter in an existing object. If the object does not yet - # exist, then cache the override in a global table, so it can be flushed - # at the end. - def setoverride(resource) - @compile.store_override(resource) - end - # Set defaults for a type. The typename should already be downcased, # so that the syntax is isolated. We don't do any kind of type-checking # here; instead we let the resource do it when the defaults are used. @@ -433,10 +408,4 @@ class Puppet::Parser::Scope @symtable.delete(var) end end - - def virtual? - self.virtual || self.exported? - end end - -# $Id$ |