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, 3 insertions, 3 deletions

diff --git a/lib/puppet/parser/parser_support.rb b/lib/puppet/parser/parser_support.rb
index 1c4947891..b1688cd22 100644
--- a/lib/puppet/parser/parser_support.rb
+++ b/lib/puppet/parser/parser_support.rb
@@ -59,13 +59,13 @@ class Puppet::Parser::Parser
   end
 
   # Raise a Parse error.
-  def error(message)
+  def error(message, options = {})
     if brace = @lexer.expected
       message += "; expected '%s'"
     end
     except = Puppet::ParseError.new(message)
-    except.line = @lexer.line
-    except.file = @lexer.file if @lexer.file
+    except.line = options[:line] || @lexer.line
+    except.file = options[:file] || @lexer.file
 
     raise except
   end