Skip to content

Commit

Permalink
fixed require for new windows version
Browse files Browse the repository at this point in the history
  • Loading branch information
@bjouhier
bjouhier committed Sep 5, 2011
1 parent ff46d6c commit a9f606e
Show file tree
Hide file tree
Showing 3 changed files with 28 additions and 22 deletions.
6 changes: 4 additions & 2 deletions lib/require/client/require.js
View file
Expand Up @@ -58,10 +58,12 @@
if (sep < 0)
return callback(new Error("empty line missing"));
var headers = {};
part.substring(0, sep).split('\n').forEach(function(line){
var lines = part.substring(0, sep).split('\n');
for(var j = 0; j < lines.length; j++) {
var line = lines[j];
var pair = line.split(': ');
headers[pair[0]] = pair[1];
});
}
var body = part.substring(sep + 2);
var id = headers["Content-ID"];
if (id == "ERROR")
Expand Down
36 changes: 19 additions & 17 deletions lib/require/server/depend.js
View file
@@ -1,4 +1,4 @@
/*** Generated by streamline 0.1.40 - DO NOT EDIT ***/ "use strict"; var __g=typeof global!=='undefined'?global:window;__g=(__g.__streamline||(__g.__streamline={}));__g.setEF=__g.setEF||function(e,f){e.__frame = e.__frame||f};var __srcName='../streamline/lib/require/server/depend_.js'; function __func(_, __this, __arguments, fn, index, frame, body){ if (!_) { return __future.call(__this, fn, __arguments, index); } frame.file = __srcName; frame.prev = __g.frame; __g.frame = frame; try { body(); } catch (e) { __g.setEF(e, frame.prev); __propagate(_, e); } finally { __g.frame = frame.prev; } } function __cb(_, frame, offset, col, fn){ frame.offset = offset; frame.col = col; var ctx = __g.context; return function ___(err, result){ var oldFrame = __g.frame; __g.frame = frame; __g.context = ctx; try { if (err) { __g.setEF(err, frame); return _(err); } return fn(null, result); } catch (ex) { __g.setEF(ex, frame); return __propagate(_, ex); } finally { __g.frame = oldFrame; } } } function __future(fn, args, i){ var done, err, result; var cb = function(e, r){ done = true; err = e, result = r; }; args = Array.prototype.slice.call(args); args[i] = function ___(e, r){ cb(e, r); }; fn.apply(this, args); return function ___(_){ if (done) _.call(this, err, result); else cb = _.bind(this); } .bind(this); } function __propagate(_, err){ try { _(err); } catch (ex) { __trap(ex); } } function __trap(err){ if (err) { if (__g.context && __g.context.errorHandler) __g.context.errorHandler(err); else console.error("UNCAUGHT EXCEPTION: " + err.message + "\n" + err.stack); } } var fs = require("fs");
/*** Generated by streamline 0.1.40 - DO NOT EDIT ***/ "use strict"; var __g=typeof global!=='undefined'?global:window;__g=(__g.__streamline||(__g.__streamline={}));__g.setEF=__g.setEF||function(e,f){e.__frame = e.__frame||f};var __srcName='C:\cygwin\home\CRNIT\syracuse\syracuse\node_modules\streamline\lib\require\server\depend_.js'; function __func(_, __this, __arguments, fn, index, frame, body){ if (!_) { return __future.call(__this, fn, __arguments, index); } frame.file = __srcName; frame.prev = __g.frame; __g.frame = frame; try { body(); } catch (e) { __g.setEF(e, frame.prev); __propagate(_, e); } finally { __g.frame = frame.prev; } } function __cb(_, frame, offset, col, fn){ frame.offset = offset; frame.col = col; var ctx = __g.context; return function ___(err, result){ var oldFrame = __g.frame; __g.frame = frame; __g.context = ctx; try { if (err) { __g.setEF(err, frame); return _(err); } return fn(null, result); } catch (ex) { __g.setEF(ex, frame); return __propagate(_, ex); } finally { __g.frame = oldFrame; } } } function __future(fn, args, i){ var done, err, result; var cb = function(e, r){ done = true; err = e, result = r; }; args = Array.prototype.slice.call(args); args[i] = function ___(e, r){ cb(e, r); }; fn.apply(this, args); return function ___(_){ if (done) _.call(this, err, result); else cb = _.bind(this); } .bind(this); } function __propagate(_, err){ try { _(err); } catch (ex) { __trap(ex); } } function __trap(err){ if (err) { if (__g.context && __g.context.errorHandler) __g.context.errorHandler(err); else console.error("UNCAUGHT EXCEPTION: " + err.message + "\n" + err.stack); } } var fs = require("fs");



