3688 Commits

Author SHA1 Message Date
Michael Ficarra
4ab8503e5a CoffeeScript 1.7.1 1.7.1 2014-01-29 23:19:36 -06:00
Jeremy Ashkenas
114eccb459 Merge pull request #3340 from benbria/master
Fix a typo causing module.paths to be always set as the cwd.
2014-01-29 10:29:55 -08:00
Geoffry Song
38bd879a9a Fix a typo causing module.paths to be always set as the cwd.
`options.fileName` was used instead of `options.filename`.
2014-01-29 13:23:19 -05:00
Jeremy Ashkenas
a73a6e24a6 Merge pull request #3337 from roryokane/fix-operator-docs-commas
In docs, move commas out of code
2014-01-28 18:45:17 -08:00
Rory O’Kane
b4d35f13a4 In docs, move commas, part 2
I had missed that the next line had comma-separated operators, too.
2014-01-28 21:09:08 -05:00
Rory O’Kane
3fcaebb007 In docs, move commas out of code
The commas separating these three keywords are not code themselves – not what the user would write – so they should be outside of the `<tt>` tags.

Edits the table in the section [Operators and Aliases](http://coffeescript.org/#operators).
2014-01-28 21:01:22 -05:00
Jeremy Ashkenas
e543eb5101 index.html 2014-01-28 20:49:09 -05:00
Jeremy Ashkenas
7c4f842501 Merge pull request #3336 from roryokane/fix-math-operator-docs-markup
Fix markup in math operator documentation
2014-01-28 17:47:32 -08:00
Rory O’Kane
a5fef52751 Fix markup in math operator documentation
In the documentation, surround the new operators with `<tt>` tags instead of Markdown-style backticks, since this is HTML.
2014-01-28 18:56:43 -05:00
Jeremy Ashkenas
734fcedc06 Merge pull request #3334 from dannguyen/patch-1
Just a small typo in 1.7.0 changelog
2014-01-28 13:46:39 -08:00
dannguyen
e4c8bcf8f6 Just a small typo in 1.7.0 changelog 2014-01-28 16:36:04 -05:00
Jeremy Ashkenas
a3ae0c5c75 CoffeeScript 1.7.0 1.7.0 2014-01-28 14:05:38 -05:00
Jeremy Ashkenas
46895419b3 Merge pull request #3333 from xixixao/release1.7.0
Implement #3332
2014-01-28 10:59:22 -08:00
xixixao
4f6a4bab30 Removed idle styles 2014-01-28 18:57:37 +00:00
xixixao
9e5ffaea69 Use actual _.template instead of custom one 2014-01-28 18:56:43 +00:00
xixixao
928d2d7f4a Extras compiled with 1.7.0 2014-01-28 03:35:09 +00:00
xixixao
10293df1f9 Recompile source with 1.7.0 version 2014-01-28 03:34:00 +00:00
xixixao
41c4c822ba Recompile documentation js files with 1.7.0 version 2014-01-28 03:33:03 +00:00
xixixao
6030ac3a23 Fixes in documentation 2014-01-28 03:30:06 +00:00
xixixao
f42329ca0a Use Node instead of Ruby for documentation 2014-01-28 03:17:12 +00:00
Jeremy Ashkenas
570529f526 Fixing tests for browser. 2014-01-27 11:55:20 -05:00
Jeremy Ashkenas
8b8436d794 Merge pull request #3326 from xixixao/release1.7.0
Prepare 1.7.0 release
2014-01-27 08:42:58 -08:00
Jeremy Ashkenas
b0594aad3e Merge pull request #3331 from xixixao/inlineobjectchain
Fixes chaining after inline implicit objects
2014-01-26 14:15:09 -08:00
xixixao
04b0b94a8c Fixes chaining after inline implicit objects 2014-01-26 22:11:10 +00:00
xixixao
e1f46cfb9b Prepare 1.7.0 release 2014-01-26 18:32:12 +00:00
Michael Ficarra
cc1b74f11b Merge pull request #3329 from xixixao/issue3325
Fixes #3325: implicit indendation error messages
2014-01-25 22:00:24 -08:00
xixixao
104b4666fe Fix indendation error messages 2014-01-26 05:25:13 +00:00
Michael Ficarra
835fc84330 Merge pull request #3328 from xixixao/issue3216
Fixes #3216 for declarations in object literals
2014-01-25 21:05:34 -08:00
Michael Ficarra
a5d6285cfd forgotten compilation from parent commit 2014-01-25 22:54:25 -06:00
xixixao
c2727d964c Fix for declarations in object literals 2014-01-26 04:41:30 +00:00
Michael Ficarra
d687d52f9e Merge pull request #2887 from epidemian/more-math-operators
Add new mathematical operators
2014-01-24 13:18:29 -08:00
Demian Ferreiro
6a43de789f Simplify modulo tests 2014-01-24 17:55:50 -03:00
Demian Ferreiro
1288786fdc Make modulo operator convert arguments to numbers 2014-01-24 16:08:39 -03:00
Demian Ferreiro
2b4421fca1 Merge branch 'master' into more-math-operators
Conflicts:
	lib/coffee-script/grammar.js
	lib/coffee-script/lexer.js
	lib/coffee-script/nodes.js
	lib/coffee-script/parser.js
	test/regexps.coffee
2014-01-24 15:40:28 -03:00
Jeremy Ashkenas
6bdd52733e Merge pull request #3327 from xixixao/forexpansion
Fix expansion in destructuring inside comprehensions
2014-01-24 10:24:51 -08:00
xixixao
bd6b4142fe Fix expansion in destructuring inside comprehensions 2014-01-24 18:20:45 +00:00
Jeremy Ashkenas
daa6ad5470 Merge pull request #3268 from xixixao/issue156
Implement #156, Added expansion to destructuring
2014-01-24 08:33:42 -08:00
xixixao
369e0545c0 Added expansion to destructuring 2014-01-24 16:00:34 +00:00
Michael Ficarra
5f31a3d60e Merge pull request #3324 from xixixao/issue1871
Fixes #1871, close implicit objects in implicit returns
2014-01-23 15:24:10 -08:00
xixixao
8b976acac1 Fixes #1871, close implicit objects in implicit returns 2014-01-23 23:12:12 +00:00
Jeremy Ashkenas
b00962db1a Merge pull request #3322 from xixixao/issue1099
Fix #1099, remove in empty array optimization
2014-01-23 07:16:00 -08:00
xixixao
26dcf025f4 Remove in empty array optimization 2014-01-23 15:09:25 +00:00
Jeremy Ashkenas
d2f90d2236 Merge pull request #3320 from xixixao/issue1275
Fix #1275
2014-01-22 10:54:18 -08:00
xixixao
c3391e1dd8 Fix 1275 2014-01-22 18:33:44 +00:00
Jeremy Ashkenas
b3463a1378 Merge pull request #3319 from xixixao/issue1096
Fix 1096, 1131, 1828: Improve error messages for generated tokens
2014-01-22 05:29:03 -08:00
xixixao
f0463e9981 Improve error messages for generated tokens 2014-01-22 02:54:09 +00:00
Jeremy Ashkenas
1cc583b382 Merge pull request #3317 from xixixao/chainafteroutdent
Chaining semantics after arguments with outdent
2014-01-21 14:27:32 -08:00
xixixao
39cb8815f7 Fixed chaining semantics after outdent 2014-01-21 22:00:57 +00:00
Michael Ficarra
21db08a23d add missing implicit object literal test
ref michaelficarra/CoffeeScriptRedux#266 and 670a1f5f78 (diff-2)
2014-01-12 11:16:27 -06:00
Michael Ficarra
1f301d8c07 Merge pull request #3292 from marchaefner/CLI
`coffee DIR` executes `DIR/index.coffee`
2013-12-29 14:24:02 -08:00