@@ -136,7 +136,7 @@ function IncomingMessage (connection) { this.statusCode = null; this.client = this.connection; } -process.inherits(IncomingMessage, process.EventEmitter); +sys.inherits(IncomingMessage, process.EventEmitter); exports.IncomingMessage = IncomingMessage; IncomingMessage.prototype._parseQueryString = function () { @@ -192,7 +192,7 @@ function OutgoingMessage () { this.finished = false; } -process.inherits(OutgoingMessage, process.EventEmitter); +sys.inherits(OutgoingMessage, process.EventEmitter); exports.OutgoingMessage = OutgoingMessage; OutgoingMessage.prototype.send = function (data, encoding) { @@ -315,7 +315,7 @@ function ServerResponse () { this.should_keep_alive = true; this.use_chunked_encoding_by_default = true; } -process.inherits(ServerResponse, OutgoingMessage); +sys.inherits(ServerResponse, OutgoingMessage); exports.ServerResponse = ServerResponse; ServerResponse.prototype.sendHeader = function (statusCode, headers) { @@ -338,7 +338,7 @@ function ClientRequest (method, uri, headers) { this.sendHeaderLines(method + " " + uri + " HTTP/1.1\r\n", headers); } -process.inherits(ClientRequest, OutgoingMessage); +sys.inherits(ClientRequest, OutgoingMessage); exports.ClientRequest = ClientRequest; ClientRequest.prototype.finish = function (responseListener) { lib/http.js @@ -1,3 +1,5 @@ +var sys = require("sys"); + exports.parse = function(options) { var stream = new exports.Stream(options); var promise = new process.Promise(); @@ -28,7 +30,7 @@ exports.Stream = function(options) { this.init(options); }; -process.inherits(exports.Stream, process.EventEmitter); +sys.inherits(exports.Stream, process.EventEmitter); var proto = exports.Stream.prototype; @@ -109,7 +111,7 @@ function Part(stream) { this._headersComplete = false; } -process.inherits(Part, process.EventEmitter); +sys.inherits(Part, process.EventEmitter); Part.prototype.parsedHeaders = function() { for (var header in this.headers) { @@ -185,4 +187,4 @@ function stripslashes(str) { return n1; } }); -} \ No newline at end of file +} lib/multipart.js @@ -67,3 +67,24 @@ exports.exec = function (command) { return promise; }; + +/** + * Inherit the prototype methods from one constructor into another. + * + * The Function.prototype.inherits from lang.js rewritten as a standalone + * function (not on Function.prototype). NOTE: If this file is to be loaded + * during bootstrapping this function needs to be revritten using some native + * functions as prototype setup using normal JavaScript does not work as + * expected during bootstrapping (see mirror.js in r114903). + * + * @param {function} ctor Constructor function which needs to inherit the + * prototype + * @param {function} superCtor Constructor function to inherit prototype from + */ +exports.inherits = function (ctor, superCtor) { + var tempCtor = function(){}; + tempCtor.prototype = superCtor.prototype; + ctor.super_ = superCtor.prototype; + ctor.prototype = new tempCtor(); + ctor.prototype.constructor = ctor; +}; lib/sys.js @@ -120,27 +120,6 @@ process.fs.cat = function (path, encoding) { return promise; }; -/** - * Inherit the prototype methods from one constructor into another. - * - * The Function.prototype.inherits from lang.js rewritten as a standalone - * function (not on Function.prototype). NOTE: If this file is to be loaded - * during bootstrapping this function needs to be revritten using some native - * functions as prototype setup using normal JavaScript does not work as - * expected during bootstrapping (see mirror.js in r114903). - * - * @param {function} ctor Constructor function which needs to inherit the - * prototype - * @param {function} superCtor Constructor function to inherit prototype from - */ -process.inherits = function (ctor, superCtor) { - var tempCtor = function(){}; - tempCtor.prototype = superCtor.prototype; - ctor.super_ = superCtor.prototype; - ctor.prototype = new tempCtor(); - ctor.prototype.constructor = ctor; -}; - process.assert = function (x, msg) { if (!(x)) throw new Error(msg || "assertion error"); }; src/node.js d737a060c841687907604d1a0885b11b29a1a8e4 Ryan Dahl ry@tinyclouds.org http://github.com/ujh/node/commit/43121c15be7fa6ca80bb1c0448e8a643ab583c08 43121c15be7fa6ca80bb1c0448e8a643ab583c08 2009-11-07T05:45:39-08:00 2009-11-07T05:45:39-08:00 API: rename process.inherits to sys.inherits eae1eb4ab0cfdea9ebb424fd7f2bdb65c2fc5982 Ryan Dahl ry@tinyclouds.org