Commit Graph

3340 Commits

Author SHA1 Message Date
Jeremy Ashkenas
9d025df9e3 Merge pull request #2827 from hden/lineno
Lineno
2013-03-17 04:29:44 -07:00
Jeremy Ashkenas
2f5b11b295 Fixes #2555 2013-03-17 19:27:16 +08:00
Jeremy Ashkenas
c44826acc7 Merge pull request #2838 from marchaefner/master
Improve literal mode.
2013-03-17 03:49:06 -07:00
Jeremy Ashkenas
4386f2abc7 Merge pull request #2840 from MattKunze/windows_paths
fix path handling on Windows
2013-03-17 03:09:28 -07:00
Matt Kunze
f217a10721 fix path handling on Windows 2013-03-15 16:13:04 -06:00
Marc Häfner
b8d695a4e1 Compiled JavaScript files for improved literal mode. 2013-03-15 03:26:12 +01:00
Marc Häfner
44c2b4aa7f Test case for literal mode: Code blocks must be preceded by blank line. 2013-03-15 03:23:09 +01:00
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
Hao-kang Den
d4254a40a9 Apply modifications by @jwalton 2013-03-14 08:36:07 +08:00
Hao-kang Den
052e3cc8eb found a linear shift of lineno, dirty patch for now
It seems that js -> coffee line mapping has a linear shifting.
Dirty patch by applying linear correction.
Dumb, but maybe a hint.
2013-03-14 08:36:07 +08: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
7d08dbb86c build 2013-03-13 16:00:57 +08:00
Hao-kang Den
a8b65565dd roll back to options.filename 2013-03-13 15:58:39 +08:00
Jeremy Ashkenas
54258e441d Merge pull request #2826 from epidemian/bump-engines-node
Bump engines.node version on package.json to 0.8
2013-03-13 00:40:56 -07:00
Michael Ficarra
4ac223b684 minor cleanup of parent commit 2013-03-12 21:11:48 -05:00
Michael Ficarra
707655daef Merge pull request #2824 from iamwilhelm/master
added warning that repl needs node.js >= 0.8
2013-03-12 18:46:19 -07: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
Demian Ferreiro
9787ce543d Bump engines.node version on package.json to 0.8 2013-03-12 21:46:48 -03:00
Hao-kang Den
22595424a8 manually add the newline at EOF 2013-03-12 21:28:48 +08:00
Hao-kang Den
601189ea2d Merge branch 'fix-path' of https://github.com/hden/coffee-script into fix-path 2013-03-12 20:54:12 +08:00
Hao-kang Den
d3263dc35b fix node v0.10 path 2013-03-12 20:53:13 +08:00
Jeremy Ashkenas
e1c6b083f8 Merge pull request #2820 from hden/source-maps-in-node
Source maps in node
2013-03-12 05:35:39 -07:00
Michael Ficarra
f56f5f234e @epidemian typo 2013-03-12 15:32:52 +08:00
Demian Ferreiro
4ca6da4a95 Add REPL scoping tests 2013-03-12 15:32:52 +08:00
Demian Ferreiro
b0cbd90e64 Fixes #1829. Preserve variable scope in the REPL 2013-03-12 15:32:52 +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
Michael Ficarra
20d98c7106 @epidemian typo 2013-03-11 21:48:21 -05:00
Michael Ficarra
5ec658c55d Merge remote-tracking branch 'epidemian/issue1829' 2013-03-11 21:47:19 -05:00
Hao-kang Den
64301d0d08 fix node v0.10 path 2013-03-12 09:09:07 +08:00
Demian Ferreiro
119ec16e5e Add REPL scoping tests 2013-03-11 20:16:48 -03:00
Jeremy Ashkenas
decc0f18fc Merge pull request #2814 from epidemian/issue1829
Fixes #1829. Preserve variable scope in the REPL
2013-03-11 16:15:34 -07:00
Demian Ferreiro
5a004425ca Fixes #1829. Preserve variable scope in the REPL 2013-03-11 19:52:18 -03:00
Jeremy Ashkenas
69f6500ba9 rebuilt source code documentation with new version of Docco. 2013-03-11 11:37:22 +08:00
Jeremy Ashkenas
97980ffc7f Merge pull request #2723 from epidemian/improved-error-messages
Improved error messages
2013-03-10 16:46:25 -07: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
Michael Ficarra
838e5e1163 Merge pull request #2810 from SonicHedgehog/master
Fix typo in documentation
2013-03-10 11:58:01 -07:00
Jakob Krigovsky
af0bdae675 Fix typo in documentation 2013-03-10 19:09:03 +01:00
Jeremy Ashkenas
0d45287057 Fixes #2808. Remove --require flag. 2013-03-10 17:17:04 +08: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
Jeremy Ashkenas
0120db0efc Merge pull request #2803 from benbria/master
Rework source map files and paths
2013-03-08 07:19:48 -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
242f397bfa Remove dead variables. 2013-03-07 21:30:04 -05:00