3444 Commits

Author SHA1 Message Date
Michael Ficarra
c785e00a15 Merge pull request #2929 from lucasb-eyer/master
Keep a single-line herecomment as a single-line js comment.
2013-04-15 13:12:43 -07:00
Michael Ficarra
c6398e16b1 Merge pull request #2925 from marchaefner/master
Fix error reporting for invalid object key.
2013-04-15 13:07:16 -07:00
lucasb-eyer
ccc7c4404d Keep the js comment on a single line if the herecomment is on a single line. 2013-04-15 21:45:55 +02:00
Marc Häfner
69d66a1d4d Fixes #1057: Allow catch/finally in single line functions.
* Don't end single-line functions at `catch` or `finally`.
* Remove unused `IMPLICIT_BLOCK` and superfluous test for `IF`.
2013-04-15 20:20:52 +02:00
Marc Häfner
af81f6de70 Fix error reporting for invalid object key. 2013-04-12 18:10:26 +02:00
Jeremy Ashkenas
f21dc7a96e Merge pull request #2924 from marchaefner/master
Parameter-less catch clause.
2013-04-12 08:57:01 -07:00
Marc Häfner
cf07fcb4b1 #2900 -- parameter-less catch clause.
Plus some minor cleanup after f8c6b494aa
2013-04-12 17:50:45 +02:00
Jeremy Ashkenas
740a7bcb45 Merge pull request #2914 from danielgtaylor/repl-history
repl history implementation improvements
2013-04-07 21:47:16 -07:00
Daniel G. Taylor
0e2d2ea637 Move lastLine setter into conditional block to prevent .commands and blank lines from setting lastLine 2013-04-07 11:28:59 -07:00
Daniel G. Taylor
feaea49eac Replace large comprehension with much simpler code; fix comment to reference maxSize instead of previous 10KB limit; only pop a history entry if the file size is actually bigger than maxSize; only add items to the history if they are different from the last item by storing the last line and loading it on startup. 2013-04-06 22:10:08 -07:00
Jeremy Ashkenas
170f311101 Merge branch 'master' of https://github.com/jashkenas/coffee-script 2013-04-06 09:31:30 +08:00
Jeremy Ashkenas
0cadcdc097 Fix regression with executable class bodies and prototypal attachment. 2013-04-06 09:31:24 +08:00
Miao Jiang
337ebd3ce9 Fixes #2908, add "\n" between pure literal header and function body. 2013-04-05 13:20:59 +08:00
Billy Moon
5d5920c5d0 Literate flag
Add `-L` or `--literate` command line flags (lowercase `l` is already taken) to allow literate coffee script to be read in from `stdio`
2013-03-28 10:28:12 +03:00
Jeremy Ashkenas
8be65dee93 Merge pull request #2886 from danielgtaylor/repl-history
Add history to the coffee interactive interpreter that persists between ...
2013-03-27 15:55:15 -07:00
Daniel G. Taylor
4dbd9dc264 Pop off partial line if input history file was truncated; make maximum input history file size configurable via repl start options 2013-03-25 20:50:56 -07:00
Daniel G. Taylor
2d0e45c46d Use string interpolation for .history command; rename out variable to history an store the history in it as an array in the proper order so that printing it is just a join operation 2013-03-25 20:34:04 -07:00
Michael Ficarra
cc84d6ea67 Merge pull request #2890 from Nami-Doc/issue2846
fix #2846
2013-03-25 11:14:07 -07:00
Nami-Doc
53a5f26430 fix #2846 2013-03-25 18:56:24 +01:00
Daniel G. Taylor
a1ff4ae7b8 Use separate variable for fd used to read history file; use string interpolation to print code lines; do not use unit test to remove temporary file and instead use a process exit event handler 2013-03-25 09:49:59 -07:00
Daniel G. Taylor
3251efa9c6 Add unit test to read and run a line from the interpreter history file and remove the dummy history file after tests have completed. 2013-03-25 08:47:34 -07:00
Daniel G. Taylor
17a1cdb2cf Make history file optional and configurable via the opts passed to repl.start 2013-03-25 08:46:40 -07:00
Daniel G. Taylor
1643f7df7a Remove explicit catch that did nothing 2013-03-25 07:49:25 -07:00
Daniel G. Taylor
3c0344b954 Rebuild to remove debugging log statement 2013-03-25 07:28:55 -07:00
Daniel G. Taylor
9bfafb88cb Add history to the coffee interactive interpreter that persists between sessions using a ~/.coffee_history file in a similar way to bash. Code based on repl.history and Node pull request 3178 with modifications. 2013-03-24 22:44:35 -07:00
Michael Ficarra
718224f99a Merge pull request #2867 from hden/2853
encode unicode src, test added
2013-03-24 12:17:10 -07:00
Hao-kang Den
b2d6997eff encode unicode src, test added 2013-03-21 09:04:23 +08:00
Michael Ficarra
e26f982c24 Merge pull request #2869 from marchaefner/master
Fix Windows path separator issue in `baseFileName`.
2013-03-20 17:25:54 -07:00
Marc Häfner
1b2fe69a18 Fix Windows path separator issue in baseFileName.
Windows accepts forward and backward slashes as path separator.
2013-03-20 22:38:29 +01:00
Jeremy Ashkenas
c159a64b58 Merge pull request #2865 from hden/inline
quick-fix
2013-03-20 00:46:32 -07:00
Hao-kang Den
e091c9d6b4 quick-fix with a different approach 2013-03-20 15:23:33 +08:00
Jeremy Ashkenas
57d3cfd67f Merge pull request #2851 from toots/master
More explicit window context.
2013-03-18 18:52:31 -07:00
Romain Beauxis
6dd61626d2 Rebuild. 2013-03-18 14:16:05 -05:00
Romain Beauxis
1e99f887e7 More explicit window context in src/browser.coffee. 2013-03-18 11:16:26 -05:00
Jeremy Ashkenas
78d10f30a0 removing sourceColumn reset 2013-03-18 21:50:40 +08:00
Jeremy Ashkenas
7f0610d0bd better docs for source maps 2013-03-18 19:46:43 +08:00
Jeremy Ashkenas
4bef435e0e better docs for source maps 2013-03-18 19:46:30 +08:00
Jeremy Ashkenas
194baa0bd7 better docs for source maps 2013-03-18 19:46:19 +08:00
Jeremy Ashkenas
c8b8beb500 slimming SourceMap slightly further 2013-03-18 19:36:34 +08:00
Jeremy Ashkenas
6786bab2ba Big refactor of SourceMap class. Literate CoffeeScript. Purdy. 2013-03-18 19:23:05 +08:00
Jeremy Ashkenas
566a7dabb2 Fixing erroneous whitespace fix in generated JS 2013-03-18 17:47:55 +08:00
Jeremy Ashkenas
a3e8de338a CoffeeScript 1.6.2 2013-03-18 13:06:33 +08:00
Jeremy Ashkenas
4f815ea978 Fixes #2737, fix fork() for both .js and .coffee, revised. 2013-03-18 11:46:54 +08:00
Michael Ficarra
417008a030 be a little more descriptive, as per @epidemian's suggestion 2013-03-17 21:53:46 -05:00
Michael Ficarra
84c44c0099 small stylistic change and optimisation to code from #2847 2013-03-17 21:50:20 -05:00
Jeremy Ashkenas
2d6a856d61 Merge pull request #2847 from hden/browser-source-map
Browser source map
2013-03-17 19:39:36 -07:00
Hao-kang Den
011d7dc245 better naming by @michaelficarra 2013-03-18 10:23:33 +08:00
Hao-kang Den
b2aa1798b1 safer browser check 2013-03-18 09:31:12 +08:00
Hao-kang Den
5fb047930e fixed lineno 2013-03-18 09:31:12 +08:00
Hao-kang Den
c24e957f17 use btoa as base64 encoder, inspired by @ashtuchkin 2013-03-18 09:31:12 +08:00