kotovalexarian-likes-github
/
jashkenas--coffeescript
mirror of https://github.com/jashkenas/coffeescript.git
1
0
Fork 0
Code Releases Activity

Removing the last Jison hack. (Jison 0.1.25)

This commit is contained in:
Jeremy Ashkenas 2010-10-28 01:39:35 -04:00
parent 6b4e437c93
commit 6d8126e498
2 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Cakefile
View File

@ -56,9 +56,7 @@ task 'build:full', 'rebuild the source twice, and run the tests', ->
task 'build:parser', 'rebuild the Jison parser (run build first)', ->
require 'jison'
parser = require('./lib/grammar').parser
js = parser.generate()
js = js.replace /else {\s+parseError/m, 'else { if (symbol === 1) symbol = "EOF"; parseError'
fs.writeFile 'lib/parser.js', js
fs.writeFile 'lib/parser.js', parser.generate()
task 'build:ultraviolet', 'build and install the Ultraviolet syntax highlighter', ->

5
lib/parser.js
View File

@ -561,7 +561,10 @@ parse: function parse(input) {
if (this.lexer.showPosition) {
parseError.call(this, 'Parse error on line '+(yylineno+1)+":\n"+this.lexer.showPosition()+'\nExpecting '+expected.join(', '),
{text: this.lexer.match, token: this.terminals_[symbol] || symbol, line: this.lexer.yylineno, expected: expected});
} else { if (symbol === 1) symbol = "EOF"; parseError.call(this, 'Parse error on line '+(yylineno+1)+": Unexpected '"+(this.terminals_[symbol] || symbol)+"'",
} else {
var errStr = symbol == 1 /*EOF*/ ? "end of input" :
("'"+(this.terminals_[symbol] || symbol)+"'");
parseError.call(this, 'Parse error on line '+(yylineno+1)+": Unexpected "+errStr,
{text: this.lexer.match, token: this.terminals_[symbol] || symbol, line: this.lexer.yylineno, expected: expected});
}
}