Commit Graph

3576 Commits

Author SHA1 Message Date
Jeremy Ashkenas
304432c197 Merge pull request #2417 from gabehollombe/doc_for_switch_with_no_control_expression
Documentation for switch statements with no control expression
2013-03-04 22:27:38 -08:00
Demian Ferreiro
5da7f6a488 Get rid of CompilationError and instead have a couple of functions on helpers.coffee 2013-03-05 01:13:46 -03:00
Jeremy Ashkenas
f8c6b494aa Fixes #2422 -- Catch clause scoping plus old IE 2013-03-05 16:13:22 +13:00
Jeremy Ashkenas
1b573412d3 cleaning up the previous merge -- moving it out to helpers.invertLiterate 2013-03-05 15:45:57 +13:00
Demian Ferreiro
b400047045 Merge branch 'master' of git://github.com/jashkenas/coffee-script into improved-error-messages
Conflicts:
	Cakefile
	lib/coffee-script/coffee-script.js
	lib/coffee-script/command.js
	lib/coffee-script/nodes.js
	lib/coffee-script/repl.js
	src/coffee-script.coffee
	src/helpers.coffee
	src/nodes.coffee
	src/repl.coffee
2013-03-04 23:42:47 -03:00
Jeremy Ashkenas
51b1affbc5 Merge pull request #2776 from mintplant/fix-2768
Fix #2768: support --join'ing mixed literate and non-literate CoffeeScript source files
2013-03-04 18:39:30 -08:00
Jeremy Ashkenas
903e9c994c Fixes #2773 -- tricky dependency ordering when overriding bound functions. 2013-03-05 15:35:02 +13:00
Michael Smith
fca68717ff Fix #2768: rewrite literate code before the join 2013-03-04 18:30:24 -08:00
Michael Ficarra
22d6a4b255 Merge pull request #2770 from benbria/master
Move sourceMappingURL to bottom of generated JavaScript file.
2013-03-04 17:45:16 -08:00
Jeremy Ashkenas
26102a0970 Merge pull request #2772 from marchaefner/master
Minor improvements for locationData of tokens and some clean up.
2013-03-04 17:43:09 -08:00
Jason Walton
add84bfddc Add multiline horrible kludge for IE 2013-03-04 19:08:33 -05:00
Marc Häfner
dcd74d3e59 Clean up unused parameter. 2013-03-05 01:02:16 +01:00
Jason Walton
2684737b66 Move sourceMappingURL line to bottom of file 2013-03-04 18:43:49 -05:00
Marc Häfner
74181c0ec0 Improve locationData of implicit object braces.
Set location of generated left brace to start of content, so the corresponding AST nodes don't span preceding spaces, blank lines or comments.
2013-03-05 00:12:51 +01:00
Marc Häfner
ebff9fbc31 Exclude preceding newlines from INDENT tokens.
Produces more meanignful locationData.
2013-03-05 00:03:08 +01:00
Marc Häfner
97a41adf0c Fix location of tokens with no length
by actually using the computed offset.
2013-03-05 00:01:17 +01:00
Jeremy Ashkenas
eef83a9fcb CoffeeScript 1.6.1 1.6.1 2013-03-05 11:07:16 +13:00
Jeremy Ashkenas
b62a90d54c Fixes #2765 -- incorrect line number in mappings 2013-03-05 10:49:47 +13:00
Jeremy Ashkenas
b2ef77d92e refactoring to a baseFileName that can work in the browser, for later 2013-03-05 10:40:39 +13:00
Jeremy Ashkenas
b2b801a78b Fixes #2766 -- incompatible line number API 2013-03-05 10:19:21 +13:00
Jeremy Ashkenas
b4c12f6746 Fixing lingering brain fart. Inexcusable. 1.6.0 2013-03-05 09:23:50 +13:00
Jeremy Ashkenas
a4cc15c95c Merge pull request #2763 from matthewwithanm/source-map-fix
Fix Source Map Generation for 1.6.0
2013-03-04 12:09:26 -08:00
Matthew Tretter
3c42a8e01c Update compiled version 2013-03-04 15:07:20 -05:00
Matthew Tretter
4a94a9fbd1 Fix source map generation
Small typo fix (:
2013-03-04 14:57:56 -05:00
Jeremy Ashkenas
9f614fedec CoffeeScript 1.6.0 2013-03-05 08:19:08 +13:00
Demian Ferreiro
9ea4268b92 Make duplicate param name errors mark the actual duplicate parameter
Before:

    coffee> foo = (bar, baz, bar, qux) ->
    repl:1:7: error: multiple parameters named 'bar'
    foo = (bar, baz, bar, qux) ->
          ^^^^^^^^^^^^^^^^^^^^^^^

Now:

    coffee> foo = (bar, baz, bar, qux) ->
    repl:1:18: error: multiple parameters named 'bar'
    foo = (bar, baz, bar, qux) ->
                     ^^^

Also works with destructuring parameters and what have you.
2013-03-04 15:39:03 -03:00
Jeremy Ashkenas
e417a0ca6f Reverts 56fe211b79 2013-03-05 07:38:41 +13:00
Jeremy Ashkenas
75769503ff Renaming --maps option to --map for consistency. 2013-03-05 07:29:46 +13:00
Demian Ferreiro
589d67d8b7 Remove a couple of TODOs (WONTDOs really) 2013-03-04 13:11:34 -03:00
Demian Ferreiro
3127e76f4b Integrate error messages on the site editor
Nothing really fancy here; mostly preserves the old format. Maybe if we had a more full-fledged test editor we could show the errors in-line =D

  Also, i couldn't get the `rake doc` task running properly, so i mostly test this editing the index.html directly (ups!).
2013-03-04 13:00:25 -03:00
Jason Walton
979e110a84 Minor API changes. 2013-03-04 09:45:25 -05:00
Jason Walton
96785872cd Merge remote-tracking branch 'upstream/master' into sourcemaps
Conflicts:
	lib/coffee-script/coffee-script.js
	lib/coffee-script/command.js
	lib/coffee-script/nodes.js
	src/coffee-script.coffee
	src/command.coffee
	src/nodes.coffee
2013-03-04 09:25:55 -05:00
Jason Walton
ee71b9143f Remove PARANOID flag. 2013-03-04 09:11:34 -05:00
Troels Nielsen
37a6ea63b1 #2757, Allow non-significant commas at end of nested implicit objects 2013-03-04 12:55:15 +01:00
Jeremy Ashkenas
56fe211b79 Fixes #2455 -- condition should know what variables the body has declared. 2013-03-04 23:33:50 +13:00
Jeremy Ashkenas
cf11a570e9 Fixes #2489, fixes #1819, fixes #1821 -- remove the __bind helper. 2013-03-04 23:11:38 +13:00
Jeremy Ashkenas
9fe0e711d6 Fixes #2502 -- improper compilation with parenthesized inner value of instance properties in a class body. 2013-03-04 22:26:55 +13:00
Jeremy Ashkenas
b3452c1276 Fixes #2508 -- existential access of the prototype. 2013-03-04 22:07:47 +13:00
Jeremy Ashkenas
47f0ea69b8 Fixes #2749. Restricting to instance methods in class bodies, where it actually has a chance in hell of calling the correct thing. 2013-03-04 21:26:01 +13:00
Jeremy Ashkenas
667b96b495 Fixes #2750 -- clarify error message 2013-03-04 21:17:26 +13:00
Jeremy Ashkenas
3b25aea168 When printing out --tokens, hide the location data. 2013-03-04 20:54:45 +13:00
Demian Ferreiro
0affb4f936 Integrate error messages on the REPL 2013-03-03 22:08:41 -03:00
Michael Ficarra
8435df29c6 Merge pull request #2752 from marchaefner/master
Fix line number mismatch when first line is indented.
2013-03-03 16:21:49 -08:00
Demian Ferreiro
55c99dfaec Show colorized error messages 2013-03-01 22:42:26 -03:00
Michael Smith
c98fae59fc Patch child_process.fork to run .coffee files 2013-03-01 16:19:05 -08:00
Marc Häfner
3c38a34ab2 Fix line numbers when first line is indented.
* Offset @chunkLine for inserted line break.
* Avoid line break insertion for blank lines.
2013-03-01 21:30:07 +01:00
Jason Walton
ad7dcbc797 Change some more "!"s to "not"s. Make spacing consistent after periods in commnets. 2013-03-01 11:36:48 -05:00
Jason Walton
ad0306b00c Change compileWithSourceMap() so it returns an object instead of an Array, and return the SourceMap object. 2013-03-01 11:34:39 -05:00
Jason Walton
d626e70287 Fix from code inspect: Use "not" instead of "!". 2013-03-01 11:19:22 -05:00
Demian Ferreiro
3182475207 Make error messages show only first line on multi-line errors 2013-03-01 13:10:04 -03:00