Merge branch 'master' of git://reductivelabs.com/puppet into routing

1 files changed, 6 insertions, 4 deletions

diff --git a/lib/puppet/parser/parser_support.rb b/lib/puppet/parser/parser_support.rb
index 8cf0dcfe8..acf3c9f7c 100644
--- a/lib/puppet/parser/parser_support.rb
+++ b/lib/puppet/parser/parser_support.rb
@@ -366,10 +366,12 @@ class Puppet::Parser::Parser
     end
 
     def on_error(token,value,stack)
-        #on '%s' at '%s' in\n'%s'" % [token,value,stack]
-        #error = "line %s: parse error after '%s'" %
-        #    [@lexer.line,@lexer.last]
-        error = "Syntax error at '%s'" % [value]
+        if token == 0 # denotes end of file
+            value = 'end of file'
+        else
+            value = "'%s'" % value
+        end
+        error = "Syntax error at %s" % [value]
 
         if brace = @lexer.expected
             error += "; expected '%s'" % brace