Use standard JavaScript eval to eval code.
CoffeeScript.eval = (code, options) ->
eval CoffeeScript.compile code, optionsRunning code does not provide access to this scope.
CoffeeScript.run = (code, options = {}) ->
options.bare = on
- Function(CoffeeScript.compile code, options)()If we're not in a browser environment, we're finished with the public API.
return unless window?Load a remote script from the current domain via XHR.
CoffeeScript.load = (url, options) ->
+ Function(CoffeeScript.compile code, options)()If we're not in a browser environment, we're finished with the public API.
return unless window?Load a remote script from the current domain via XHR.
CoffeeScript.load = (url, callback) ->
xhr = new (window.ActiveXObject or XMLHttpRequest)('Microsoft.XMLHTTP')
xhr.open 'GET', url, true
xhr.overrideMimeType 'text/plain' if 'overrideMimeType' of xhr
xhr.onreadystatechange = ->
- CoffeeScript.run xhr.responseText, options if xhr.readyState is 4
+ if xhr.readyState is 4
+ if xhr.status in [0, 200]
+ CoffeeScript.run xhr.responseText
+ else
+ throw new Error "Could not load #{url}"
+ callback() if callback
xhr.send nullActivate CoffeeScript in the browser by having it compile and evaluate
all script tags with a content-type of text/coffeescript.
This happens on page load.
runScripts = ->
- for script in document.getElementsByTagName 'script'
- if script.type is 'text/coffeescript'
+ scripts = document.getElementsByTagName 'script'
+ coffees = (s for s in scripts when s.type is 'text/coffeescript')
+ index = 0
+ length = coffees.length
+ do execute = ->
+ script = coffees[index++]
+ if script?.type is 'text/coffeescript'
if script.src
- CoffeeScript.load script.src
+ CoffeeScript.load script.src, execute
else
CoffeeScript.run script.innerHTML
+ execute()
nullListen for window load, both in browsers and in IE.
if window.addEventListener
addEventListener 'DOMContentLoaded', runScripts, no
else
diff --git a/documentation/docs/coffee-script.html b/documentation/docs/coffee-script.html
index 0cef6031a7..316f098d09 100644
--- a/documentation/docs/coffee-script.html
+++ b/documentation/docs/coffee-script.html
@@ -6,13 +6,14 @@
If included on a webpage, it will automatically sniff out, compile, and
execute all scripts present in text/coffeescript tags.
fs = require 'fs'
path = require 'path'
+vm = require 'vm'
{Lexer,RESERVED} = require './lexer'
{parser} = require './parser'TODO: Remove registerExtension when fully deprecated.
if require.extensions
require.extensions['.coffee'] = (module, filename) ->
- content = compile fs.readFileSync filename, 'utf8'
+ content = compile fs.readFileSync(filename, 'utf8'), {filename}
module._compile content, filename
else if require.registerExtension
- require.registerExtension '.coffee', (content) -> compile contentThe current CoffeeScript version number.
exports.VERSION = '1.0.1'Words that cannot be used as identifiers in CoffeeScript code
exports.RESERVED = RESERVEDExpose helpers for testing.
exports.helpers = require './helpers'Compile a string of CoffeeScript code to JavaScript, using the Coffee/Jison + require.registerExtension '.coffee', (content) -> compile content
The current CoffeeScript version number.
exports.VERSION = '1.1.0'Words that cannot be used as identifiers in CoffeeScript code
exports.RESERVED = RESERVEDExpose helpers for testing.
exports.helpers = require './helpers'Compile a string of CoffeeScript code to JavaScript, using the Coffee/Jison compiler.
exports.compile = compile = (code, options = {}) ->
try
(parser.parse lexer.tokenize code).compile options
@@ -28,14 +29,26 @@
parser.parse sourceCompile and execute a string of CoffeeScript (on the server), correctly
setting __filename, __dirname, and relative require().
exports.run = (code, options) ->We want the root module.
root = module
while root.parent
- root = root.parentSet the filename.
root.filename = if options.filename then fs.realpathSync(options.filename) else '.'Clear the module cache.
root.moduleCache = {} if root.moduleCacheCompile.
if path.extname(root.filename) isnt '.coffee' or require.extensions
+ root = root.parentSet the filename.
root.filename = process.argv[1] =
+ if options.filename then fs.realpathSync(options.filename) else '.'Clear the module cache.
root.moduleCache = {} if root.moduleCacheAssign paths for node_modules loading
if process.binding('natives').module
+ {Module} = require 'module'
+ root.paths = Module._nodeModulePaths path.dirname options.filenameCompile.
if path.extname(root.filename) isnt '.coffee' or require.extensions
root._compile compile(code, options), root.filename
else
- root._compile code, root.filenameCompile and evaluate a string of CoffeeScript (in a Node.js-like environment). -The CoffeeScript REPL uses this to run the input.
exports.eval = (code, options) ->
- __filename = module.filename = options.filename
- __dirname = path.dirname __filename
- eval compile code, optionsInstantiate a Lexer for our use here.
lexer = new LexerThe real Lexer produces a generic stream of tokens. This object provides a + root._compile code, root.filename
Compile and evaluate a string of CoffeeScript (in a Node.js-like environment). +The CoffeeScript REPL uses this to run the input.
exports.eval = (code, options = {}) ->
+ sandbox = options.sandbox
+ unless sandbox
+ sandbox =
+ require: require
+ module : { exports: {} }
+ sandbox[g] = global[g] for g of global
+ sandbox.global = sandbox
+ sandbox.global.global = sandbox.global.root = sandbox.global.GLOBAL = sandbox
+ sandbox.__filename = options.filename || 'eval'
+ sandbox.__dirname = path.dirname sandbox.__filename
+ js = compile "_=(#{code.trim()})", options
+ vm.runInNewContext js, sandbox, sandbox.__filenameInstantiate a Lexer for our use here.
lexer = new LexerThe real Lexer produces a generic stream of tokens. This object provides a thin wrapper around it, compatible with the Jison API. We can then pass it directly as a "Jison lexer".
parser.lexer =
lex: ->
diff --git a/documentation/docs/command.html b/documentation/docs/command.html
index 9929d7eb54..3aab62fd56 100644
--- a/documentation/docs/command.html
+++ b/documentation/docs/command.html
@@ -17,7 +17,7 @@
['-c', '--compile', 'compile to JavaScript and save as .js files']
['-i', '--interactive', 'run an interactive CoffeeScript REPL']
['-o', '--output [DIR]', 'set the directory for compiled JavaScript']
- ['-j', '--join', 'concatenate the scripts before compiling']
+ ['-j', '--join [FILE]', 'concatenate the scripts before compiling']
['-w', '--watch', 'watch scripts for changes, and recompile']
['-p', '--print', 'print the compiled JavaScript to stdout']
['-l', '--lint', 'pipe the compiled JavaScript through JSLint']
@@ -48,6 +48,8 @@
if opts.run
opts.literals = sources.splice(1).concat opts.literals
process.ARGV = process.argv = process.argv.slice(0, 2).concat opts.literals
+ process.argv[0] = 'coffee'
+ process.execPath = process.mainModule.filename
compileScripts()Asynchronously read in each CoffeeScript in a list of source files and compile them. If a directory is passed, recursively compile all '.coffee' extension source files in it and all subdirectories.
compileScripts = ->
@@ -57,6 +59,7 @@
path.exists source, (exists) ->
throw new Error "File not found: #{source}" if topLevel and not exists
fs.stat source, (err, stats) ->
+ throw err if err
if stats.isDirectory()
fs.readdir source, (err, files) ->
for file in files
@@ -65,7 +68,7 @@
fs.readFile source, (err, code) ->
if opts.join
contents[sources.indexOf source] = code.toString()
- compileJoin() if helpers.compact(contents).length is sources.length
+ compileJoin() if helpers.compact(contents).length > 0
else
compileScript(source, code.toString(), base)
watch source, base if opts.watch and not opts.join
@@ -101,7 +104,7 @@
compileScript null, codeAfter all of the source files are done being read, concatenate and compile them together.
compileJoin = ->
code = contents.join '\n'
- compileScript "concatenation", code, "concatenation"Load files that are to-be-required before compilation occurs.
loadRequires = ->
+ compileScript opts.join, code, opts.joinLoad files that are to-be-required before compilation occurs.
loadRequires = ->
realFilename = module.filename
module.filename = '.'
require req for req in opts.require
@@ -126,7 +129,7 @@
if err
printLine err.message
else if opts.compile and opts.watch
- console.log "#{(new Date).toTimeString()} - compiled #{source}"
+ console.log "#{(new Date).toLocaleTimeString()} - compiled #{source}"
path.exists dir, (exists) ->
if exists then compile() else exec "mkdir -p #{dir}", compilePipe compiled JS through JSLint (requires a working jsl command), printing
any errors or warnings that arise.
lint = (file, js) ->
diff --git a/documentation/docs/docco.css b/documentation/docs/docco.css
index 5aa0a8d73f..20f2753d4b 100644
--- a/documentation/docs/docco.css
+++ b/documentation/docs/docco.css
@@ -115,7 +115,7 @@ table td {
}
pre, tt, code {
font-size: 12px; line-height: 18px;
- font-family: Monaco, Consolas, "Lucida Console", monospace;
+ font-family: Menlo, Monaco, Consolas, "Lucida Console", monospace;
margin: 0; padding: 0;
}
diff --git a/documentation/docs/grammar.html b/documentation/docs/grammar.html
index b40606d648..57b7012474 100644
--- a/documentation/docs/grammar.html
+++ b/documentation/docs/grammar.html
@@ -160,11 +160,15 @@
o ':: Identifier', -> new Access $2, 'proto'
o '::', -> new Access new Literal 'prototype'
o 'Index'
- o 'Slice', -> new Slice $1
]Indexing into an object or array using bracket notation.
Index: [
- o 'INDEX_START Expression INDEX_END', -> new Index $2
+ o 'INDEX_START IndexValue INDEX_END', -> $2
o 'INDEX_SOAK Index', -> extend $2, soak : yes
o 'INDEX_PROTO Index', -> extend $2, proto: yes
+ ]
+
+ IndexValue: [
+ o 'Expression', -> new Index $1
+ o 'Slice', -> new Slice $1
]In CoffeeScript, an object literal is simply a list of assignments.
Object: [
o '{ AssignList OptComma }', -> new Obj $2, $1.generated
]Assignment of properties within an object literal can be separated by @@ -209,9 +213,9 @@ ]
The CoffeeScript range literal.
Range: [
o '[ Expression RangeDots Expression ]', -> new Range $2, $4, $3
]Array slice literals.
Slice: [
- o 'INDEX_START Expression RangeDots Expression INDEX_END', -> new Range $2, $4, $3
- o 'INDEX_START Expression RangeDots INDEX_END', -> new Range $2, null, $3
- o 'INDEX_START RangeDots Expression INDEX_END', -> new Range null, $3, $2
+ o 'Expression RangeDots Expression', -> new Range $1, $3, $2
+ o 'Expression RangeDots', -> new Range $1, null, $2
+ o 'RangeDots Expression', -> new Range null, $2, $1
]The ArgList is both the list of objects passed into a function call, as well as the contents of an array literal (i.e. comma-separated expressions). Newlines work as well.
ArgList: [
diff --git a/documentation/docs/lexer.html b/documentation/docs/lexer.html
index 2928c0ee42..4bb17c1589 100644
--- a/documentation/docs/lexer.html
+++ b/documentation/docs/lexer.html
@@ -58,7 +58,8 @@
@token 'OWN', id
return id.length
forcedIdentifier = colon or
- (prev = last @tokens) and not prev.spaced and prev[0] in ['.', '?.', '@', '::']
+ (prev = last @tokens) and (prev[0] in ['.', '?.', '::'] or
+ not prev.spaced and prev[0] is '@')
tag = 'IDENTIFIER'
if id in JS_KEYWORDS or
@@ -91,7 +92,7 @@
@identifierError id
unless forcedIdentifier
- id = COFFEE_ALIASES[id] if COFFEE_ALIASES.hasOwnProperty id
+ id = COFFEE_ALIAS_MAP[id] if id in COFFEE_ALIASES
tag = switch id
when '!' then 'UNARY'
when '==', '!=' then 'COMPARE'
@@ -136,11 +137,11 @@
heredoc.lengthMatches and consumes comments.
commentToken: ->
return 0 unless match = @chunk.match COMMENT
[comment, here] = match
- @line += count comment, '\n'
if here
@token 'HERECOMMENT', @sanitizeHeredoc here,
herecomment: true, indent: Array(@indent + 1).join(' ')
@token 'TERMINATOR', '\n'
+ @line += count comment, '\n'
comment.lengthMatches JavaScript interpolated directly into the source via backticks.
jsToken: ->
return 0 unless @chunk.charAt(0) is '`' and match = JSTOKEN.exec @chunk
@token 'JS', (script = match[0]).slice 1, -1
@@ -277,8 +278,11 @@
value.lengthSanitize a heredoc or herecomment by erasing all external indentation on the left-hand side.
sanitizeHeredoc: (doc, options) ->
{indent, herecomment} = options
- return doc if herecomment and 0 > doc.indexOf '\n'
- unless herecomment
+ if herecomment
+ if HEREDOC_ILLEGAL.test doc
+ throw new Error "block comment cannot contain \"*/\", starting on line #{@line + 1}"
+ return doc if doc.indexOf('\n') <= 0
+ else
while match = HEREDOC_INDENT.exec doc
attempt = match[1]
indent = attempt if indent is null or 0 < attempt.length < indent.length
@@ -298,7 +302,7 @@
stack.push tok
when '(', 'CALL_START'
if stack.length then stack.pop()
- else
+ else if tok[0] is '('
tok[0] = 'PARAM_START'
return this
thisClose up all remaining open blocks at the end of the file.
closeIndentation: ->
@@ -394,7 +398,8 @@
'if', 'else', 'switch', 'for', 'while', 'do', 'try', 'catch', 'finally'
'class', 'extends', 'super'
]CoffeeScript-only keywords.
COFFEE_KEYWORDS = ['undefined', 'then', 'unless', 'until', 'loop', 'of', 'by', 'when']
-COFFEE_KEYWORDS.push op for op of COFFEE_ALIASES =
+
+COFFEE_ALIAS_MAP =
and : '&&'
or : '||'
is : '=='
@@ -403,7 +408,10 @@
yes : 'true'
no : 'false'
on : 'true'
- off : 'false'The list of keywords that are reserved by JavaScript, but not used, or are + off : 'false' + +COFFEE_ALIASES = (key for key of COFFEE_ALIAS_MAP) +COFFEE_KEYWORDS = COFFEE_KEYWORDS.concat COFFEE_ALIASES
The list of keywords that are reserved by JavaScript, but not used, or are used by CoffeeScript internally. We throw an error when these are encountered, to avoid having a JavaScript error at runtime.
RESERVED = [
'case', 'default', 'function', 'var', 'void', 'with'
@@ -445,7 +453,7 @@
SIMPLESTR = /^'[^\\']*(?:\\.[^\\']*)*'/
JSTOKEN = /^`[^\\`]*(?:\\.[^\\`]*)*`/Regex-matching-regexes.
REGEX = /// ^
- / (?! \s ) # disallow leading whitespace
+ / (?! [\s=] ) # disallow leading whitespace or equals signs
[^ [ / \n \\ ]* # every other thing
(?:
(?: \\[\s\S] # anything escaped
@@ -464,9 +472,11 @@
HEREDOC_INDENT = /\n+([^\n\S]*)/g
+HEREDOC_ILLEGAL = /\*\//
+
ASSIGNED = /^\s*@?([$A-Za-z_][$\w\x7f-\uffff]*|['"].*['"])[^\n\S]*?[:=][^:=>]/
-LINE_CONTINUER = /// ^ \s* (?: , | \??\.(?!\.) | :: ) ///
+LINE_CONTINUER = /// ^ \s* (?: , | \??\.(?![.\d]) | :: ) ///
TRAILING_SPACES = /\s+$/
diff --git a/documentation/docs/nodes.html b/documentation/docs/nodes.html
index 18ef9e5e89..bd39eb2025 100644
--- a/documentation/docs/nodes.html
+++ b/documentation/docs/nodes.html
@@ -29,7 +29,7 @@
else
node.compileClosure oStatements converted into expressions via closure-wrapping share a scope object with their parent closure, to preserve the expected lexical scope.
compileClosure: (o) ->
- if @jumps()
+ if @jumps() or this instanceof Throw
throw SyntaxError 'cannot use a pure statement in an expression.'
o.sharedScope = yes
Closure.wrap(this).compileNode oIf the code generation wishes to use the result of a complex expression @@ -152,7 +152,6 @@ o.scope = new Scope null, this, null o.level = LEVEL_TOP code = @compileWithDeclarations o - code = code.replace TRAILING_WHITESPACE, '' if o.bare then code else "(function() {\n#{code}\n}).call(this);\n"
Compile the expressions body for the contents of a function, with declarations of all inner variables pushed up to the top.
compileWithDeclarations: (o) ->
code = post = ''
@@ -167,7 +166,7 @@
post = @compileNode o
{scope} = o
if scope.expressions is this
- if not o.globals and o.scope.hasDeclarations()
+ if o.scope.hasDeclarations()
code += "#{@tab}var #{ scope.declaredVariables().join(', ') };\n"
if scope.hasAssignments
code += "#{@tab}var #{ multident scope.assignedVariables().join(', '), @tab };\n"
@@ -285,19 +284,22 @@
code = "(#{code})" if props[0] instanceof Access and @isSimpleNumber()
code += prop.compile o for prop in props
codeUnfold a soak into an If: a?.b -> a.b if a?
unfoldSoak: (o) ->
- if ifn = @base.unfoldSoak o
- Array::push.apply ifn.body.properties, @properties
- return ifn
- for prop, i in @properties when prop.soak
- prop.soak = off
- fst = new Value @base, @properties.slice 0, i
- snd = new Value @base, @properties.slice i
- if fst.isComplex()
- ref = new Literal o.scope.freeVariable 'ref'
- fst = new Parens new Assign ref, fst
- snd.base = ref
- return new If new Existence(fst), snd, soak: on
- nullCoffeeScript passes through block comments as JavaScript block comments + return @unfoldedSoak if @unfoldedSoak? + result = do => + if ifn = @base.unfoldSoak o + Array::push.apply ifn.body.properties, @properties + return ifn + for prop, i in @properties when prop.soak + prop.soak = off + fst = new Value @base, @properties.slice 0, i + snd = new Value @base, @properties.slice i + if fst.isComplex() + ref = new Literal o.scope.freeVariable 'ref' + fst = new Parens new Assign ref, fst + snd.base = ref + return new If new Existence(fst), snd, soak: on + null + @unfoldedSoak = result or no
CoffeeScript passes through block comments as JavaScript block comments at the same position.
exports.Comment = class Comment extends Base
constructor: (@comment) ->
@@ -339,7 +341,7 @@
rite = new Value left
rite = new Call rite, @args
rite.isNew = @isNew
- left = new Literal "typeof #{ left.compile o } == \"function\""
+ left = new Literal "typeof #{ left.compile o } === \"function\""
return new If left, new Value(rite), soak: yes
call = this
list = []
@@ -358,17 +360,33 @@
else
call.variable.base = ifn
ifn = unfoldSoak o, call, 'variable'
- ifnCompile a vanilla function call.
compileNode: (o) ->
+ ifnWalk through the objects in the arguments, moving over simple values.
+This allows syntax like call a: b, c into call({a: b}, c);
filterImplicitObjects: (list) ->
+ nodes = []
+ for node in list
+ unless node.isObject?() and node.base.generated
+ nodes.push node
+ continue
+ obj = null
+ for prop in node.base.properties
+ if prop instanceof Assign
+ nodes.push obj = new Obj properties = [], true if not obj
+ properties.push prop
+ else
+ nodes.push prop
+ obj = null
+ nodesCompile a vanilla function call.
compileNode: (o) ->
@variable?.front = @front
if code = Splat.compileSplattedArray o, @args, true
return @compileSplat o, code
- args = (arg.compile o, LEVEL_LIST for arg in @args).join ', '
+ args = @filterImplicitObjects @args
+ args = (arg.compile o, LEVEL_LIST for arg in args).join ', '
if @isSuper
@superReference(o) + ".call(this#{ args and ', ' + args })"
else
- (if @isNew then 'new ' else '') + @variable.compile(o, LEVEL_ACCESS) + "(#{args})"super() is converted into a call against the superclass's implementation
+ (if @isNew then 'new ' else '') + @variable.compile(o, LEVEL_ACCESS) + "(#{args})"
super() is converted into a call against the superclass's implementation
of the current function.
compileSuper: (args, o) ->
- "#{@superReference(o)}.call(this#{ if args.length then ', ' else '' }#{args})"If you call a function with a splat, it's converted into a JavaScript + "#{@superReference(o)}.call(this#{ if args.length then ', ' else '' }#{args})"
If you call a function with a splat, it's converted into a JavaScript
.apply() call to allow an array of arguments to be passed.
If it's a constructor, then things get real tricky. We have to inject an
inner constructor in order to be able to pass the varargs.
compileSplat: (o, splatArgs) ->
@@ -376,11 +394,11 @@
if @isNew
idt = @tab + TAB
return """
- (function(func, args, ctor) {
- #{idt}ctor.prototype = func.prototype;
- #{idt}var child = new ctor, result = func.apply(child, args);
- #{idt}return typeof result == "object" ? result : child;
- #{@tab}})(#{ @variable.compile o, LEVEL_LIST }, #{splatArgs}, function() {})
+ (function(func, args, ctor) {
+ #{idt}ctor.prototype = func.prototype;
+ #{idt}var child = new ctor, result = func.apply(child, args);
+ #{idt}return typeof result === "object" ? result : child;
+ #{@tab}})(#{ @variable.compile o, LEVEL_LIST }, #{splatArgs}, function() {})
"""
base = new Value @variable
if (name = base.properties.pop()) and base.isComplex()
@@ -394,14 +412,14 @@
fun += name.compile o
else
ref = 'null'
- "#{fun}.apply(#{ref}, #{splatArgs})"Node to extend an object's prototype with an ancestor object. + "#{fun}.apply(#{ref}, #{splatArgs})"
Node to extend an object's prototype with an ancestor object.
After goog.inherits from the
Closure Library.
exports.Extends = class Extends extends Base
constructor: (@child, @parent) ->
- children: ['child', 'parent']Hooks one constructor into another's prototype chain.
compile: (o) ->
+ children: ['child', 'parent']Hooks one constructor into another's prototype chain.
compile: (o) ->
utility 'hasProp'
- new Call(new Value(new Literal utility 'extends'), [@child, @parent]).compile oA . access into a property of a value, or the :: shorthand for
+ new Call(new Value(new Literal utility 'extends'), [@child, @parent]).compile o
A . access into a property of a value, or the :: shorthand for
an access into the object's prototype.
exports.Access = class Access extends Base
constructor: (@name, tag) ->
@name.asKey = yes
@@ -414,7 +432,7 @@
name = @name.compile o
@proto + if IS_STRING.test name then "[#{name}]" else ".#{name}"
- isComplex: NOA [ ... ] indexed access into an array or object.
exports.Index = class Index extends Base
+ isComplex: NOA [ ... ] indexed access into an array or object.
exports.Index = class Index extends Base
constructor: (@index) ->
children: ['index']
@@ -423,7 +441,7 @@
(if @proto then '.prototype' else '') + "[#{ @index.compile o, LEVEL_PAREN }]"
isComplex: ->
- @index.isComplex()A range literal. Ranges can be used to extract portions (slices) of arrays, + @index.isComplex()
A range literal. Ranges can be used to extract portions (slices) of arrays, to specify a range for comprehensions, or as a value, to be expanded into the corresponding array of integers at runtime.
exports.Range = class Range extends Base
@@ -431,7 +449,7 @@
constructor: (@from, @to, tag) ->
@exclusive = tag is 'exclusive'
- @equals = if @exclusive then '' else '='Compiles the range's source variables -- where it starts and where it ends. + @equals = if @exclusive then '' else '='
Compiles the range's source variables -- where it starts and where it ends. But only if they need to be cached to avoid double evaluation.
compileVariables: (o) ->
o = merge(o, top: true)
[@from, @fromVar] = @from.cache o, LEVEL_LIST
@@ -439,7 +457,7 @@
[@fromNum, @toNum] = [@fromVar.match(SIMPLENUM), @toVar.match(SIMPLENUM)]
parts = []
parts.push @from if @from isnt @fromVar
- parts.push @to if @to isnt @toVarWhen compiled normally, the range returns the contents of the for loop + parts.push @to if @to isnt @toVar
When compiled normally, the range returns the contents of the for loop needed to iterate over the values in the range. Used by comprehensions.
compileNode: (o) ->
@compileVariables o
return @compileArray(o) unless o.index
@@ -447,11 +465,10 @@
idx = del o, 'index'
step = del o, 'step'
vars = "#{idx} = #{@from}" + if @to isnt @toVar then ", #{@to}" else ''
- intro = "(#{@fromVar} <= #{@toVar} ? #{idx}"
- compare = "#{intro} <#{@equals} #{@toVar} : #{idx} >#{@equals} #{@toVar})"
- stepPart = if step then step.compile(o) else '1'
- incr = if step then "#{idx} += #{stepPart}" else "#{intro} += #{stepPart} : #{idx} -= #{stepPart})"
- "#{vars}; #{compare}; #{incr}"Compile a simple range comprehension, with integers.
compileSimple: (o) ->
+ cond = "#{@fromVar} <= #{@toVar}"
+ compare = "#{cond} ? #{idx} <#{@equals} #{@toVar} : #{idx} >#{@equals} #{@toVar}"
+ incr = if step then "#{idx} += #{step.compile(o)}" else "#{cond} ? #{idx}++ : #{idx}--"
+ "#{vars}; #{compare}; #{incr}"Compile a simple range comprehension, with integers.
compileSimple: (o) ->
[from, to] = [+@fromNum, +@toNum]
idx = del o, 'index'
step = del o, 'step'
@@ -459,7 +476,7 @@
if from <= to
"#{idx} = #{from}; #{idx} <#{@equals} #{to}; #{step or "#{idx}++"}"
else
- "#{idx} = #{from}; #{idx} >#{@equals} #{to}; #{step or "#{idx}--"}"When used as a value, expand the range into the equivalent array.
compileArray: (o) ->
+ "#{idx} = #{from}; #{idx} >#{@equals} #{to}; #{step or "#{idx}--"}"When used as a value, expand the range into the equivalent array.
compileArray: (o) ->
if @fromNum and @toNum and Math.abs(@fromNum - @toNum) <= 20
range = [+@fromNum..+@toNum]
range.pop() if @exclusive
@@ -470,20 +487,20 @@
pre = "\n#{idt}#{result} = [];"
if @fromNum and @toNum
o.index = i
- body = @compileSimple o
+ body = @compileSimple o
else
- vars = "#{i} = #{@from}" + if @to isnt @toVar then ", #{@to}" else ''
- clause = "#{@fromVar} <= #{@toVar} ?"
- body = "var #{vars}; #{clause} #{i} <#{@equals} #{@toVar} : #{i} >#{@equals} #{@toVar}; #{clause} #{i} += 1 : #{i} -= 1"
+ vars = "#{i} = #{@from}" + if @to isnt @toVar then ", #{@to}" else ''
+ cond = "#{@fromVar} <= #{@toVar}"
+ body = "var #{vars}; #{cond} ? #{i} <#{@equals} #{@toVar} : #{i} >#{@equals} #{@toVar}; #{cond} ? #{i}++ : #{i}--"
post = "{ #{result}.push(#{i}); }\n#{idt}return #{result};\n#{o.indent}"
- "(function() {#{pre}\n#{idt}for (#{body})#{post}}).apply(this, arguments)"An array slice literal. Unlike JavaScript's Array#slice, the second parameter
+ "(function() {#{pre}\n#{idt}for (#{body})#{post}}).apply(this, arguments)"
An array slice literal. Unlike JavaScript's Array#slice, the second parameter
specifies the index of the end of the slice, just as the first parameter
is the index of the beginning.
exports.Slice = class Slice extends Base
children: ['range']
constructor: (@range) ->
- super()We have to be careful when trying to slice through the end of the array, + super()
We have to be careful when trying to slice through the end of the array,
9e9 is used because not all implementations respect undefined or 1/0.
9e9 should be safe because 9e9 > 2**32, the max array length.
compileNode: (o) ->
{to, from} = @range
@@ -496,7 +513,7 @@
(+compiled + 1).toString()
else
"(#{compiled} + 1) || 9e9"
- ".slice(#{ fromStr }#{ toStr or '' })"An object literal, nothing fancy.
exports.Obj = class Obj extends Base
+ ".slice(#{ fromStr }#{ toStr or '' })"An object literal, nothing fancy.
exports.Obj = class Obj extends Base
constructor: (props, @generated = false) ->
@objects = @properties = props or []
@@ -505,6 +522,9 @@
compileNode: (o) ->
props = @properties
return (if @front then '({})' else '{}') unless props.length
+ if @generated
+ for node in props when node instanceof Value
+ throw new Error 'cannot have an implicit value in an implicit object'
idt = o.indent += TAB
lastNoncom = @lastNonComment @properties
props = for prop, i in props
@@ -528,17 +548,20 @@
assigns: (name) ->
for prop in @properties when prop.assigns name then return yes
- noAn array literal.
exports.Arr = class Arr extends Base
+ noAn array literal.
exports.Arr = class Arr extends Base
constructor: (objs) ->
@objects = objs or []
children: ['objects']
+ filterImplicitObjects: Call::filterImplicitObjects
+
compileNode: (o) ->
return '[]' unless @objects.length
o.indent += TAB
- return code if code = Splat.compileSplattedArray o, @objects
- code = (obj.compile o, LEVEL_LIST for obj in @objects).join ', '
+ objs = @filterImplicitObjects @objects
+ return code if code = Splat.compileSplattedArray o, objs
+ code = (obj.compile o, LEVEL_LIST for obj in objs).join ', '
if code.indexOf('\n') >= 0
"[\n#{o.indent}#{code}\n#{@tab}]"
else
@@ -546,20 +569,20 @@
assigns: (name) ->
for obj in @objects when obj.assigns name then return yes
- noThe CoffeeScript class definition. + no
The CoffeeScript class definition. Initialize a Class with its name, an optional superclass, and a list of prototype property assignments.
exports.Class = class Class extends Base
constructor: (@variable, @parent, @body = new Block) ->
@boundFuncs = []
@body.classBody = yes
- children: ['variable', 'parent', 'body']Figure out the appropriate name for the constructor function of this class.
determineName: ->
+ children: ['variable', 'parent', 'body']Figure out the appropriate name for the constructor function of this class.
determineName: ->
return null unless @variable
decl = if tail = last @variable.properties
tail instanceof Access and tail.name.value
else
@variable.base.value
- decl and= IDENTIFIER.test(decl) and declFor all this-references and bound functions in the class definition,
+ decl and= IDENTIFIER.test(decl) and decl
For all this-references and bound functions in the class definition,
this is the Class being constructed.
setContext: (name) ->
@body.traverseChildren false, (node) ->
return false if node.classBody
@@ -567,12 +590,12 @@
node.value = name
else if node instanceof Code
node.klass = name
- node.context = name if node.boundEnsure that all functions bound to the instance are proxied in the + node.context = name if node.bound
Ensure that all functions bound to the instance are proxied in the constructor.
addBoundFunctions: (o) ->
if @boundFuncs.length
for bvar in @boundFuncs
bname = bvar.compile o
- @ctor.body.unshift new Literal "this.#{bname} = #{utility 'bind'}(this.#{bname}, this);"Merge the properties from a top-level object as prototypal properties + @ctor.body.unshift new Literal "this.#{bname} = #{utility 'bind'}(this.#{bname}, this);"
Merge the properties from a top-level object as prototypal properties on the class.
addProperties: (node, name) ->
props = node.base.properties.slice 0
while assign = props.shift()
@@ -595,14 +618,14 @@
if func instanceof Code and func.bound
@boundFuncs.push base
func.bound = no
- assignWalk the body of the class, looking for prototype properties to be converted.
walkBody: (name) ->
+ assignWalk the body of the class, looking for prototype properties to be converted.
walkBody: (name) ->
@traverseChildren false, (child) =>
return false if child instanceof Class
if child instanceof Block
for node, i in exps = child.expressions
if node instanceof Value and node.isObject(true)
exps[i] = @addProperties node, name
- child.expressions = exps = flatten expsMake sure that a constructor is defined for the class, and properly + child.expressions = exps = flatten exps
Make sure that a constructor is defined for the class, and properly configured.
ensureConstructor: (name) ->
if not @ctor
@ctor = new Code
@@ -610,7 +633,7 @@
@body.expressions.unshift @ctor
@ctor.ctor = @ctor.name = name
@ctor.klass = null
- @ctor.noReturn = yesInstead of generating the JavaScript string directly, we build up the + @ctor.noReturn = yes
Instead of generating the JavaScript string directly, we build up the equivalent syntax tree and compile that, in pieces. You can see the constructor, property assignments, and inheritance getting built out below.
compileNode: (o) ->
decl = @determineName()
@@ -619,17 +642,17 @@
@setContext name
@walkBody name
- @body.expressions.unshift new Extends lname, @parent if @parent
@ensureConstructor name
+ @body.expressions.splice 1, 0, new Extends(lname, @parent) if @parent
@body.expressions.push lname
@addBoundFunctions o
klass = new Parens Closure.wrap(@body), true
klass = new Assign @variable, klass if @variable
- klass.compile oThe Assign is used to assign a local variable to value, or to set the + klass.compile o
The Assign is used to assign a local variable to value, or to set the property of an object -- including within object literals.
exports.Assign = class Assign extends Base
constructor: (@variable, @value, @context, options) ->
- @param = options and options.paramMatchers for detecting class/method names
METHOD_DEF: /^(?:(\S+)\.prototype\.|\S+?)?\b([$A-Za-z_][$\w\x7f-\uffff]*)$/
+ @param = options and options.paramMatchers for detecting class/method names
METHOD_DEF: /^(?:(\S+)\.prototype\.|\S+?)?\b([$A-Za-z_][$\w\x7f-\uffff]*)$/
children: ['variable', 'value']
@@ -637,7 +660,7 @@
@[if @context is 'object' then 'value' else 'variable'].assigns name
unfoldSoak: (o) ->
- unfoldSoak o, this, 'variable'Compile an assignment, delegating to compilePatternMatch or
+ unfoldSoak o, this, 'variable'
Compile an assignment, delegating to compilePatternMatch or
compileSplice if appropriate. Keep track of the name of the base object
we've been assigned to, for correct internal references. If the variable
has not been seen yet within the current scope, declare it.
compileNode: (o) ->
@@ -646,20 +669,20 @@
return @compileSplice o if @variable.isSplice()
return @compileConditional o if @context in ['||=', '&&=', '?=']
name = @variable.compile o, LEVEL_LIST
- if @value instanceof Code and match = @METHOD_DEF.exec name
- @value.name = match[2]
- @value.klass = match[1] if match[1]
- val = @value.compile o, LEVEL_LIST
- return "#{name}: #{val}" if @context is 'object'
- unless @variable.isAssignable()
+ unless @context or @variable.isAssignable()
throw SyntaxError "\"#{ @variable.compile o }\" cannot be assigned."
unless @context or isValue and (@variable.namespaced or @variable.hasProperties())
if @param
o.scope.add name, 'var'
else
o.scope.find name
+ if @value instanceof Code and match = @METHOD_DEF.exec name
+ @value.name = match[2]
+ @value.klass = match[1] if match[1]
+ val = @value.compile o, LEVEL_LIST
+ return "#{name}: #{val}" if @context is 'object'
val = name + " #{ @context or '=' } " + val
- if o.level <= LEVEL_LIST then val else "(#{val})"Brief implementation of recursive pattern matching, when assigning array or + if o.level <= LEVEL_LIST then val else "(#{val})"
Brief implementation of recursive pattern matching, when assigning array or object literals to a value. Peeks at their properties to assign inner names. See the ECMAScript Harmony Wiki for details.
compilePatternMatch: (o) ->
@@ -667,11 +690,10 @@
{value} = this
{objects} = @variable.base
unless olen = objects.length
- return false if top
code = value.compile o
return if o.level >= LEVEL_OP then "(#{code})" else code
isObject = @variable.isObject()
- if top and olen is 1 and (obj = objects[0]) not instanceof SplatUnroll simplest cases: {v} = x -> v = x.v
if obj instanceof Assign
+ if top and olen is 1 and (obj = objects[0]) not instanceof SplatUnroll simplest cases: {v} = x -> v = x.v
if obj instanceof Assign
{variable: {base: idx}, value: obj} = obj
else
if obj.base instanceof Parens
@@ -691,10 +713,10 @@
if not IDENTIFIER.test(vvar) or @variable.assigns(vvar)
assigns.push "#{ ref = o.scope.freeVariable 'ref' } = #{vvar}"
vvar = ref
- for obj, i in objectsA regular array pattern-match.
idx = i
+ for obj, i in objectsA regular array pattern-match.
idx = i
if isObject
- if obj instanceof AssignA regular object pattern-match.
{variable: {base: idx}, value: obj} = obj
- elseA shorthand {a, b, @c} = val pattern-match.
if obj.base instanceof Parens
+ if obj instanceof AssignA regular object pattern-match.
{variable: {base: idx}, value: obj} = obj
+ elseA shorthand {a, b, @c} = val pattern-match.
if obj.base instanceof Parens
[obj, idx] = new Value(obj.unwrapAll()).cacheReference o
else
idx = if obj.this then obj.properties[0].name else obj
@@ -720,12 +742,12 @@
val = new Value new Literal(vvar), [new (if acc then Access else Index) idx]
assigns.push new Assign(obj, val, null, param: @param).compile o, LEVEL_TOP
assigns.push vvar unless top
- code = (compact assigns).join ', '
- if o.level < LEVEL_LIST then code else "(#{code})"When compiling a conditional assignment, take care to ensure that the + code = assigns.join ', ' + if o.level < LEVEL_LIST then code else "(#{code})"
When compiling a conditional assignment, take care to ensure that the operands are only evaluated once, even though we have to reference them more than once.
compileConditional: (o) ->
[left, rite] = @variable.cacheReference o
- new Op(@context.slice(0, -1), left, new Assign(rite, @value, '=')).compile oCompile the assignment from an array splice literal, using JavaScript's + new Op(@context.slice(0, -1), left, new Assign(rite, @value, '=')).compile o
Compile the assignment from an array splice literal, using JavaScript's
Array#splice method.
compileSplice: (o) ->
{range: {from, to, exclusive}} = @variable.properties.pop()
name = @variable.compile o
@@ -741,7 +763,7 @@
to = "9e9"
[valDef, valRef] = @value.cache o, LEVEL_LIST
code = "[].splice.apply(#{name}, [#{fromDecl}, #{to}].concat(#{valDef})), #{valRef}"
- if o.level > LEVEL_TOP then "(#{code})" else codeA function definition. This is the only node that creates a new Scope. + if o.level > LEVEL_TOP then "(#{code})" else code
A function definition. This is the only node that creates a new Scope. When for the purposes of walking the contents of a function body, the Code has no children -- they're within the inner scope.
exports.Code = class Code extends Base
constructor: (params, body, tag) ->
@@ -754,7 +776,7 @@
isStatement: -> !!@ctor
- jumps: NOCompilation creates a new scope unless explicitly asked to share with the + jumps: NO
Compilation creates a new scope unless explicitly asked to share with the
outer scope. Handles splat parameters in the parameter list by peeking at
the JavaScript arguments objects. If the function is bound with the =>
arrow, generates a wrapper that saves the current value of this through
@@ -763,10 +785,10 @@
o.scope.shared = del o, 'sharedScope'
o.indent += TAB
delete o.bare
- delete o.globals
vars = []
exprs = []
for param in @params when param.splat
+ o.scope.add param.name.value, 'var' if param.name.value
splats = new Assign new Value(new Arr(p.asReference o for p in @params)),
new Value new Literal 'arguments'
break
@@ -795,9 +817,9 @@
code += '}'
return @tab + code if @ctor
return utility('bind') + "(#{code}, #{@context})" if @bound
- if @front or (o.level >= LEVEL_ACCESS) then "(#{code})" else code
Short-circuit traverseChildren method to prevent it from crossing scope boundaries
+ if @front or (o.level >= LEVEL_ACCESS) then "(#{code})" else code
Short-circuit traverseChildren method to prevent it from crossing scope boundaries
unless crossScope is true.
traverseChildren: (crossScope, func) ->
- super(crossScope, func) if crossScopeA parameter in a function definition. Beyond a typical Javascript parameter, + super(crossScope, func) if crossScope
A parameter in a function definition. Beyond a typical Javascript parameter, these parameters can also attach themselves to the context of the function, as well as be a splat, gathering up a group of parameters into an array.
exports.Param = class Param extends Base
constructor: (@name, @value, @splat) ->
@@ -820,7 +842,7 @@
@reference = node
isComplex: ->
- @name.isComplex()A splat, either as a parameter to a function, an argument to a call, + @name.isComplex()
A splat, either as a parameter to a function, an argument to a call, or as part of a destructuring assignment.
exports.Splat = class Splat extends Base
children: ['name']
@@ -834,7 +856,7 @@
@name.assigns name
compile: (o) ->
- if @index? then @compileParam o else @name.compile oUtility function that converts arbitrary number of elements, mixed with + if @index? then @compileParam o else @name.compile o
Utility function that converts arbitrary number of elements, mixed with splats, to a proper array.
@compileSplattedArray: (o, list, apply) ->
index = -1
continue while (node = list[++index]) and node not instanceof Splat
@@ -851,7 +873,7 @@
else "[#{code}]"
return args[0] + ".concat(#{ args.slice(1).join ', ' })" if index is 0
base = (node.compile o, LEVEL_LIST for node in list.slice 0, index)
- "[#{ base.join ', ' }].concat(#{ args.join ', ' })"A while loop, the only sort of low-level loop exposed by CoffeeScript. From + "[#{ base.join ', ' }].concat(#{ args.join ', ' })"
A while loop, the only sort of low-level loop exposed by CoffeeScript. From it, all other loops can be manufactured. Useful in cases where you need more flexibility or more speed than a comprehension can provide.
exports.While = class While extends Base
constructor: (condition, options) ->
@@ -874,7 +896,7 @@
return no unless expressions.length
for node in expressions
return node if node.jumps loop: yes
- noThe main difference from a JavaScript while is that the CoffeeScript + no
The main difference from a JavaScript while is that the CoffeeScript while can be used as a part of a larger expression -- while loops may return an array containing the computed result of each iteration.
compileNode: (o) ->
o.indent += TAB
@@ -892,22 +914,25 @@
code = set + @tab + "while (#{ @condition.compile o, LEVEL_PAREN }) {#{body}}"
if @returns
code += "\n#{@tab}return #{rvar};"
- codeSimple Arithmetic and logical operations. Performs some conversion from + code
Simple Arithmetic and logical operations. Performs some conversion from CoffeeScript operations into their JavaScript equivalents.
exports.Op = class Op extends Base
constructor: (op, first, second, flip) ->
return new In first, second if op is 'in'
- return new Call first, first.params or [] if op is 'do'
+ if op is 'do'
+ call = new Call first, first.params or []
+ call.do = yes
+ return call
if op is 'new'
- return first.newInstance() if first instanceof Call
- first = new Parens first if first instanceof Code and first.bound
+ return first.newInstance() if first instanceof Call and not first.do
+ first = new Parens first if first instanceof Code and first.bound or first.do
@operator = CONVERSIONS[op] or op
@first = first
@second = second
@flip = !!flip
- return thisThe map of conversions from CoffeeScript to JavaScript symbols.
CONVERSIONS =
+ return thisThe map of conversions from CoffeeScript to JavaScript symbols.
CONVERSIONS =
'==': '==='
'!=': '!=='
- 'of': 'in'The map of invertible operators.
INVERSIONS =
+ 'of': 'in'The map of invertible operators.
INVERSIONS =
'!==': '==='
'===': '!=='
@@ -916,7 +941,7 @@
isSimpleNumber: NO
isUnary: ->
- not @secondAm I capable of + not @second
Am I capable of Python-style comparison chaining?
isChainable: ->
@operator in ['<', '>', '>=', '<=', '===', '!==']
@@ -957,7 +982,7 @@
@first.front = @front
code = @first.compile(o, LEVEL_OP) + ' ' + @operator + ' ' +
@second.compile(o, LEVEL_OP)
- if o.level <= LEVEL_OP then code else "(#{code})"Mimic Python's chained comparisons when multiple comparison operators are + if o.level <= LEVEL_OP then code else "(#{code})"
Mimic Python's chained comparisons when multiple comparison operators are used sequentially. For example:
bin/coffee -e 'console.log 50 < 65 > 10'
@@ -970,21 +995,22 @@
compileExistence: (o) ->
if @first.isComplex()
- ref = o.scope.freeVariable 'ref'
- fst = new Parens new Assign new Literal(ref), @first
+ ref = new Literal o.scope.freeVariable 'ref'
+ fst = new Parens new Assign ref, @first
else
fst = @first
- ref = fst.compile o
- new Existence(fst).compile(o) + " ? #{ref} : #{ @second.compile o, LEVEL_LIST }"Compile a unary Op.
compileUnary: (o) ->
+ ref = fst
+ new If(new Existence(fst), ref, type: 'if').addElse(@second).compile oCompile a unary Op.
compileUnary: (o) ->
parts = [op = @operator]
parts.push ' ' if op in ['new', 'typeof', 'delete'] or
op in ['+', '-'] and @first instanceof Op and @first.operator is op
+ @first = new Parens @first if op is 'new' and @first.isStatement o
parts.push @first.compile o, LEVEL_OP
parts.reverse() if @flip
parts.join ''
toString: (idt) ->
- super idt, @constructor.name + ' ' + @operatorexports.In = class In extends Base
+ super idt, @constructor.name + ' ' + @operatorexports.In = class In extends Base
constructor: (@object, @array) ->
children: ['object', 'array']
@@ -1002,6 +1028,7 @@
[cmp, cnj] = if @negated then [' !== ', ' && '] else [' === ', ' || ']
tests = for item, i in @array.base.objects
(if i then ref else sub) + cmp + item.compile o, LEVEL_OP
+ return 'false' if tests.length is 0
tests = tests.join cnj
if o.level < LEVEL_OP then tests else "(#{tests})"
@@ -1014,7 +1041,7 @@
if o.level < LEVEL_LIST then code else "(#{code})"
toString: (idt) ->
- super idt, @constructor.name + if @negated then '!' else ''A classic try/catch/finally block.
exports.Try = class Try extends Base
+ super idt, @constructor.name + if @negated then '!' else ''A classic try/catch/finally block.
exports.Try = class Try extends Base
constructor: (@attempt, @error, @recovery, @ensure) ->
children: ['attempt', 'recovery', 'ensure']
@@ -1026,7 +1053,7 @@
makeReturn: ->
@attempt = @attempt .makeReturn() if @attempt
@recovery = @recovery.makeReturn() if @recovery
- thisCompilation is more or less as you would expect -- the finally clause + this
Compilation is more or less as you would expect -- the finally clause is optional, the catch is not.
compileNode: (o) ->
o.indent += TAB
errorPart = if @error then " (#{ @error.compile o }) " else ' '
@@ -1038,16 +1065,16 @@
#{@tab}try {
#{ @attempt.compile o, LEVEL_TOP }
#{@tab}}#{ catchPart or '' }
- """ + if @ensure then " finally {\n#{ @ensure.compile o, LEVEL_TOP }\n#{@tab}}" else ''Simple node to throw an exception.
exports.Throw = class Throw extends Base
+ """ + if @ensure then " finally {\n#{ @ensure.compile o, LEVEL_TOP }\n#{@tab}}" else ''Simple node to throw an exception.
exports.Throw = class Throw extends Base
constructor: (@expression) ->
children: ['expression']
isStatement: YES
- jumps: NOA Throw is already a return, of sorts...
makeReturn: THIS
+ jumps: NOA Throw is already a return, of sorts...
makeReturn: THIS
compileNode: (o) ->
- @tab + "throw #{ @expression.compile o };"Checks a variable for existence -- not null and not undefined. This is + @tab + "throw #{ @expression.compile o };"
Checks a variable for existence -- not null and not undefined. This is
similar to .nil? in Ruby, and avoids having to consult a JavaScript truth
table.
exports.Existence = class Existence extends Base
constructor: (@expression) ->
@@ -1060,13 +1087,13 @@
code = @expression.compile o, LEVEL_OP
code = if IDENTIFIER.test(code) and not o.scope.check code
if @negated
- "typeof #{code} == \"undefined\" || #{code} === null"
+ "typeof #{code} === \"undefined\" || #{code} === null"
else
- "typeof #{code} != \"undefined\" && #{code} !== null"
+ "typeof #{code} !== \"undefined\" && #{code} !== null"
else
sym = if @negated then '==' else '!='
"#{code} #{sym} null"
- if o.level <= LEVEL_COND then code else "(#{code})"An extra set of parentheses, specified explicitly in the source. At one time + if o.level <= LEVEL_COND then code else "(#{code})"
An extra set of parentheses, specified explicitly in the source. At one time we tried to clean up the results by detecting and removing redundant parentheses, but no longer -- you can put in as many as you please.
@@ -1087,7 +1114,7 @@ code = expr.compile o, LEVEL_PAREN bare = o.level < LEVEL_OP and (expr instanceof Op or expr instanceof Call or (expr instanceof For and expr.returns)) - if bare then code else "(#{code})"CoffeeScript's replacement for the for loop is our array and object + if bare then code else "(#{code})"
CoffeeScript's replacement for the for loop is our array and object comprehensions, that compile into for loops here. They also act as an expression, able to return the result of each filtered iteration.
@@ -1115,7 +1142,7 @@ makeReturn: -> @returns = yes - thisWelcome to the hairiest method in all of CoffeeScript. Handles the inner + this
Welcome to the hairiest method in all of CoffeeScript. Handles the inner loop, filtering, stepping, and result saving for array, object, and range comprehensions. Some of the generated code can be shared in common, and some cannot.
compileNode: (o) ->
@@ -1186,7 +1213,7 @@
args.unshift new Literal 'this'
body.expressions[idx] = new Call base, expr.args
defs += @tab + new Assign(ref, fn).compile(o, LEVEL_TOP) + ';\n'
- defsA JavaScript switch statement. Converts into a returnable expression on-demand.
exports.Switch = class Switch extends Base
+ defsA JavaScript switch statement. Converts into a returnable expression on-demand.
exports.Switch = class Switch extends Base
constructor: (@subject, @cases, @otherwise) ->
children: ['subject', 'cases', 'otherwise']
@@ -1217,7 +1244,7 @@
continue if expr instanceof Return or (expr instanceof Literal and expr.jumps() and expr.value isnt 'debugger')
code += idt2 + 'break;\n'
code += idt1 + "default:\n#{ @otherwise.compile o, LEVEL_TOP }\n" if @otherwise and @otherwise.expressions.length
- code + @tab + '}'If/else statements. Acts as an expression by pushing down requested returns + code + @tab + '}'
If/else statements. Acts as an expression by pushing down requested returns to the last line of each clause.
Single-expression Ifs are compiled into conditional operators if possible, @@ -1231,13 +1258,13 @@ children: ['condition', 'body', 'elseBody'] bodyNode: -> @body?.unwrap() - elseBodyNode: -> @elseBody?.unwrap()
Rewrite a chain of Ifs to add a default case as the final else.
addElse: (elseBody) ->
+ elseBodyNode: -> @elseBody?.unwrap()Rewrite a chain of Ifs to add a default case as the final else.
addElse: (elseBody) ->
if @isChain
@elseBodyNode().addElse elseBody
else
@isChain = elseBody instanceof If
@elseBody = @ensureBlock elseBody
- thisThe If only compiles into a statement if either of its bodies needs + this
The If only compiles into a statement if either of its bodies needs to be a statement. Otherwise a conditional operator is safe.
isStatement: (o) ->
o?.level is LEVEL_TOP or
@bodyNode().isStatement(o) or @elseBodyNode()?.isStatement(o)
@@ -1253,7 +1280,7 @@
this
ensureBlock: (node) ->
- if node instanceof Block then node else new Block [node]Compile the If as a regular if-else statement. Flattened chains + if node instanceof Block then node else new Block [node]
Compile the If as a regular if-else statement. Flattened chains force inner else bodies into statement form.
compileStatement: (o) ->
child = del o, 'chainChild'
cond = @condition.compile o, LEVEL_PAREN
@@ -1268,7 +1295,7 @@
o.chainChild = yes
@elseBody.unwrap().compile o, LEVEL_TOP
else
- "{\n#{ @elseBody.compile o, LEVEL_TOP }\n#{@tab}}"Compile the If as a conditional operator.
compileExpression: (o) ->
+ "{\n#{ @elseBody.compile o, LEVEL_TOP }\n#{@tab}}"Compile the If as a conditional operator.
compileExpression: (o) ->
cond = @condition.compile o, LEVEL_COND
body = @bodyNode().compile o, LEVEL_LIST
alt = if @elseBodyNode() then @elseBodyNode().compile(o, LEVEL_LIST) else 'void 0'
@@ -1276,21 +1303,20 @@
if o.level >= LEVEL_COND then "(#{code})" else code
unfoldSoak: ->
- @soak and thisFaux-nodes are never created by the grammar, but are used during code -generation to generate other combinations of nodes.
The Push creates the tree for array.push(value),
+generation to generate other combinations of nodes.
The Push creates the tree for array.push(value),
which is helpful for recording the result arrays from comprehensions.
Push =
wrap: (name, exps) ->
return exps if exps.isEmpty() or last(exps.expressions).jumps()
- exps.push new Call new Value(new Literal(name), [new Access new Literal 'push']), [exps.pop()]A faux-node used to wrap an expressions body in a closure.
Closure =Wrap the expressions body, unless it contains a pure statement, + exps.push new Call new Value(new Literal(name), [new Access new Literal 'push']), [exps.pop()]
A faux-node used to wrap an expressions body in a closure.
Closure =Wrap the expressions body, unless it contains a pure statement,
in which case, no dice. If the body mentions this or arguments,
then make sure that the closure wrapper preserves the original values.
wrap: (expressions, statement, noReturn) ->
return expressions if expressions.jumps()
func = new Code [], Block.wrap [expressions]
args = []
- if (mentionsArgs = expressions.contains @literalArgs) or
- ( expressions.contains @literalThis)
+ if (mentionsArgs = expressions.contains @literalArgs) or expressions.contains @literalThis
meth = new Literal if mentionsArgs then 'apply' else 'call'
args = [new Literal 'this']
args.push new Literal 'arguments' if mentionsArgs
@@ -1303,11 +1329,11 @@
node instanceof Literal and node.value is 'arguments' and not node.asKey
literalThis: (node) ->
(node instanceof Literal and node.value is 'this' and not node.asKey) or
- (node instanceof Code and node.bound)Unfold a node's child if soak, then tuck the node under created If
unfoldSoak = (o, parent, name) ->
+ (node instanceof Code and node.bound)Unfold a node's child if soak, then tuck the node under created If
unfoldSoak = (o, parent, name) ->
return unless ifn = parent[name].unfoldSoak o
parent[name] = ifn.body
ifn.body = new Value parent
- ifnUTILITIES =Correctly set up a prototype chain for inheritance, including a reference + ifn
UTILITIES =Correctly set up a prototype chain for inheritance, including a reference
to the superclass for super() calls, and copies of any static properties.
extends: '''
function(child, parent) {
for (var key in parent) { if (__hasProp.call(parent, key)) child[key] = parent[key]; }
@@ -1317,24 +1343,23 @@
child.__super__ = parent.prototype;
return child;
}
- '''Create a function bound to the current value of "this".
bind: '''
+ '''Create a function bound to the current value of "this".
bind: '''
function(fn, me){ return function(){ return fn.apply(me, arguments); }; }
- '''Discover if an item is in an array.
indexOf: '''
+ '''Discover if an item is in an array.
indexOf: '''
Array.prototype.indexOf || function(item) {
for (var i = 0, l = this.length; i < l; i++) {
if (this[i] === item) return i;
}
return -1;
}
- '''Shortcuts to speed up the lookup time for native functions.
hasProp: 'Object.prototype.hasOwnProperty'
- slice : 'Array.prototype.slice'Levels indicates a node's position in the AST. Useful for knowing if + '''
Shortcuts to speed up the lookup time for native functions.
hasProp: 'Object.prototype.hasOwnProperty'
+ slice : 'Array.prototype.slice'Levels indicates a node's position in the AST. Useful for knowing if parens are necessary or superfluous.
LEVEL_TOP = 1 # ...;
LEVEL_PAREN = 2 # (...)
LEVEL_LIST = 3 # [...]
LEVEL_COND = 4 # ... ? x : y
LEVEL_OP = 5 # !...
-LEVEL_ACCESS = 6 # ...[0]Tabs are two spaces for pretty printing.
TAB = ' 'Trim out all trailing whitespace, so that the generated code plays nice -with Git.
TRAILING_WHITESPACE = /[ \t]+$/gm
+LEVEL_ACCESS = 6 # ...[0]Tabs are two spaces for pretty printing.
TAB = ' '
IDENTIFIER = /^[$A-Za-z_\x7f-\uffff][$\w\x7f-\uffff]*$/
SIMPLENUM = /^[+-]?\d+$/Is a literal value a string?
IS_STRING = /^['"]/Helper for ensuring that utility functions are assigned at the top level.
utility = (name) ->
diff --git a/documentation/docs/repl.html b/documentation/docs/repl.html
index 855fcc196f..5e5a484245 100644
--- a/documentation/docs/repl.html
+++ b/documentation/docs/repl.html
@@ -4,22 +4,57 @@
coffee> console.log "#{num} bottles of beer" for num in [99..1]
Require the coffee-script module to get access to the compiler.
CoffeeScript = require './coffee-script'
-helpers = require './helpers'
-readline = require 'readline'Start by opening up stdin and stdout.
stdin = process.openStdin()
-stdout = process.stdoutLog an error.
error = (err) ->
- stdout.write (err.stack or err.toString()) + '\n\n'Quick alias for quitting the REPL.
helpers.extend global, quit: -> process.exit(0)The main REPL function. run is called every time a line of code is entered. +readline = require 'readline' +{inspect} = require 'util' +{Script} = require 'vm'
REPL Setup
Config
enableColours = no
+unless process.platform is 'win32'
+ enableColours = not process.env.NODE_DISABLE_COLORSStart by opening up stdin and stdout.
stdin = process.openStdin()
+stdout = process.stdoutLog an error.
error = (err) ->
+ stdout.write (err.stack or err.toString()) + '\n\n'The current backlog of multi-line code.
backlog = ''The main REPL function. run is called every time a line of code is entered. Attempt to evaluate the command. If there's an exception, print it out instead -of exiting.
run = (buffer) ->
- try
- val = CoffeeScript.eval buffer.toString(), bare: on, globals: on, filename: 'repl'
- process.stdout.write val + '\n' if val isnt undefined
- catch err
- error err
- repl.prompt()Make sure that uncaught exceptions don't kill the REPL.
process.on 'uncaughtException', errorCreate the REPL by listening to stdin.
if readline.createInterface.length < 3
- repl = readline.createInterface stdin
+of exiting. run = do ->
+ sandbox =
+ require: require
+ module : { exports: {} }
+ sandbox[g] = global[g] for g of global
+ sandbox.global = sandbox
+ sandbox.global.global = sandbox.global.root = sandbox.global.GLOBAL = sandbox
+ (buffer) ->
+ code = backlog += '\n' + buffer.toString()
+ if code[code.length - 1] is '\\'
+ return backlog = backlog[0...backlog.length - 1]
+ backlog = ''
+ try
+ val = CoffeeScript.eval code, {
+ sandbox,
+ bare: on,
+ filename: 'repl'
+ }
+ unless val is undefined
+ process.stdout.write inspect(val, no, 2, enableColours) + '\n'
+ catch err
+ error err
+ repl.prompt()Regexes to match complete-able bits of text.
ACCESSOR = /\s*([\w\.]+)(?:\.(\w*))$/
+SIMPLEVAR = /\s*(\w*)$/iReturns a list of completions, and the completed text.
autocomplete = (text) ->
+ completeAttribute(text) or completeVariable(text) or [[], text]Attempt to autocomplete a chained dotted attribute: one.two.three.
completeAttribute = (text) ->
+ if match = text.match ACCESSOR
+ [all, obj, prefix] = match
+ try
+ val = Script.runInThisContext obj
+ catch error
+ return [[], text]
+ completions = getCompletions prefix, getPropertyNames val
+ [completions, prefix]Attempt to autocomplete an in-scope free variable: one.
completeVariable = (text) ->
+ if free = text.match(SIMPLEVAR)?[1]
+ scope = Script.runInThisContext 'this'
+ completions = getCompletions free, CoffeeScript.RESERVED.concat(getPropertyNames scope)
+ [completions, free]Return elements of candidates for which prefix is a prefix.
getCompletions = (prefix, candidates) ->
+ (el for el in candidates when el.indexOf(prefix) is 0)Return all "own" properties of an object.
getPropertyNames = (obj) ->
+ (name for own name of obj)Make sure that uncaught exceptions don't kill the REPL.
process.on 'uncaughtException', errorCreate the REPL by listening to stdin.
if readline.createInterface.length < 3
+ repl = readline.createInterface stdin, autocomplete
stdin.on 'data', (buffer) -> repl.write buffer
else
- repl = readline.createInterface stdin, stdout
+ repl = readline.createInterface stdin, stdout, autocomplete
repl.setPrompt 'coffee> '
repl.on 'close', -> stdin.destroy()
diff --git a/documentation/docs/rewriter.html b/documentation/docs/rewriter.html
index 7336e64405..b3818b16ea 100644
--- a/documentation/docs/rewriter.html
+++ b/documentation/docs/rewriter.html
@@ -78,7 +78,10 @@
not (two?[0] is ':' or one?[0] is '@' and three?[0] is ':')) or
(tag is ',' and one and
one[0] not in ['IDENTIFIER', 'NUMBER', 'STRING', '@', 'TERMINATOR', 'OUTDENT'])
- action = (token, i) -> @tokens.splice i, 0, ['}', '}', token[2]]
+ action = (token, i) ->
+ tok = ['}', '}', token[2]]
+ tok.generated = yes
+ @tokens.splice i, 0, tok
@scanTokens (token, i, tokens) ->
if (tag = token[0]) in EXPRESSION_START
stack.push [(if tag is 'INDENT' and @tag(i - 1) is '{' then '{' else tag), i]
@@ -114,6 +117,7 @@
seenSingle = no
noCall = no if tag in LINEBREAKS
token.call = yes if prev and not prev.spaced and tag is '?'
+ return 1 if token.fromThen
return 1 unless callObject or
prev?.spaced and (prev.call or prev[0] in IMPLICIT_FUNC) and
(tag in IMPLICIT_CALL or not (token.spaced or token.newLine) and tag in IMPLICIT_UNSPACED_CALL)
diff --git a/documentation/docs/scope.html b/documentation/docs/scope.html
index ca55bdc5d4..f8a84af429 100644
--- a/documentation/docs/scope.html
+++ b/documentation/docs/scope.html
@@ -8,7 +8,7 @@
exports.Scope = class ScopeThe top-level Scope object.
@root: nullInitialize a scope with its parent, for lookups up the chain, as well as a reference to the Block node is belongs to, which is where it should declare its variables, and a reference to the function that -it wraps.
constructor:(@parent, @expressions, @method) ->
+it wraps. constructor: (@parent, @expressions, @method) ->
@variables = [{name: 'arguments', type: 'arguments'}]
@positions = {}
Scope.root = this unless @parentAdds a new variable or overrides an existing one.
add: (name, type, immediate) ->
@@ -36,7 +36,7 @@
nullIf we need to store an intermediate result, find an available name for a
compiler-generated variable. _var, _var2, and so on...
freeVariable: (type) ->
index = 0
- index++ while @check((temp = @temporary type, index), true)
+ index++ while @check((temp = @temporary type, index))
@add temp, 'var', yes
tempEnsure that an assignment is made at the top of this scope (or at the top-level scope, if requested).
-j, --join-j, --join [FILE]+ 1.1.0 + + + When running via coffee executable, process.argv and + friends now report coffee instead of node. + Better compatibility with Node.js 0.4.x module lookup changes. + The output in the REPL is now colorized, like Node's is. + Giving your concatenated CoffeeScripts a name when using --join is now mandatory. + Fix for lexing compound division /= as a regex accidentally. + All text/coffeescript tags should now execute in the order they're included. + Fixed an issue with extended subclasses using external constructor functions. + Fixed an edge-case infinite loop in addImplicitParentheses. + Fixed exponential slowdown with long chains of function calls. + Globals no longer leak into the CoffeeScript REPL. + Function calls can be used as default values for parameters. + Splatted parameters are declared local to the function. +
1.0.1
diff --git a/documentation/js/block_comment.js b/documentation/js/block_comment.js
index b0b652cedd..001ffc0b35 100644
--- a/documentation/js/block_comment.js
+++ b/documentation/js/block_comment.js
@@ -1,4 +1,4 @@
/*
-CoffeeScript Compiler v1.0.1
+CoffeeScript Compiler v1.1.0
Released under the MIT License
*/
\ No newline at end of file
diff --git a/documentation/js/existence.js b/documentation/js/existence.js
index 9acfe391e4..a805e2b820 100644
--- a/documentation/js/existence.js
+++ b/documentation/js/existence.js
@@ -1,10 +1,10 @@
var footprints, solipsism;
-if ((typeof mind != "undefined" && mind !== null) && !(typeof world != "undefined" && world !== null)) {
+if ((typeof mind !== "undefined" && mind !== null) && !(typeof world !== "undefined" && world !== null)) {
solipsism = true;
}
-if (typeof speed != "undefined" && speed !== null) {
+if (typeof speed !== "undefined" && speed !== null) {
speed;
} else {
speed = 75;
};
-footprints = typeof yeti != "undefined" && yeti !== null ? yeti : "bear";
\ No newline at end of file
+footprints = typeof yeti !== "undefined" && yeti !== null ? yeti : "bear";
\ No newline at end of file
diff --git a/documentation/js/overview.js b/documentation/js/overview.js
index 9d51f2ff97..745862fcff 100644
--- a/documentation/js/overview.js
+++ b/documentation/js/overview.js
@@ -21,7 +21,7 @@ race = function() {
winner = arguments[0], runners = 2 <= arguments.length ? __slice.call(arguments, 1) : [];
return print(winner, runners);
};
-if (typeof elvis != "undefined" && elvis !== null) {
+if (typeof elvis !== "undefined" && elvis !== null) {
alert("I knew it!");
}
cubes = (function() {
diff --git a/documentation/js/soaks.js b/documentation/js/soaks.js
index 39d37bda63..f25d85d5c3 100644
--- a/documentation/js/soaks.js
+++ b/documentation/js/soaks.js
@@ -1,2 +1,2 @@
var zip, _ref;
-zip = typeof lottery.drawWinner == "function" ? (_ref = lottery.drawWinner().address) != null ? _ref.zipcode : void 0 : void 0;
\ No newline at end of file
+zip = typeof lottery.drawWinner === "function" ? (_ref = lottery.drawWinner().address) != null ? _ref.zipcode : void 0 : void 0;
\ No newline at end of file
diff --git a/extras/coffee-script.js b/extras/coffee-script.js
index ad3cd8cac4..97282ac471 100644
--- a/extras/coffee-script.js
+++ b/extras/coffee-script.js
@@ -1,8 +1,8 @@
/**
- * CoffeeScript Compiler v1.1.0-pre
+ * CoffeeScript Compiler v1.1.0
* http://coffeescript.org
*
* Copyright 2011, Jeremy Ashkenas
* Released under the MIT License
*/
-this.CoffeeScript=function(){function require(a){return require[a]}require["./helpers"]=new function(){var a=this;(function(){var b,c;a.starts=function(a,b,c){return b===a.substr(c,b.length)},a.ends=function(a,b,c){var d;d=b.length;return b===a.substr(a.length-d-(c||0),d)},a.compact=function(a){var b,c,d,e;e=[];for(c=0,d=a.length;c
-npm install coffee-script- -
- If you'd prefer to install the latest master version of CoffeeScript, you - can clone the CoffeeScript - source repository - from GitHub, or download - the source directly. - To install the CoffeeScript compiler system-wide - under /usr/local, open the directory and run: -
+npm install -g coffee-script + ++ (Leave off the -g if you don't wish to install globally.) +
+ ++ If you'd prefer to install the latest master version of CoffeeScript, you + can clone the CoffeeScript + source repository + from GitHub, or download + the source directly. + To install the CoffeeScript compiler system-wide + under /usr/local, open the directory and run: +
sudo bin/cake install@@ -294,10 +298,11 @@
-j, --join-j, --join [FILE]numbers = [0, 1, 2, 3, 4, 5, 6, 7, 8, 9] @@ -1201,25 +1206,25 @@
var footprints, solipsism; -if ((typeof mind != "undefined" && mind !== null) && !(typeof world != "undefined" && world !== null)) { +if ((typeof mind !== "undefined" && mind !== null) && !(typeof world !== "undefined" && world !== null)) { solipsism = true; } -if (typeof speed != "undefined" && speed !== null) { +if (typeof speed !== "undefined" && speed !== null) { speed; } else { speed = 75; }; -footprints = typeof yeti != "undefined" && yeti !== null ? yeti : "bear"; +footprints = typeof yeti !== "undefined" && yeti !== null ? yeti : "bear";
The accessor variant of the existential operator ?. can be used to soak up null references in a chain of properties. Use it instead @@ -1230,7 +1235,7 @@
zip = lottery.drawWinner?().address?.zipcode
var zip, _ref; -zip = typeof lottery.drawWinner == "function" ? (_ref = lottery.drawWinner().address) != null ? _ref.zipcode : void 0 : void 0; +zip = typeof lottery.drawWinner === "function" ? (_ref = lottery.drawWinner().address) != null ? _ref.zipcode : void 0 : void 0;
Soaking up nulls is similar to Ruby's @@ -1261,8 +1266,7 @@
- Constructor functions are named, to better support reflection. In the - example below for the first class, this.constructor.name is "Animal". + Constructor functions are named, to better support helpful stack traces.
class Animal constructor: (@name) -> @@ -1380,8 +1384,9 @@
If structuring your prototypes classically isn't your cup of tea, CoffeeScript provides a couple of lower-level conveniences. The extends operator - helps with proper prototype setup, :: gives you - quick access to an object's prototype, and super() + helps with proper prototype setup, and can be used to create an inheritance + chain between any pair of constructor functions; :: gives you + quick access to an object's prototype; and super() is converted into a call against the immediate ancestor's method of the same name.
String::dasherize = -> @@ -1716,20 +1721,20 @@
Sometimes you'd like to pass a block comment through to the generated JavaScript. For example, when you need to embed a licensing header at - the top of a file. Block comments, which mirror the synax for heredocs, + the top of a file. Block comments, which mirror the syntax for heredocs, are preserved in the generated code.
+### -CoffeeScript Compiler v1.0.1 +CoffeeScript Compiler v1.1.0 Released under the MIT License ###/* -CoffeeScript Compiler v1.0.1 +CoffeeScript Compiler v1.1.0 Released under the MIT License */ -@@ -1930,6 +1935,25 @@
Change Log
+ ++ 1.1.0 + + + When running via coffee executable, process.argv and + friends now report coffee instead of node. + Better compatibility with Node.js 0.4.x module lookup changes. + The output in the REPL is now colorized, like Node's is. + Giving your concatenated CoffeeScripts a name when using --join is now mandatory. + Fix for lexing compound division /= as a regex accidentally. + All text/coffeescript tags should now execute in the order they're included. + Fixed an issue with extended subclasses using external constructor functions. + Fixed an edge-case infinite loop in addImplicitParentheses. + Fixed exponential slowdown with long chains of function calls. + Globals no longer leak into the CoffeeScript REPL. + Function calls can be used as default values for parameters. + Splatted parameters are declared local to the function. +
1.0.1 diff --git a/lib/coffee-script.js b/lib/coffee-script.js index cafc009445..926157bde8 100755 --- a/lib/coffee-script.js +++ b/lib/coffee-script.js @@ -18,7 +18,7 @@ return compile(content); }); } - exports.VERSION = '1.1.0-pre'; + exports.VERSION = '1.1.0'; exports.RESERVED = RESERVED; exports.helpers = require('./helpers'); exports.compile = compile = function(code, options) { diff --git a/package.json b/package.json index 66f4942af5..7c00ed0c73 100644 --- a/package.json +++ b/package.json @@ -3,7 +3,7 @@ "description": "Unfancy JavaScript", "keywords": ["javascript", "language", "coffeescript", "compiler"], "author": "Jeremy Ashkenas", - "version": "1.1.0-pre", + "version": "1.1.0", "licenses": [{ "type": "MIT", "url": "http://github.com/jashkenas/coffee-script/raw/master/LICENSE" diff --git a/src/coffee-script.coffee b/src/coffee-script.coffee index 453dfa9cd4..01a6dd0027 100755 --- a/src/coffee-script.coffee +++ b/src/coffee-script.coffee @@ -21,7 +21,7 @@ else if require.registerExtension require.registerExtension '.coffee', (content) -> compile content # The current CoffeeScript version number. -exports.VERSION = '1.1.0-pre' +exports.VERSION = '1.1.0' # Words that cannot be used as identifiers in CoffeeScript code exports.RESERVED = RESERVED