Commit Graph

26 Commits

Author SHA1 Message Date
Jeremy Ashkenas 5e498ca395 merged 2013-02-25 17:41:27 +13:00
Jeremy Ashkenas 14c2a16833 Reverted b31cc70 -- putting Generated comment back up top. Why? Why not? 2013-02-25 17:17:01 +13:00
Jason Walton fe45f1bf35 Merge remote-tracking branch 'upstream/master'
Conflicts:
	lib/coffee-script/grammar.js
	lib/coffee-script/rewriter.js
	src/grammar.coffee
	src/rewriter.coffee
2013-02-06 10:29:19 -05:00
Jeremy Ashkenas b31cc70235 Moving the 'generated by coffeescript version X' comment to the bottom, to get it out of the way 2013-02-02 10:42:46 +11:00
Jason Walton bbbf612f29 Put location data in token[2] instead of in token.locationData 2013-01-14 15:20:35 -05:00
Jason Walton a1ba0a89f8 Merge remote-tracking branch 'origin/master'
Conflicts:
	lib/coffee-script/coffee-script.js
	lib/coffee-script/lexer.js
	lib/coffee-script/parser.js
	src/lexer.coffee
2013-01-14 14:26:06 -05:00
Jeremy Ashkenas ba08a21d21 bumping version to 1.5.0-pre 2013-01-04 09:35:20 -10:00
Jason Walton bb94e02fad Lexer now adds location data, including first/last line/column to all generated tokens. 2012-11-16 19:09:56 -05:00
Jason Walton 25126e2f99 Add location data to nodes without passing it in constructors. 2012-11-15 15:35:01 -05:00
Jeremy Ashkenas 158d37215a CoffeeScript 1.4.0 2012-10-23 16:45:31 -04:00
Michael Ficarra f938a213fe trying to commit built files again; here goes nothing 2012-05-16 15:50:34 -04:00
Michael Ficarra df54c63b1b yet another small cleanup and obscure bugfix related to #2333 2012-05-16 15:29:00 -04:00
Michael Ficarra c6fafa1bc9 renaming `any` helper to `some`, reflecting `Array::some` 2012-05-16 07:58:14 -04:00
Michael Ficarra fa82859814 another refactoring for #2333 2012-05-16 07:02:16 -04:00
Michael Ficarra c264bf04cc fixes #2333: fix prohibition of duplicate object properties 2012-05-16 01:07:10 -04:00
Jeremy Ashkenas 79492aab36 CoffeeScript 1.3.3 2012-05-15 12:35:40 -04:00
Jeremy Ashkenas 7792a3a6e3 CoffeeScript 1.3.2 2012-05-14 14:45:20 -04:00
Trevor Burnham d58da49cee Intermediate version bump to 1.3.2-pre 2012-04-23 13:34:04 -04:00
Jeremy Ashkenas 60c9b94656 CoffeeScript 1.3.1 (quick bugfix for compound assignment to a global variable 2012-04-10 17:26:23 -04:00
Jeremy Ashkenas ed8d94f69c CoffeeScript 1.3.0 2012-04-10 14:57:45 -04:00
Trevor Burnham 11342ef97b Rebuilding -> our JS files now include the generated header 2012-01-10 12:55:41 -05:00
Jeremy Ashkenas c9a0a33fa2 reverting 63ab88 2011-12-14 10:39:20 -05:00
Michael Ficarra 63ab886e9f removed excessive spacing 2011-12-10 21:19:59 -05:00
Jeremy Ashkenas d2b0404188 big whitespace / readability change. join top level block with extra newlines, and class definitions as well. 2011-09-18 17:16:39 -05:00
Michael Ficarra 818216374c Merge branch 'restructuring' of github.com:jashkenas/coffee-script 2011-08-08 13:21:58 -04:00
gfxmonk ab17f41652 Moved src/*.coffee under src/coffee-script/ so that lib can be added to $NODE_PATH and only expose the top-level coffee-script namespace. Fixes #1246 2011-07-05 21:58:04 +10:00
Renamed from lib/helpers.js (Browse further)