kotovalexarian-likes-github
/
jashkenas--coffeescript
mirror of https://github.com/jashkenas/coffeescript.git
1
0
Fork 0
Code Releases Activity

Early exit + refactor findExtension

This commit is contained in:
Sam Gentle 2013-05-26 02:17:24 +10:00
parent e7d01b903f
commit 30b2af820a
2 changed files with 41 additions and 44 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

49
lib/coffee-script/coffee-script.js
View File

@ -188,32 +188,31 @@
(function(module) {
var NATIVELOAD, findExtension;
NATIVELOAD = "function(filename){debug('load'+JSON.stringify(filename)+'formodule'+JSON.stringify(this.id));assert(!this.loaded);this.filename=filename;this.paths=Module._nodeModulePaths(path.dirname(filename));varextension=path.extname(filename)||'.js';if(!Module._extensions[extension])extension='.js';Module._extensions[extension](this,filename);this.loaded=true;}";
if (module.prototype.load.toString().replace(/\s+/g, "") === NATIVELOAD) {
findExtension = function(filename) {
var curExtension, extension, extensions;
extension = null;
extensions = path.basename(filename).split('.');
if (extensions[0] === '') {
extensions.shift();
}
while (extensions.shift()) {
curExtension = '.' + extensions.join('.');
if (module._extensions[curExtension]) {
extension = curExtension;
break;
}
}
return extension || '.js';
};
return module.prototype.load = function(filename) {
var extension;
this.filename = filename;
this.paths = module._nodeModulePaths(path.dirname(filename));
extension = findExtension(filename);
module._extensions[extension](this, filename);
return this.loaded = true;
};
if (module.prototype.load.toString().replace(/\s+/g, "") !== NATIVELOAD) {
return;
}
findExtension = function(filename) {
var curExtension, extensions;
extensions = path.basename(filename).split('.');
if (extensions[0] === '') {
extensions.shift();
}
while (extensions.shift()) {
curExtension = '.' + extensions.join('.');
if (module._extensions[curExtension]) {
return curExtension;
}
}
return '.js';
};
return module.prototype.load = function(filename) {
var extension;
this.filename = filename;
this.paths = module._nodeModulePaths(path.dirname(filename));
extension = findExtension(filename);
module._extensions[extension](this, filename);
return this.loaded = true;
};
})(require('module'));
}

36
src/coffee-script.coffee
View File

@ -159,30 +159,28 @@ if require.extensions
NATIVELOAD = "function(filename){debug('load'+JSON.stringify(filename)+'formodule'+JSON.stringify(this.id));assert(!this.loaded);this.filename=filename;this.paths=Module._nodeModulePaths(path.dirname(filename));varextension=path.extname(filename)||'.js';if(!Module._extensions[extension])extension='.js';Module._extensions[extension](this,filename);this.loaded=true;}"
# Only keep going if we're sure module.prototype.load is what we expect
if module.prototype.load.toString().replace(/\s+/g, "") is NATIVELOAD
findExtension = (filename) ->
extension = null
extensions = path.basename(filename).split '.'
return unless module::load.toString().replace(/\s+/g, "") is NATIVELOAD
# Remove initial dot from dotfiles
extensions.shift() if extensions[0] is ''
findExtension = (filename) ->
extensions = path.basename(filename).split '.'
# Start with the longest extension and work our way shortwards
while extensions.shift()
curExtension = '.' + extensions.join '.'
if module._extensions[curExtension]
extension = curExtension
break
# Remove initial dot from dotfiles
extensions.shift() if extensions[0] is ''
return extension || '.js'
# Start with the longest extension and work our way shortwards
while extensions.shift()
curExtension = '.' + extensions.join '.'
return curExtension if module._extensions[curExtension]
module.prototype.load = (filename) ->
@filename = filename
@paths = module._nodeModulePaths path.dirname filename
'.js'
extension = findExtension filename
module._extensions[extension](this, filename)
@loaded = true
module::load = (filename) ->
@filename = filename
@paths = module._nodeModulePaths path.dirname filename
extension = findExtension filename
module._extensions[extension](this, filename)
@loaded = true
# If we're on Node, patch `child_process.fork` so that Coffee scripts are able