github/coffeescript
1
1
Fork 0
mirror of https://github.com/jashkenas/coffeescript.git synced 2026-05-03 03:00:14 -04:00
Code Issues Packages Projects Releases Wiki Activity
3,533 Commits 2 Branches 101 Tags
59cf19fd1cfa858adddca737ee09172ef15f0d60
Commit Graph

3533 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
FredyC
457cdfde26 Fixed deep directory creation for command line utility 2013-08-01 11:17:27 +02:00
Marc Häfner
910e38749c Merge removeMidExpressionNewlines into addImplicitIndentation 
and rename it to `normalizeLines`
 2013-07-31 22:12:44 +02:00
Demian Ferreiro
2b4a37296f Override the SyntaxError's "stack" property instead of deleting it 
This makes the "stack" property more useful when it's shown on other Node.js applications that compile CoffeeScript (e.g. testing libraries) and should fix #3023. A minimal example:

    $ node -e 'require("coffee-script").compile("class class")'

    /usr/lib/node_modules/coffee-script/lib/coffee-script/coffee-script.js:41
            throw err;
                  ^
    [stdin]:1:7: error: unexpected CLASS
    class class
          ^^^^^
 2013-07-31 09:24:43 -03:00
Demian Ferreiro
3f9cdcf1fa Change how error messages are shown 
Instead of throwing the syntax errors with their source file location and needing to then catch them and call a `prettyErrorMessage` function in order to get the formatted error message, now syntax errors know how to pretty-print themselves (their `toString` method gets overridden).

An intermediate `catch` & re-`throw` is needed at the level of `CoffeeScript.compile` and friends. But the benefit of this approach is that now libraries that use the `CoffeeScript` object directly don't need to bother catching the possible compilation errors and calling a special function in order to get the nice error messages; they can just print the error itself (or let it bubble up) and the error will know how to pretty-print itself.
 2013-07-31 08:27:49 -03:00
Marc Häfner
4342bedd2f Fix multi-line if-else in single-line expression. 
* When searching for the closing token of a single-line expression, ignore TERMINATORS that will subsequently be removed.
* Add a test.
 2013-07-31 12:18:50 +02:00
Marc Häfner
fdd5796f5e Disallow single-line IF expr ELSE without THEN 
* Supplement missing block before `ELSE` token only for multi-line `if`.
* Don't prematurely remove `TERMINATOR` before `ELSE` (so we can  differentiate single- and multi-line forms).
* Cleanup: Remove `WHEN` from `EXPRESSION_CLOSE`. (Only `LEADING_WHEN` tokens are preceded by a `TERMINATOR`.)
* Cleanup: Remove really old, inapplicable text from comment.
 2013-07-30 19:31:46 +02:00
Jeremy Ashkenas
f48aa44386 Merge pull request #3094 from epidemian/compile-js 
Update compiled JS
 2013-07-29 23:17:38 -07:00
Demian Ferreiro
51c625205b Update compiled JS 2013-07-30 01:06:41 -03:00
Michael Ficarra
e581f7d2f0 Merge pull request #3051 from CaseyLeask/source-map-syntax-update 
Updated the Source Maps syntax
 2013-07-04 07:03:00 -07:00
Casey Leask
34c1704286 Removed multi-line comment wrapping 2013-06-26 13:11:13 +00:00
Casey Leask
19767a0f10 Updated the Source Maps syntax 2013-06-26 12:34:21 +00:00
Nami-Doc
0c9f0fd099 Merge pull request #3049 from dpatti/extensions-scope 
Avoid variable scope collision with extensions
 2013-06-24 15:14:01 -07:00
Doug Patti
7f1088054c Avoid variable scope collision with extensions 
In #3031, an extensions variable was introduced with file-level scope
that defined the filetypes that CoffeeScript can compile. However, the
Module::load patching calls findExtension() which uses a local variable
called "extensions", which was overriding the outer level one and
causing getSourceMap() to fail.
 2013-06-24 18:13:04 -04:00
Nami-Doc
ef5f58e30e Merge pull request #3045 from marchaefner/master 
Fix path separator issues in tests.
 2013-06-22 06:04:46 -07:00
Marc Häfner
13024e6911 Fix path separator issues in tests. 2013-06-22 14:57:23 +02:00
Nami-Doc
32e8e562ea Merge pull request #3043 from imcotton/reference-check 
check existence of "path" for browser execution
 2013-06-21 10:08:49 -07:00
Cotton Hou
7fdac5c3b9 check existence of "path" for browser execution 2013-06-22 00:58:30 +08:00
Jeremy Ashkenas
b68fd9d76e Merge pull request #3042 from marchaefner/issue2844 
Avoid excessive AST traversal in `updateLocationDataIfMissing`.
 2013-06-20 22:33:50 -07:00
Marc Häfner
25c6001a6c Speed up updateLocationDataIfMissing. 
* Avoid excessive search for missing `locationData`
  * Fix `locationData` for `ELSE IF`.
 2013-06-21 02:47:29 +02:00
Jeremy Ashkenas
7250fdd576 Merge pull request #3031 from alexgorbatchev/stack-trace-patch-optimizations-2 
Stack trace patch optimizations
 2013-06-16 02:37:33 -07:00
