Adding better error reporting on unmatched brackets -- you will now get notification of what was expected in most cases

git-svn-id: https://reductivelabs.com/svn/puppet/trunk@2531 980ebf18-57e1-0310-9a29-db15c13687c0

1 files changed, 7 insertions, 0 deletions

diff --git a/lib/puppet/parser/grammar.ra b/lib/puppet/parser/grammar.ra
index c8130ccf0..2d09c9671 100644
--- a/lib/puppet/parser/grammar.ra
+++ b/lib/puppet/parser/grammar.ra
@@ -655,6 +655,9 @@ end
 
 # Raise a Parse error.
 def error(message)
+    if brace = @lexer.expected
+        message += "; expected '%s'"
+    end
     except = Puppet::ParseError.new(message)
     except.line = @lexer.line
     if @lexer.file
@@ -758,6 +761,10 @@ def on_error(token,value,stack)
     #    [@lexer.line,@lexer.last]
     error = "Syntax error at '%s'" % [value]
 
+    if brace = @lexer.expected
+        error += "; expected '%s'" % brace
+    end
+
     except = Puppet::ParseError.new(error)
     except.line = @lexer.line
     if @lexer.file