github/coffeescript
1
1
Fork 0
mirror of https://github.com/jashkenas/coffeescript.git synced 2026-05-03 03:00:14 -04:00
Code Issues Packages Projects Releases Wiki Activity

Fix failing parser error message test

Browse Source
This commit is contained in:
Demian Ferreiro
2013-02-26 05:55:09 -03:00
parent 44e3a76881
commit fbc8417263
3 changed files with 10 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/coffee-script.coffee
View File

@@ -137,13 +137,13 @@ parser.lexer =
parser.yy = require './nodes'
# Override Jison's default error handling function.
parser.yy.parseError = (message, {loc, token}) ->
parser.yy.parseError = (message, {token}) ->
# Disregard Jison's message, it contains redundant line numer information.
message = "unexpected #{token}"
# FIXME The `loc` received does not correspond to the `token` token, but to
# the one before it instead. That's why the test in error_messages.coffee is
# failing. There should be a way to get the location data... maybe accessing
# the lexer's tokens?
{first_line, first_column, last_line, last_column} = loc
# The second argument has a `loc` property, which should have the location
# data for this token. Unfortunately, Jison seems to send an outdated `loc`
# (from the previous token), so we take the location information directly
# from the lexer.
{first_line, first_column, last_line, last_column} = parser.lexer.yylloc
throw new CompilerError message, first_line, first_column, last_line, last_column