diff options
| author | Luke Kanies <luke@madstop.com> | 2007-10-09 10:54:21 -0500 |
|---|---|---|
| committer | Luke Kanies <luke@madstop.com> | 2007-10-09 10:54:21 -0500 |
| commit | 32753e11d9cd731760ec8ba3c4f1ad2e3402535e (patch) | |
| tree | 0b6375bdefa041a7d4fbab9745ed084fb025bc30 /lib/puppet/parser/parser_support.rb | |
| parent | afa1dee5eb3a8b5249715e61f9894b04ab34a6ae (diff) | |
| parent | 01f132d8b88467dfd314ad355f1cdf9f546945b3 (diff) | |
| download | puppet-32753e11d9cd731760ec8ba3c4f1ad2e3402535e.tar.gz puppet-32753e11d9cd731760ec8ba3c4f1ad2e3402535e.tar.xz puppet-32753e11d9cd731760ec8ba3c4f1ad2e3402535e.zip | |
Merge branch 'master' of git://michaelobrien.info/puppet into michael
Diffstat (limited to 'lib/puppet/parser/parser_support.rb')
| -rw-r--r-- | lib/puppet/parser/parser_support.rb | 10 |
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 |