Marc Häfner
52ca531b7c
Improve literate mode.
...
* Expect a blank line as delimiter between text and code (#2821 ).
* Don't change indentation of code. It is not necessary and leads to
erroneous locationData. (#2835 )
* Don't modify blank lines and reverse the change in the lexer.
* Don't ignore indentation with mixed whitespace.
2013-03-15 00:17:10 +01:00
Jeremy Ashkenas
56413ba3b4
Merge pull request #2817 from epidemian/keep-repl-running
...
Keep REPL running on runtime errors
2013-03-13 01:56:33 -07:00
Jeremy Ashkenas
71bb6108fb
Merge pull request #2819 from hden/fix-path
...
Quick fix for node v0.10 path
2013-03-13 01:03:57 -07:00
Hao-kang Den
a8b65565dd
roll back to options.filename
2013-03-13 15:58:39 +08:00
Michael Ficarra
4ac223b684
minor cleanup of parent commit
2013-03-12 21:11:48 -05:00
Wil Chung
70e83030a7
added warning that we need node 0.8+ to run repl
...
remove unnecessary parens and else statement in repl
we do this by convention of the main coffee source
fix: exit should be process.exit
compiled and build full
2013-03-12 18:28:48 -07:00
Hao-kang Den
22595424a8
manually add the newline at EOF
2013-03-12 21:28:48 +08:00
Hao-kang Den
d3263dc35b
fix node v0.10 path
2013-03-12 20:53:13 +08:00
Hao-kang Den
9b6772a390
accept override
2013-03-12 15:29:13 +08:00
Hao-kang Den
b7f0653a0e
port patchStackTrace from Redux
2013-03-12 15:29:13 +08:00
Demian Ferreiro
45bcd9fa2f
Keep REPL running on runtime errors
2013-03-11 23:58:00 -03:00
Demian Ferreiro
5a004425ca
Fixes #1829 . Preserve variable scope in the REPL
2013-03-11 19:52:18 -03:00
Demian Ferreiro
f0fcf4aee0
Merge branch 'master' of git://github.com/jashkenas/coffee-script into improved-error-messages
...
Conflicts:
lib/coffee-script/coffee-script.js
lib/coffee-script/command.js
lib/coffee-script/helpers.js
lib/coffee-script/lexer.js
lib/coffee-script/nodes.js
lib/coffee-script/repl.js
src/coffee-script.coffee
src/command.coffee
src/helpers.coffee
src/lexer.coffee
src/nodes.coffee
test/helpers.coffee
2013-03-10 20:29:36 -03:00
Demian Ferreiro
09f8df9640
Add check for end of input on parseError handler
2013-03-10 00:30:27 -03:00
Jeremy Ashkenas
dbb99f31a7
Reverting #2490
2013-03-10 07:21:00 +08:00
Jeremy Ashkenas
c7da623d4b
#2490 . A bit more of the style.
2013-03-10 06:55:52 +08:00
Jeremy Ashkenas
b44435ab8a
#2490 -- implementing a conditional in terms of the guard style.
2013-03-10 06:44:45 +08:00
Jeremy Ashkenas
c53df12ec1
disallow multiple else blocks in if/guard syntax
2013-03-09 15:44:45 +08:00
Jeremy Ashkenas
13fae12f69
Fixes #2490 -- adding guard-style if blocks
2013-03-09 10:40:37 +08:00
Jason Walton
c4f50b52d7
Merge remote-tracking branch 'upstream/master'
...
Conflicts:
lib/coffee-script/helpers.js
test/helpers.coffee
2013-03-08 10:17:47 -05:00
Jason Walton
f85d19b459
Rework API for sourcemap filenames and paths.
2013-03-07 21:26:09 -05:00
Jeremy Ashkenas
67de35ff29
Fixes #2781 , fixes #2782 . Reverting to old method of instance method binding.
2013-03-07 23:09:32 +13:00
Jeremy Ashkenas
774ee6a554
merge
2013-03-07 22:59:23 +13:00
Fahad Ibnay Heylaal
4d7151aa5d
fix: compiling coffee.coffee produces .js file.
2013-03-07 03:41:34 +06:00
Jason Walton
185b2ce632
Code inspect fixes from the inimitable Nami-Doc
2013-03-06 16:26:34 -05:00
Jason Walton
ce6772f2be
Better fix for sourceRoot and relative path for .coffee files in source maps.
2013-03-06 15:45:47 -05:00
Jason Walton
d6e1a979e4
Fix sourceRoot and relative path for .coffee files in generated source maps.
2013-03-06 11:05:57 -05:00
Jeremy Ashkenas
de8ec2beb0
Fixes #1066 -- interpolated strings are not implicit funcs
2013-03-05 21:28:29 +13:00
Jeremy Ashkenas
355754ed20
Fixes #1055 -- disallow invalid keys in object literals ... but allow them where the implicit object is being used as a class defn' or a destructuring
2013-03-05 21:10:56 +13:00
Jeremy Ashkenas
fbe07f1fce
Removing debugging source location output from --nodes. It shouldn't have snuck in there.
2013-03-05 20:50:03 +13: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
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
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.
2013-03-05 09:23:50 +13:00
Matthew Tretter
4a94a9fbd1
Fix source map generation
...
Small typo fix (:
2013-03-04 14:57:56 -05:00