Jeremy Ashkenas
b7f8443052 Merge pull request #3034 from marchaefner/baseIndent 
Better handling of initial indent at file start.
 2013-06-16 02:35:06 -07:00
Marc Häfner
4fd5e9a3ab Better handling of initial indent at file start. 
* Detect initial indentation before the first token and enforce it.
  * Don't add `INDENT` token (or the matching `OUTDENT, TERMINATOR`).
 2013-06-14 00:28:45 +02:00
Alex Gorbatchev
3785996c44 Made stack patch test less brittle. 2013-06-13 13:50:05 -07:00
Alex Gorbatchev
eb0a222eea Using more standard convention for patched stack line numbers. 2013-06-13 12:58:04 -07:00
Alex Gorbatchev
3d761e73e3 Removed unnecessary source map generation during require() and made stack line number patching on by default. 2013-06-13 12:54:20 -07:00
Alex Gorbatchev
cc3b4e8080 Removed not used variable. 2013-06-13 12:23:06 -07:00
Michael Ficarra
ba7cb3ab69 fix #3029 2013-06-13 13:38:13 -05:00
Michael Ficarra
054443c46e rebuild #3029 2013-06-13 13:35:40 -05:00
Jeremy Ashkenas
c8dae22cb0 Merge pull request #3029 from wangxian/master 
fix block comment format "\n"
 2013-06-13 10:55:52 -07:00
木頭
183ec48308 fix block comment 2013-06-13 07:44:17 +08:00
Jeremy Ashkenas
13187b0199 Merge pull request #2856 from epidemian/issue2849 
Fixes #2849: use correct filename and code in require()d sources
 2013-06-09 00:40:18 -07:00
Demian Ferreiro
3c880bf601 Move a try/catch from compile to loadFile 
This try/catch should only be necessary for dynamically loaded files. Also added a lengthier explanation of why this try/catch is needed.
 2013-06-09 02:54:34 -03:00
Demian Ferreiro
8e90aaefc1 Merge branch 'master' into issue2849 
Conflicts:
	lib/coffee-script/coffee-script.js
	src/coffee-script.coffee
 2013-06-09 02:40:53 -03:00
Michael Ficarra
426ae97e49 Merge pull request #3014 from mset/master 
base path for compilation can be './' as well as '.'
 2013-06-03 06:27:38 -07:00
Marek Setnicka
f277a43645 Bug fix. When coffee is invoked with the -c parameter and './' value, first two characters of the directory into which the compiled files are stored get chopped off. 
Example: if compilation invoked like this: 'coffee -o ../lib/ -cw ./', then
Source file: ./OutputFolder/file.coffee, compiled output: ./../lib/tputFolder/
The code only expected '.' to mark the local folder. However, './' is equally valid.
 2013-06-03 13:51:26 +01:00
Jeremy Ashkenas
2e408648aa renaming import test files to avoid risking the disfavor of .gitignore 2013-06-02 10:57:18 +04:00
Jeremy Ashkenas
f2f10e85a8 Revert "remove cake build:ultraviolet" 
This reverts commit 2e6a781014.
 2013-06-02 09:45:11 +04:00
Jeremy Ashkenas
84b8b5ccee CoffeeScript 1.6.3 1.6.3 2013-06-02 09:37:45 +04:00
Jeremy Ashkenas
7b14a6aad2 Fixing browser build boilerplate. 2013-06-02 09:21:36 +04:00
Jeremy Ashkenas
342306587c Removing out of date testing cruft 2013-06-02 09:13:16 +04:00
Jeremy Ashkenas
3298c9caad merge 2013-06-02 09:10:16 +04:00
Jeremy Ashkenas
7089b02a74 Merging in a monkey-patching of Module::load, unfortunately. 2013-06-02 09:03:54 +04:00
Jeremy Ashkenas
bd451800bf Merge pull request #3000 from sgentle/require-extensions 
Patch module.prototype.load to enable multiple extensions like .coffee.md
 2013-06-01 21:44:02 -07:00
Jeremy Ashkenas
5e06f7e859 Removing Ultraviolet workaround 2013-06-02 07:50:03 +04:00
Michael Ficarra
0f5ae54014 Merge pull request #2930 from marchaefner/Issue1057 
Fixes #1057: Allow catch/finally in single line functions.
 2013-05-31 14:56:04 -07:00
Michael Ficarra
5496a189bc fixes #2934 2013-05-31 16:51:30 -05:00
Michael Ficarra
2e6a781014 remove cake build:ultraviolet 2013-05-31 15:49:48 -05:00
Michael Ficarra
b85cf5355f Merge pull request #2085 from stepheneb/ruby-1-9-generate-coffeescript-syntax 
rake task creates/installs coffeescript.syntax
 2013-05-31 13:48:22 -07:00
Jeremy Ashkenas
f038d0514a Merge pull request #2984 from xixixao/literatetest 
Fixes tabbed code test in literate
 2013-05-26 04:08:01 -07:00
Jeremy Ashkenas
7c4128ee3b Merge pull request #3002 from Nami-Doc/issue3001 
Disallowed `for own in`
 2013-05-26 03:43:22 -07:00