Issue #559, renaming {source} option to {fileName}, on CoffeeScript.compile

This commit is contained in:
Jeremy Ashkenas 2010-07-30 20:37:12 -04:00
parent ebad1ec552
commit 071b527b66
10 changed files with 18 additions and 18 deletions

View File

@ -111,10 +111,10 @@ task 'test', 'run the CoffeeScript language test suite', ->
fs.readdir 'test', (err, files) ->
files.forEach (file) ->
return unless file.match(/\.coffee$/i)
source = path.join 'test', file
fs.readFile source, (err, code) ->
fileName = path.join 'test', file
fs.readFile fileName, (err, code) ->
try
CoffeeScript.run code.toString(), {source: source}
CoffeeScript.run code.toString(), {fileName}
catch err
failedTests += 1
log "failed #source", red, '\n' + err.stack.toString()
log "failed #fileName", red, '\n' + err.stack.toString()

View File

@ -41,7 +41,7 @@
}
args = process.argv.slice(2, process.argv.length);
CoffeeScript.run(fs.readFileSync('Cakefile').toString(), {
source: 'Cakefile'
fileName: 'Cakefile'
});
oparse = new optparse.OptionParser(switches);
if (!(args.length)) {

View File

@ -22,8 +22,8 @@
try {
return (parser.parse(lexer.tokenize(code))).compile(options);
} catch (err) {
if (options.source) {
err.message = ("In " + options.source + ", " + err.message);
if (options.fileName) {
err.message = ("In " + options.fileName + ", " + err.message);
}
throw err;
}
@ -36,7 +36,7 @@
};
exports.run = (function(code, options) {
var __dirname, __filename;
module.filename = (__filename = options.source);
module.filename = (__filename = options.fileName);
__dirname = path.dirname(__filename);
return eval(exports.compile(code, options));
});

View File

@ -197,10 +197,10 @@
options.print = !!(o.print || (o.eval || o.stdio && o.compile));
return (sources = options.arguments);
};
compileOptions = function(source) {
compileOptions = function(fileName) {
var o;
o = {
source: source
fileName: fileName
};
o.noWrap = options['no-wrap'];
return o;

View File

@ -15,7 +15,7 @@
val = CoffeeScript.run(buffer.toString(), {
noWrap: true,
globals: true,
source: 'repl'
fileName: 'repl'
});
if (val !== undefined) {
puts(inspect(val));

View File

@ -47,7 +47,7 @@ exports.run = ->
path.exists 'Cakefile', (exists) ->
throw new Error("Cakefile not found in #{process.cwd()}") unless exists
args = process.argv[2...process.argv.length]
CoffeeScript.run fs.readFileSync('Cakefile').toString(), source: 'Cakefile'
CoffeeScript.run fs.readFileSync('Cakefile').toString(), fileName: 'Cakefile'
oparse = new optparse.OptionParser switches
return printTasks() unless args.length
options = oparse.parse(args)

View File

@ -34,7 +34,7 @@ exports.compile = compile = (code, options) ->
try
(parser.parse lexer.tokenize code).compile options
catch err
err.message = "In #options.source, #err.message" if options.source
err.message = "In #options.fileName, #err.message" if options.fileName
throw err
# Tokenize a string of CoffeeScript code, and return the array of tokens.
@ -50,7 +50,7 @@ exports.nodes = (code) ->
# Compile and execute a string of CoffeeScript (on the server), correctly
# setting `__filename`, `__dirname`, and relative `require()`.
exports.run = ((code, options) ->
module.filename = __filename = options.source
module.filename = __filename = options.fileName
__dirname = path.dirname __filename
eval exports.compile code, options
)

View File

@ -162,8 +162,8 @@ parseOptions = ->
sources = options.arguments
# The compile-time options to pass to the CoffeeScript compiler.
compileOptions = (source) ->
o = {source}
compileOptions = (fileName) ->
o = {fileName}
o.noWrap = options['no-wrap']
o

View File

@ -20,7 +20,7 @@ helpers.extend global, quit: -> process.exit(0)
# of exiting.
run = (buffer) ->
try
val = CoffeeScript.run buffer.toString(), noWrap: true, globals: true, source: 'repl'
val = CoffeeScript.run buffer.toString(), noWrap: true, globals: true, fileName: 'repl'
puts inspect val if val isnt undefined
catch err
puts err.stack or err.toString()

View File

@ -8,7 +8,7 @@ ok js is "one;\ntwo;"
global.resultArray = []
CoffeeScript.run("resultArray.push i for i of global", {noWrap: on, globals: on, source: 'tests'})
CoffeeScript.run("resultArray.push i for i of global", {noWrap: on, globals: on, fileName: 'tests'})
ok 'setInterval' in global.resultArray