Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also .

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also .
...
  • 11 commits
  • 20 files changed
  • 0 commit comments
  • 5 contributors
Commits on Jan 28, 2014
@dannguyen dannguyen Just a small typo in 1.7.0 changelog e4c8bcf
@jashkenas Merge pull request #3334 from dannguyen/patch-1
Just a small typo in 1.7.0 changelog
734fced
@roryokane roryokane Fix markup in math operator documentation
In the documentation, surround the new operators with `<tt>` tags instead of Markdown-style backticks, since this is HTML.
a5fef52
Commits on Jan 29, 2014
@jashkenas Merge pull request #3336 from roryokane/fix-math-operator-docs-markup
Fix markup in math operator documentation
7c4f842
@jashkenas index.html e543eb5
@roryokane roryokane In docs, move commas out of code
The commas separating these three keywords are not code themselves – not what the user would write – so they should be outside of the `<tt>` tags.

Edits the table in the section [Operators and Aliases](http://coffeescript.org/#operators).
3fcaebb
@roryokane roryokane In docs, move commas, part 2
I had missed that the next line had comma-separated operators, too.
b4d35f1
@jashkenas Merge pull request #3337 from roryokane/fix-operator-docs-commas
In docs, move commas out of code
a73a6e2
@goffrie goffrie Fix a typo causing module.paths to be always set as the cwd.
`options.fileName` was used instead of `options.filename`.
38bd879
@jashkenas Merge pull request #3340 from benbria/master
Fix a typo causing module.paths to be always set as the cwd.
114eccb
Commits on Jan 30, 2014
@michaelficarra michaelficarra CoffeeScript 1.7.1 4ab8503
@@ -657,7 +657,7 @@ Expressions
test for JavaScript object-key presence.
</p>
<p>
- To simplify math expressions, `**` can be used for exponentiation, `//` performs integer division and `%%` provides true mathematical modulo.
+ To simplify math expressions, <tt>**</tt> can be used for exponentiation, <tt>//</tt> performs integer division and <tt>%%</tt> provides true mathematical modulo.
</p>
<p>
All together now:
@@ -670,9 +670,9 @@ Expressions
<tr><td><tt>not</tt></td><td><tt>!</tt></td></tr>
<tr><td><tt>and</tt></td><td><tt>&amp;&amp;</tt></td></tr>
<tr><td><tt>or</tt></td><td><tt>||</tt></td></tr>
- <tr><td><tt>true, yes, on</tt></td><td><tt>true</tt></td></tr>
- <tr><td><tt>false, no, off</tt></td><td><tt>false</tt></td></tr>
- <tr><td><tt>@, this</tt></td><td><tt>this</tt></td></tr>
+ <tr><td><tt>true</tt>, <tt>yes</tt>, <tt>on</tt></td><td><tt>true</tt></td></tr>
+ <tr><td><tt>false</tt>, <tt>no</tt>, <tt>off</tt></td><td><tt>false</tt></td></tr>
+ <tr><td><tt>@</tt>, <tt>this</tt></td><td><tt>this</tt></td></tr>
<tr><td><tt>of</tt></td><td><tt>in</tt></td></tr>
<tr><td><tt>in</tt></td><td><i><small>no JS equivalent</small></i></td></tr>
<tr><td><tt>a ** b</tt></td><td><tt>Math.pow(a, b)</tt></td></tr>
@@ -1210,7 +1210,7 @@ Expressions
<%= codeFor('chaining') %>
<ul>
<li>
- Added <tt>**</tt>, <tt>//</tt> and <tt>%%</tt> operators and <tt>...</tt> expansion in paramater lists and destructuring expressions.
+ Added <tt>**</tt>, <tt>//</tt> and <tt>%%</tt> operators and <tt>...</tt> expansion in parameter lists and destructuring expressions.
</li>
<li>
Multiline strings are now joined by a single space and ignore all indentation. A backslash at the end of a line can denote the amount of whitespace between lines, in both strings and heredocs. Backslashes correctly escape whitespace in block regexes.
Oops, something went wrong.
View
@@ -1319,7 +1319,7 @@
test for JavaScript object-key presence.
</p>
<p>
- To simplify math expressions, `**` can be used for exponentiation, `//` performs integer division and `%%` provides true mathematical modulo.
+ To simplify math expressions, <tt>**</tt> can be used for exponentiation, <tt>//</tt> performs integer division and <tt>%%</tt> provides true mathematical modulo.
</p>
<p>
All together now:
@@ -2478,7 +2478,7 @@
</code></pre><script>window.example43 = "$ 'body'\n.click (e) ->\n $ '.box'\n .fadeIn 'fast'\n .addClass '.active'\n.css 'background', 'white'\n\n\n"</script><div class='minibutton load' onclick='javascript: loadConsole(example43);'>load</div><br class='clear' /></div>
<ul>
<li>
- Added <tt>**</tt>, <tt>//</tt> and <tt>%%</tt> operators and <tt>...</tt> expansion in paramater lists and destructuring expressions.
+ Added <tt>**</tt>, <tt>//</tt> and <tt>%%</tt> operators and <tt>...</tt> expansion in parameter lists and destructuring expressions.
</li>
<li>
Multiline strings are now joined by a single space and ignore all indentation. A backslash at the end of a line can denote the amount of whitespace between lines, in both strings and heredocs. Backslashes correctly escape whitespace in block regexes.
@@ -1,4 +1,4 @@
-// Generated by CoffeeScript 1.7.0
+// Generated by CoffeeScript 1.7.1
(function() {
var CoffeeScript, compile, runScripts,
__indexOf = [].indexOf || function(item) { for (var i = 0, l = this.length; i < l; i++) { if (i in this && this[i] === item) return i; } return -1; };
@@ -1,4 +1,4 @@
-// Generated by CoffeeScript 1.7.0
+// Generated by CoffeeScript 1.7.1
(function() {
var CoffeeScript, cakefileDirectory, fatalError, fs, helpers, missingTask, oparse, options, optparse, path, printTasks, switches, tasks;
@@ -1,4 +1,4 @@
-// Generated by CoffeeScript 1.7.0
+// Generated by CoffeeScript 1.7.1
(function() {
var Lexer, SourceMap, compile, formatSourcePosition, fs, getSourceMap, helpers, lexer, parser, path, sourceMaps, vm, withPrettyErrors,
__hasProp = {}.hasOwnProperty,
@@ -18,7 +18,7 @@
SourceMap = require('./sourcemap');
- exports.VERSION = '1.7.0';
+ exports.VERSION = '1.7.1';
exports.FILE_EXTENSIONS = ['.coffee', '.litcoffee', '.coffee.md'];
@@ -110,7 +110,7 @@
mainModule = require.main;
mainModule.filename = process.argv[1] = options.filename ? fs.realpathSync(options.filename) : '.';
mainModule.moduleCache && (mainModule.moduleCache = {});
- dir = options.fileName ? path.dirname(fs.realpathSync(options.filename)) : fs.realpathSync('.');
+ dir = options.filename ? path.dirname(fs.realpathSync(options.filename)) : fs.realpathSync('.');
mainModule.paths = require('module')._nodeModulePaths(dir);
if (!helpers.isCoffee(mainModule.filename) || require.extensions) {
answer = compile(code, options);
@@ -1,4 +1,4 @@
-// Generated by CoffeeScript 1.7.0
+// Generated by CoffeeScript 1.7.1
(function() {
var BANNER, CoffeeScript, EventEmitter, SWITCHES, compileJoin, compileOptions, compilePath, compileScript, compileStdio, exec, findDirectoryIndex, forkNode, fs, helpers, hidden, joinTimeout, mkdirp, notSources, optionParser, optparse, opts, outputPath, parseOptions, path, printLine, printTokens, printWarn, removeSource, removeSourceDir, silentUnlink, sourceCode, sources, spawn, timeLog, usage, useWinPathSep, version, wait, watch, watchDir, watchedDirs, writeJs, _ref,
__indexOf = [].indexOf || function(item) { for (var i = 0, l = this.length; i < l; i++) { if (i in this && this[i] === item) return i; } return -1; };
@@ -1,4 +1,4 @@
-// Generated by CoffeeScript 1.7.0
+// Generated by CoffeeScript 1.7.1
(function() {
var Parser, alt, alternatives, grammar, name, o, operators, token, tokens, unwrap;
@@ -1,4 +1,4 @@
-// Generated by CoffeeScript 1.7.0
+// Generated by CoffeeScript 1.7.1
(function() {
var buildLocationData, extend, flatten, last, repeat, syntaxErrorToString, _ref;
@@ -1,4 +1,4 @@
-// Generated by CoffeeScript 1.7.0
+// Generated by CoffeeScript 1.7.1
(function() {
var key, val, _ref;
@@ -1,4 +1,4 @@
-// Generated by CoffeeScript 1.7.0
+// Generated by CoffeeScript 1.7.1
(function() {
var BOM, BOOL, CALLABLE, CODE, COFFEE_ALIASES, COFFEE_ALIAS_MAP, COFFEE_KEYWORDS, COMMENT, COMPARE, COMPOUND_ASSIGN, HEREDOC, HEREDOC_ILLEGAL, HEREDOC_INDENT, HEREGEX, HEREGEX_OMIT, IDENTIFIER, INDENTABLE_CLOSERS, INDEXABLE, INVERSES, JSTOKEN, JS_FORBIDDEN, JS_KEYWORDS, LINE_BREAK, LINE_CONTINUER, LOGIC, Lexer, MATH, MULTILINER, MULTI_DENT, NOT_REGEX, NOT_SPACED_REGEX, NUMBER, OPERATOR, REGEX, RELATION, RESERVED, Rewriter, SHIFT, SIMPLESTR, STRICT_PROSCRIBED, TRAILING_SPACES, UNARY, UNARY_MATH, WHITESPACE, compact, count, invertLiterate, key, last, locationDataToString, repeat, starts, throwSyntaxError, _ref, _ref1,
__indexOf = [].indexOf || function(item) { for (var i = 0, l = this.length; i < l; i++) { if (i in this && this[i] === item) return i; } return -1; };
@@ -1,4 +1,4 @@
-// Generated by CoffeeScript 1.7.0
+// Generated by CoffeeScript 1.7.1
(function() {
var Access, Arr, Assign, Base, Block, Call, Class, Code, CodeFragment, Comment, Existence, Expansion, Extends, For, HEXNUM, IDENTIFIER, IDENTIFIER_STR, IS_REGEX, IS_STRING, If, In, Index, LEVEL_ACCESS, LEVEL_COND, LEVEL_LIST, LEVEL_OP, LEVEL_PAREN, LEVEL_TOP, Literal, METHOD_DEF, NEGATE, NO, NUMBER, Obj, Op, Param, Parens, RESERVED, Range, Return, SIMPLENUM, STRICT_PROSCRIBED, Scope, Slice, Splat, Switch, TAB, THIS, Throw, Try, UTILITIES, Value, While, YES, addLocationDataFn, compact, del, ends, extend, flatten, fragmentsToText, isLiteralArguments, isLiteralThis, last, locationDataToString, merge, multident, parseNum, some, starts, throwSyntaxError, unfoldSoak, utility, _ref, _ref1,
__hasProp = {}.hasOwnProperty,
@@ -1,4 +1,4 @@
-// Generated by CoffeeScript 1.7.0
+// Generated by CoffeeScript 1.7.1
(function() {
var LONG_FLAG, MULTI_FLAG, OPTIONAL, OptionParser, SHORT_FLAG, buildRule, buildRules, normalizeArguments, repeat;
@@ -1,4 +1,4 @@
-// Generated by CoffeeScript 1.7.0
+// Generated by CoffeeScript 1.7.1
(function() {
var CoffeeScript, Module, binary, child_process, ext, findExtension, fork, helpers, loadFile, path, _i, _len, _ref;
@@ -1,4 +1,4 @@
-// Generated by CoffeeScript 1.7.0
+// Generated by CoffeeScript 1.7.1
(function() {
var CoffeeScript, addHistory, addMultilineHandler, fs, merge, nodeREPL, path, replDefaults, updateSyntaxError, vm, _ref;
@@ -1,4 +1,4 @@
-// Generated by CoffeeScript 1.7.0
+// Generated by CoffeeScript 1.7.1
(function() {
var BALANCED_PAIRS, CALL_CLOSERS, EXPRESSION_CLOSE, EXPRESSION_END, EXPRESSION_START, IMPLICIT_CALL, IMPLICIT_END, IMPLICIT_FUNC, IMPLICIT_UNSPACED_CALL, INVERSES, LINEBREAKS, SINGLE_CLOSERS, SINGLE_LINERS, generate, left, rite, _i, _len, _ref,
__indexOf = [].indexOf || function(item) { for (var i = 0, l = this.length; i < l; i++) { if (i in this && this[i] === item) return i; } return -1; },
@@ -1,4 +1,4 @@
-// Generated by CoffeeScript 1.7.0
+// Generated by CoffeeScript 1.7.1
(function() {
var Scope, extend, last, _ref;
@@ -1,4 +1,4 @@
-// Generated by CoffeeScript 1.7.0
+// Generated by CoffeeScript 1.7.1
(function() {
var LineMap, SourceMap;
View
@@ -8,7 +8,7 @@
"compiler"
],
"author": "Jeremy Ashkenas",
- "version": "1.7.0",
+ "version": "1.7.1",
"license": "MIT",
"engines": {
"node": ">=0.8.0"
@@ -12,7 +12,7 @@ helpers = require './helpers'
SourceMap = require './sourcemap'
# The current CoffeeScript version number.
-exports.VERSION = '1.7.0'
+exports.VERSION = '1.7.1'
exports.FILE_EXTENSIONS = ['.coffee', '.litcoffee', '.coffee.md']
@@ -107,7 +107,7 @@ exports.run = (code, options = {}) ->
mainModule.moduleCache and= {}
# Assign paths for node_modules loading
- dir = if options.fileName
+ dir = if options.filename
path.dirname fs.realpathSync options.filename
else
fs.realpathSync '.'

No commit comments for this range