Nodejs/node
1
0
Fork 0
mirror of https://github.com/nodejs/node.git synced 2024-11-21 10:59:27 +00:00
Code Issues Actions 25 Packages Projects Releases Wiki Activity

trailing whitespace fixes

Browse Source
This commit is contained in:
isaacs 2010-04-11 13:46:24 -07:00 committed by Ryan Dahl
parent 93913dbdb8
commit 57fbb627ca
8 changed files with 65 additions and 65 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
lib/assert.js
View File

@ -112,7 +112,7 @@ assert.equal = function equal(actual, expected, message) {
// with != assert.notEqual(actual, expected, message_opt);
assert.notEqual = function notEqual(actual, expected, message) {
if (actual == expected) {
if (actual == expected) {
fail(actual, expected, message, "!=", assert.notEqual);
}
};

4
lib/fs.js
View File

@ -98,7 +98,7 @@ function stringToFlags(flag) {
case "r+": return process.O_RDWR;
case "w": return process.O_CREAT | process.O_TRUNC | process.O_WRONLY;
case "w+": return process.O_CREAT | process.O_TRUNC | process.O_RDWR;
case "a": return process.O_APPEND | process.O_CREAT | process.O_WRONLY;
case "a": return process.O_APPEND | process.O_CREAT | process.O_WRONLY;
case "a+": return process.O_APPEND | process.O_CREAT | process.O_RDWR;
default: throw new Error("Unknown file open flag: " + flag);
}
@ -707,7 +707,7 @@ var writeStreamCloseWarning;
FileWriteStream.prototype.close = function (cb) {
if (!writeStreamCloseWarning) {
writeStreamCloseWarning = "FileWriteStream.prototype.close renamed to end()";
sys.error(writeStreamCloseWarning);
sys.error(writeStreamCloseWarning);
}
return this.end(cb);
}

10
lib/http_old.js
View File

@ -215,7 +215,7 @@ OutgoingMessage.prototype.sendHeaderLines = function (first_line, headers) {
OutgoingMessage.prototype.sendBody = function () {
throw new Error("sendBody() has been renamed to write(). " +
throw new Error("sendBody() has been renamed to write(). " +
"The 'body' event has been renamed to 'data' and " +
"the 'complete' event has been renamed to 'end'.");
};
@ -338,7 +338,7 @@ function createIncomingMessageStream (connection, incoming_listener) {
field = null;
value = null;
});
// Only servers will get URL events.
connection.addListener("url", function (data) {
incoming.url += data;
@ -580,7 +580,7 @@ http.Client.prototype.request = function (method, url, headers) {
exports.cat = function (url, encoding_, headers_) {
var encoding = 'utf8',
var encoding = 'utf8',
headers = {},
callback = null;
@ -604,7 +604,7 @@ exports.cat = function (url, encoding_, headers_) {
}
var url = require("url").parse(url);
var hasHost = false;
for (var i in headers) {
if (i.toLowerCase() === "host") {
@ -615,7 +615,7 @@ exports.cat = function (url, encoding_, headers_) {
if (!hasHost) headers["Host"] = url.hostname;
var content = "";
var client = exports.createClient(url.port || 80, url.hostname);
var req = client.request((url.pathname || "/")+(url.search || "")+(url.hash || ""), headers);

4
lib/net.js
View File

@ -340,7 +340,7 @@ function initStream (self) {
self.readable = false;
// Queue of buffers and string that need to be written to socket.
self._writeQueue = [];
self._writeQueue = [];
self._writeQueueEncoding = [];
self._writeWatcher = ioWatchers.alloc();
@ -608,7 +608,7 @@ Stream.prototype.connect = function () {
initStream(self);
if (self.fd) throw new Error('Stream already opened');
if (!self._readWatcher) throw new Error('No readWatcher');
timeout.active(socket);
var port = parseInt(arguments[0]);

16
lib/querystring.js
View File

@ -30,7 +30,7 @@ QueryString.stringify = function (obj, sep, eq, name) {
if (isA(obj, null) || isA(obj, undefined) || typeof(obj) === 'function') {
return name ? encodeURIComponent(name) + eq : '';
}
if (isBool(obj)) obj = +obj;
if (isNumber(obj) || isString(obj)) {
return encodeURIComponent(name) + eq + encodeURIComponent(obj);
@ -44,14 +44,14 @@ QueryString.stringify = function (obj, sep, eq, name) {
return s.join(sep);
}
// now we know it's an object.
// Check for cyclical references in nested objects
for (var i = stack.length - 1; i >= 0; --i) if (stack[i] === obj) {
throw new Error("querystring.stringify. Cyclical reference");
}
stack.push(obj);
var s = [];
var begin = name ? name + '[' : '';
var end = name ? ']' : '';
@ -59,9 +59,9 @@ QueryString.stringify = function (obj, sep, eq, name) {
var n = begin + i + end;
s.push(QueryString.stringify(obj[i], sep, eq, n));
}
stack.pop();
s = s.join(sep);
if (!s && name) return name + "=";
return s;
@ -112,10 +112,10 @@ var pieceParser = function (eq) {
}
// ["foo[][bar][][baz]", "foo[][bar][]", "baz"]
var tail = sliced[2], head = sliced[1];
// array: key[]=val
if (!tail) return parsePiece(head, [val]);
// obj: key[subkey]=val
var ret = {};
ret[tail] = val;

28
lib/repl.js
View File

@ -32,13 +32,13 @@ exports.start = function (prompt) {
*/
function readline (cmd) {
cmd = trimWhitespace(cmd);
// Check to see if a REPL keyword was used. If it returns true,
// display next prompt and return.
if (parseREPLKeyword(cmd) === true) {
return;
}
// The catchall for errors
try {
buffered_cmd += "\n" + cmd;
@ -46,7 +46,7 @@ function readline (cmd) {
// continue onto the next line.
try {
buffered_cmd = convertToScope(buffered_cmd);
// Scope the readline with exports.scope to provide "local" vars
with (exports.scope) {
var ret = eval(buffered_cmd);
@ -55,7 +55,7 @@ function readline (cmd) {
exports.writer(ret);
}
}
buffered_cmd = '';
} catch (e) {
if (!(e instanceof SyntaxError)) throw e;
@ -69,13 +69,13 @@ function readline (cmd) {
}
buffered_cmd = '';
}
displayPrompt();
}
/**
* Used to display the prompt.
* Used to display the prompt.
*/
function displayPrompt () {
sys.print(buffered_cmd.length ? '... ' : exports.prompt);
@ -83,9 +83,9 @@ function displayPrompt () {
/**
* Used to parse and execute the Node REPL commands.
*
*
* @param {cmd} cmd The command entered to check
* @returns {Boolean} If true it means don't continue parsing the command
* @returns {Boolean} If true it means don't continue parsing the command
*/
function parseREPLKeyword (cmd) {
switch (cmd) {
@ -115,9 +115,9 @@ function parseREPLKeyword (cmd) {
/**
* Trims Whitespace from a line.
*
*
* @param {String} cmd The string to trim the whitespace from
* @returns {String} The trimmed string
* @returns {String} The trimmed string
*/
function trimWhitespace (cmd) {
var matches = trimmer.exec(cmd);
@ -130,24 +130,24 @@ function trimWhitespace (cmd) {
* Converts commands that use var and function <name>() to use the
* local exports.scope when evaled. This provides a local scope
* on the REPL.
*
*
* @param {String} cmd The cmd to convert
* @returns {String} The converted command
*/
function convertToScope (cmd) {
var matches;
// Replaces: var foo = "bar"; with: exports.scope.foo = bar;
matches = scopedVar.exec(cmd);
if (matches && matches.length == 3) {
return "exports.scope." + matches[1] + matches[2];
}
// Replaces: function foo() {}; with: foo = function foo() {};
matches = scopeFunc.exec(buffered_cmd);
if (matches && matches.length == 2) {
return matches[1] + " = " + buffered_cmd;
}
return cmd;
}

4
lib/sys.js
View File

@ -83,7 +83,7 @@ exports.inspect = function (obj, showHidden, depth) {
} else {
base = "";
}
// Make dates with properties first say the date
if (value instanceof Date) {
base = ' ' + value.toUTCString();
@ -160,7 +160,7 @@ exports.inspect = function (obj, showHidden, depth) {
return name + ": " + str;
});
var numLinesEst = 0;
var length = output.reduce(function(prev, cur) {
numLinesEst++;

62
lib/url.js
View File

@ -20,17 +20,17 @@ var protocolPattern = /^([a-z0-9]+:)/,
function urlParse (url, parseQueryString) {
if (url && typeof(url) === "object" && url.href) return url;
var out = { href : url },
rest = url;
var proto = protocolPattern.exec(rest);
if (proto) {
proto = proto[0];
out.protocol = proto;
rest = rest.substr(proto.length);
}
// figure out if it's got a host
var slashes = rest.substr(0, 2) === "//";
if (slashes && !(proto && hostlessProtocol[proto])) {
@ -48,19 +48,19 @@ function urlParse (url, parseQueryString) {
}
if (firstNonHost !== -1) {
out.host = rest.substr(0, firstNonHost);
rest = rest.substr(firstNonHost);
rest = rest.substr(firstNonHost);
} else {
out.host = rest;
rest = "";
}
// pull out the auth and port.
var p = parseHost(out.host);
for (var i in p) out[i] = p[i];
// we've indicated that there is a hostname, so even if it's empty, it has to be present.
out.hostname = out.hostname || "";
}
// now rest is set to the post-host stuff.
// chop off from the tail first.
var hash = rest.indexOf("#");
@ -79,7 +79,7 @@ function urlParse (url, parseQueryString) {
rest = rest.slice(0, qm);
}
if (rest) out.pathname = rest;
return out;
};
@ -88,37 +88,37 @@ function urlFormat (obj) {
// ensure it's an object, and not a string url. If it's an obj, this is a no-op.
// this way, you can call url_format() on strings to clean up potentially wonky urls.
if (typeof(obj) === "string") obj = urlParse(obj);
var protocol = obj.protocol || "",
host = (obj.host !== undefined) ? obj.host
: obj.hostname !== undefined ? (
(obj.auth ? obj.auth + "@" : "")
+ obj.hostname
+ (obj.port ? ":" + obj.port : "")
)
)
: false,
pathname = obj.pathname || "",
search = obj.search || (
obj.query && ( "?" + (
typeof(obj.query) === "object"
typeof(obj.query) === "object"
? querystring.stringify(obj.query)
: String(obj.query)
))
) || "",
hash = obj.hash || "";
if (protocol && protocol.substr(-1) !== ":") protocol += ":";
// only the slashedProtocols get the //. Not mailto:, xmpp:, etc.
// unless they had them to begin with.
if (obj.slashes || (!protocol || slashedProtocol[protocol]) && host !== false) {
host = "//" + (host || "");
if (pathname && pathname.charAt(0) !== "/") pathname = "/" + pathname;
} else if (!host) host = "";
if (hash && hash.charAt(0) !== "#") hash = "#" + hash;
if (search && search.charAt(0) !== "?") search = "?" + search;
return protocol + host + pathname + search + hash;
};
@ -128,30 +128,30 @@ function urlResolve (source, relative) {
function urlResolveObject (source, relative) {
if (!source) return relative;
source = urlParse(urlFormat(source));
relative = urlParse(urlFormat(relative));
// hash is always overridden, no matter what.
source.hash = relative.hash;
if (relative.href === "") return source;
// hrefs like //foo/bar always cut to the protocol.
if (relative.slashes && !relative.protocol) {
relative.protocol = source.protocol;
return relative;
}
if (relative.protocol && relative.protocol !== source.protocol) {
// if it's a known url protocol, then changing the protocol does weird things
// first, if it's not file:, then we MUST have a host, and if there was a path
// to begin with, then we MUST have a path.
// if it is file:, then the host is dropped, because that's known to be hostless.
// anything else is assumed to be absolute.
if (!slashedProtocol[relative.protocol]) return relative;
source.protocol = relative.protocol;
if (!relative.host && !hostlessProtocol[relative.protocol]) {
var relPath = (relative.pathname || "").split("/");
@ -181,13 +181,13 @@ function urlResolveObject (source, relative) {
srcPath = source.pathname && source.pathname.split("/") || [],
relPath = relative.pathname && relative.pathname.split("/") || [],
psychotic = source.protocol && !slashedProtocol[source.protocol] && source.host !== undefined;
// if the url is a non-slashed url, then relative links like ../.. should be able
// to crawl up to the hostname, as well. This is strange.
// source.protocol has already been set by now.
// Later on, put the first path part into the host field.
if ( psychotic ) {
delete source.hostname;
delete source.auth;
delete source.port;
@ -196,7 +196,7 @@ function urlResolveObject (source, relative) {
else srcPath.unshift(source.host);
}
delete source.host;
if (relative.protocol) {
delete relative.hostname;
delete relative.auth;
@ -209,7 +209,7 @@ function urlResolveObject (source, relative) {
}
mustEndAbs = mustEndAbs && (relPath[0] === "" || srcPath[0] === "");
}
if (isRelAbs) {
// it's absolute.
source.host = (relative.host || relative.host === "") ? relative.host : source.host;
@ -242,7 +242,7 @@ function urlResolveObject (source, relative) {
delete source.pathname;
return source;
}
// resolve dots.
// if a url ENDs in . or .., then it must get a trailing slash.
// however, if it ends in anything else non-slashy, then it must NOT get a trailing slash.
@ -251,7 +251,7 @@ function urlResolveObject (source, relative) {
(source.host || relative.host) && (last === "." || last === "..")
|| last === ""
);
// Figure out if this has to end up as an absolute url, or should continue to be relative.
srcPath = path.normalizeArray(srcPath, true);
if (srcPath.length === 1 && srcPath[0] === ".") srcPath = [];
@ -262,23 +262,23 @@ function urlResolveObject (source, relative) {
if (dir === "..") dirs.pop();
else if (dir !== ".") dirs.push(dir);
});
if (mustEndAbs && dirs[0] !== "") {
dirs.unshift("");
}
srcPath = dirs;
}
if (hasTrailingSlash && (srcPath.length < 2 || srcPath.slice(-1)[0] !== "")) srcPath.push("");
// put the host back
if ( psychotic ) source.host = srcPath[0] === "" ? "" : srcPath.shift();
mustEndAbs = mustEndAbs || (source.host && srcPath.length);
if (mustEndAbs && srcPath[0] !== "") srcPath.unshift("")
source.pathname = srcPath.join("/");
return source;
};