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)

2 files changed, 8 insertions, 2 deletions

diff --git a/spec/unit/parser/ast/definition_spec.rb b/spec/unit/parser/ast/definition_spec.rb
index 01ca068ad..b7b2c851c 100644
--- a/spec/unit/parser/ast/definition_spec.rb
+++ b/spec/unit/parser/ast/definition_spec.rb
@@ -3,6 +3,11 @@
 require File.dirname(__FILE__) + '/../../../spec_helper'
 
 describe Puppet::Parser::AST::Definition do
+  it "should make its context available through an accessor" do
+    definition = Puppet::Parser::AST::Definition.new('foo', :line => 5)
+    definition.context.should == {:line => 5}
+  end
+
   describe "when instantiated" do
     it "should create a definition with the proper type, name, context, and module name" do
       definition = Puppet::Parser::AST::Definition.new('foo', :line => 5)
diff --git a/spec/unit/parser/ast/node_spec.rb b/spec/unit/parser/ast/node_spec.rb
index 409e877f9..3e8017de0 100644
--- a/spec/unit/parser/ast/node_spec.rb
+++ b/spec/unit/parser/ast/node_spec.rb
@@ -4,9 +4,10 @@ require File.dirname(__FILE__) + '/../../../spec_helper'
 
 describe Puppet::Parser::AST::Node do
   describe "when instantiated" do
-    it "should make its names available through an accessor" do
-      node = Puppet::Parser::AST::Node.new(['foo', 'bar'])
+    it "should make its names and context available through accessors" do
+      node = Puppet::Parser::AST::Node.new(['foo', 'bar'], :line => 5)
       node.names.should == ['foo', 'bar']
+      node.context.should == {:line => 5}
     end
 
     it "should create a node with the proper type, name, context, and module name" do