Merge remote branch 'paul/ticket/next/4685' into next

Conflicts resolved manually, by Paul Berry:
  lib/puppet/parser/ast/astarray.rb
  lib/puppet/parser/grammar.ra
  lib/puppet/parser/parser.rb (by rebuilding from grammar.ra)

1 files changed, 4 insertions, 16 deletions

diff --git a/lib/puppet/parser/ast/astarray.rb b/lib/puppet/parser/ast/astarray.rb
index b62c820ca..7283a1f6c 100644
--- a/lib/puppet/parser/ast/astarray.rb
+++ b/lib/puppet/parser/ast/astarray.rb
@@ -9,11 +9,6 @@ class Puppet::Parser::AST
   class ASTArray < Branch
     include Enumerable
 
-    # True if this ASTArray represents a list of statements in a
-    # context that defines a namespace.  Classes and definitions may
-    # only appear in such a context.
-    attr_accessor :is_a_namespace
-
     # Return a child by index.  Probably never used.
     def [](index)
       @children[index]
@@ -23,17 +18,10 @@ class Puppet::Parser::AST
     def evaluate(scope)
       result = []
       @children.each do |child|
-        if child.respond_to? :instantiate
-          if is_a_namespace
-            # no problem, just don't evaluate it.
-          else
-            msg = "Classes, definitions, and nodes may only appear at toplevel or inside other classes"
-            error = Puppet::Error.new(msg)
-            error.line = child.line
-            error.file = child.file
-            raise error
-          end
-        else
+        # Skip things that respond to :instantiate (classes, nodes,
+        # and definitions), because they have already been
+        # instantiated.
+        if !child.respond_to?(:instantiate)
           item = child.safeevaluate(scope)
           if !item.nil?
             # nil values are implicitly removed.