Expand All @@ -20,11 +20,13 @@ function _exists(callback, path) {
return callback(null, result); });};


function _normalize(path) {
return path.replace(/\\/g, "/");};

function _findModulesDir(_) { var dir; var __frame = { name: "_findModulesDir", line: 24 }; return __func(_, this, arguments, _findModulesDir, 0, __frame, function __$_findModulesDir() {
function _findModulesDir(_) { var dir; var __frame = { name: "_findModulesDir", line: 26 }; return __func(_, this, arguments, _findModulesDir, 0, __frame, function __$_findModulesDir() {
if (modulesDir) {
return _(null, modulesDir); } ;
dir = __dirname; var __3 = false; return (function ___(__break) { var __more; var __loop = __cb(_, __frame, 0, 0, function __$_findModulesDir() { __more = false; if (__3) { dir = dir.substring(0, dir.lastIndexOf("/")); } else { __3 = true; } ; var __2 = (dir.length > 0); if (__2) {
dir = _normalize(__dirname); var __3 = false; return (function ___(__break) { var __more; var __loop = __cb(_, __frame, 0, 0, function __$_findModulesDir() { __more = false; if (__3) { dir = dir.substring(0, dir.lastIndexOf("/")); } else { __3 = true; } ; var __2 = (dir.length > 0); if (__2) {
return _exists(__cb(_, __frame, 4, 6, function ___(__0, __1) { return (function __$_findModulesDir(__then) { if (__1) {
modulesDir = (dir + "/node_modules");
return _(null, modulesDir); } else { __then(); } ; })(function __$_findModulesDir() { while (__more) { __loop(); }; __more = true; }); }), (dir + "/node_modules")); } else { __break(); } ; }); do { __loop(); } while (__more); __more = true; })(function __$_findModulesDir() {
Expand Down Expand Up @@ -70,12 +72,12 @@ exports.etag = function() {

function _watch(file) {
if (!_watched[file]) {
_watched[file] = true;
fs.watchFile(file, _watcher); };};
_watched[file] = true; };};



function _loadFile(_, path) { var js, js_; var __frame = { name: "_loadFile", line: 78 }; return __func(_, this, arguments, _loadFile, 0, __frame, function __$_loadFile() {

function _loadFile(_, path) { var js, js_; var __frame = { name: "_loadFile", line: 80 }; return __func(_, this, arguments, _loadFile, 0, __frame, function __$_loadFile() {
js = (path + ".js");
js_ = (path + "_.js");
return _exists(__cb(_, __frame, 3, 5, function ___(__0, __1) { return (function __$_loadFile(__then) { if (__1) {
Expand All @@ -88,8 +90,8 @@ function _loadFile(_, path) { var js, js_; var __frame = { name: "_loadFile", li
return _(new Error(("invalid require path: " + path))); } ; })(__then); }), js); } ; })(_); }), js_); });};


function _extendPath(_, path) { var __frame = { name: "_extendPath", line: 91 }; return __func(_, this, arguments, _extendPath, 0, __frame, function __$_extendPath() { return (function __$_extendPath(_) { return (function __$_extendPath(_) {
return _exists(__cb(_, __frame, 1, 6, function ___(__0, __3) { var __2 = !__3; var __4 = !__2; return (function __$_extendPath(__then) { if (__4) { var __5 = __2; return _(null, __5); } else { __then(); } ; })(function __$_extendPath() { return _exists(__cb(_, __frame, 1, 34, _), path); }); }), (path + ".js")); })(__cb(_, __frame, -83, 12, function ___(__0, __1) { var __3 = !__1; return (function __$_extendPath(__then) { if (__3) { var __4 = __1; return _(null, __4); } else { __then(); } ; })(function __$_extendPath() { return fs.stat(path, __cb(_, __frame, 1, 54, function ___(__0, __6) { var __5 = __6.isDirectory(); return _(null, __5); })); }); })); })(__cb(_, __frame, -83, 12, function ___(__0, __2) { return (function __$_extendPath(__then) { if (__2) {
function _extendPath(_, path) { var __frame = { name: "_extendPath", line: 93 }; return __func(_, this, arguments, _extendPath, 0, __frame, function __$_extendPath() { return (function __$_extendPath(_) { return (function __$_extendPath(_) {
return _exists(__cb(_, __frame, 1, 6, function ___(__0, __3) { var __2 = !__3; var __4 = !__2; return (function __$_extendPath(__then) { if (__4) { var __5 = __2; return _(null, __5); } else { __then(); } ; })(function __$_extendPath() { return _exists(__cb(_, __frame, 1, 34, _), path); }); }), (path + ".js")); })(__cb(_, __frame, -85, 12, function ___(__0, __1) { var __3 = !__1; return (function __$_extendPath(__then) { if (__3) { var __4 = __1; return _(null, __4); } else { __then(); } ; })(function __$_extendPath() { return fs.stat(path, __cb(_, __frame, 1, 54, function ___(__0, __6) { var __5 = __6.isDirectory(); return _(null, __5); })); }); })); })(__cb(_, __frame, -85, 12, function ___(__0, __2) { return (function __$_extendPath(__then) { if (__2) {

return _exists(__cb(_, __frame, 3, 6, function ___(__0, __3) { return (function __$_extendPath(__then) { if (__3) {
return _(null, (path + "/main")); } else {
Expand All @@ -101,7 +103,7 @@ function _extendPath(_, path) { var __frame = { name: "_extendPath", line: 91 };



function _directDependencies(_, path) { var result, str, match; var __frame = { name: "_directDependencies", line: 104 }; return __func(_, this, arguments, _directDependencies, 0, __frame, function __$_directDependencies() {
function _directDependencies(_, path) { var result, str, match; var __frame = { name: "_directDependencies", line: 106 }; return __func(_, this, arguments, _directDependencies, 0, __frame, function __$_directDependencies() {
if (dependencies[path]) {
return _(null, dependencies[path]); } ;
return _findModulesDir(__cb(_, __frame, 3, 1, function __$_directDependencies() {
Expand All @@ -123,16 +125,16 @@ function _missingDependencies(_, path, known) { var knownMap, missingMap;



function _explore(_, path, missingMap) { var dependencies; var __frame = { name: "_explore", line: 126 }; return __func(_, this, arguments, _explore, 0, __frame, function __$_explore() {
function _explore(_, path, missingMap) { var dependencies; var __frame = { name: "_explore", line: 128 }; return __func(_, this, arguments, _explore, 0, __frame, function __$_explore() {
return _extendPath(__cb(_, __frame, 1, 9, function ___(__0, __2) { path = __2;
if (knownMap[path]) { return _(null); } ;

if (missingMap) {
missingMap[path] = true; } ;
knownMap[path] = true;
return _directDependencies(__cb(_, __frame, 7, 21, function ___(__0, __3) { dependencies = __3;
return each(__cb(_, __frame, 8, 2, _), dependencies, function __1(_, dependency) { var __frame = { name: "__1", line: 134 }; return __func(_, this, arguments, __1, 0, __frame, function __$__1() {
return _explore(__cb(_, __frame, 1, 3, _), dependency, missingMap); }); }); }), path); }), path); }); }; var __frame = { name: "_missingDependencies", line: 121 }; return __func(_, this, arguments, _missingDependencies, 0, __frame, function __$_missingDependencies() { knownMap = { }; known.forEach(function(key) { knownMap[key] = true; });
return each(__cb(_, __frame, 8, 2, _), dependencies, function __1(_, dependency) { var __frame = { name: "__1", line: 136 }; return __func(_, this, arguments, __1, 0, __frame, function __$__1() {
return _explore(__cb(_, __frame, 1, 3, _), dependency, missingMap); }); }); }), path); }), path); }); }; var __frame = { name: "_missingDependencies", line: 123 }; return __func(_, this, arguments, _missingDependencies, 0, __frame, function __$_missingDependencies() { knownMap = { }; known.forEach(function(key) { knownMap[key] = true; });



Expand All @@ -143,14 +145,14 @@ function _missingDependencies(_, path, known) { var knownMap, missingMap;


return _explore(__cb(_, __frame, 24, 1, function __$_missingDependencies() {
return _(null, Object.keys(missingMap)); }), path, missingMap); }), known, function __1(_, cur) { var __frame = { name: "__1", line: 141 }; return __func(_, this, arguments, __1, 0, __frame, function __$__1() { return _explore(__cb(_, __frame, 1, 2, _), cur, null); }); }); });};
return _(null, Object.keys(missingMap)); }), path, missingMap); }), known, function __1(_, cur) { var __frame = { name: "__1", line: 143 }; return __func(_, this, arguments, __1, 0, __frame, function __$__1() { return _explore(__cb(_, __frame, 1, 2, _), cur, null); }); }); });};


exports.directDependencies = function exports_directDependencies__1(_, path) { var __frame = { name: "exports_directDependencies__1", line: 149 }; return __func(_, this, arguments, exports_directDependencies__1, 0, __frame, function __$exports_directDependencies__1() {
return funnel(__cb(_, __frame, 1, 8, _), function __1(_) { var __frame = { name: "__1", line: 150 }; return __func(_, this, arguments, __1, 0, __frame, function __$__1() {
exports.directDependencies = function exports_directDependencies__1(_, path) { var __frame = { name: "exports_directDependencies__1", line: 151 }; return __func(_, this, arguments, exports_directDependencies__1, 0, __frame, function __$exports_directDependencies__1() {
return funnel(__cb(_, __frame, 1, 8, _), function __1(_) { var __frame = { name: "__1", line: 152 }; return __func(_, this, arguments, __1, 0, __frame, function __$__1() {
return _directDependencies(__cb(_, __frame, 1, 9, _), path); }); }); });};


exports.missingDependencies = function exports_missingDependencies__2(_, path, known) { var __frame = { name: "exports_missingDependencies__2", line: 154 }; return __func(_, this, arguments, exports_missingDependencies__2, 0, __frame, function __$exports_missingDependencies__2() {
return funnel(__cb(_, __frame, 1, 8, _), function __1(_) { var __frame = { name: "__1", line: 155 }; return __func(_, this, arguments, __1, 0, __frame, function __$__1() {
exports.missingDependencies = function exports_missingDependencies__2(_, path, known) { var __frame = { name: "exports_missingDependencies__2", line: 156 }; return __func(_, this, arguments, exports_missingDependencies__2, 0, __frame, function __$exports_missingDependencies__2() {
return funnel(__cb(_, __frame, 1, 8, _), function __1(_) { var __frame = { name: "__1", line: 157 }; return __func(_, this, arguments, __1, 0, __frame, function __$__1() {
return _missingDependencies(__cb(_, __frame, 1, 9, _), path, known); }); }); });};
8 changes: 5 additions & 3 deletions lib/require/server/depend_.js
View file
Expand Up @@ -20,11 +20,13 @@ function _exists(callback, path) {
return callback(null, result);
});
}

function _normalize(path) {
return path.replace(/\\/g, '/');
}
function _findModulesDir(_) {
if (modulesDir)
return modulesDir;
for (var dir = __dirname; dir.length > 0; dir = dir.substring(0, dir.lastIndexOf('/'))) {
for (var dir = _normalize(__dirname); dir.length > 0; dir = dir.substring(0, dir.lastIndexOf('/'))) {
if (_exists(_, dir + "/node_modules")) {
modulesDir = dir + "/node_modules";
return modulesDir;
Expand Down Expand Up @@ -71,7 +73,7 @@ exports.etag = function() {
function _watch(file) {
if (!_watched[file]) {
_watched[file] = true;
fs.watchFile(file, _watcher);
//fs.watchFile(file, _watcher);
}
}

Expand Down

0 comments on commit a9f606e

Please sign in to comment.