From 2b8707320f3fe8c0a71a3771a1ec05e59f7ce5c5 Mon Sep 17 00:00:00 2001 From: Jeremy Martin Date: Sun, 28 Nov 2010 01:03:14 -0500 Subject: [PATCH 1/7] Fix number of args emitted by EventEmitter during "fast case" (lte 3 args) --- lib/events.js | 21 +++++++++++------ test/simple/test-event-emitter-num-args.js | 27 ++++++++++++++++++++++ 2 files changed, 41 insertions(+), 7 deletions(-) create mode 100644 test/simple/test-event-emitter-num-args.js diff --git a/lib/events.js b/lib/events.js index cf9651abb6f2..ef277372dec4 100644 --- a/lib/events.js +++ b/lib/events.js @@ -22,20 +22,27 @@ EventEmitter.prototype.emit = function (type) { if (!handler) return false; if (typeof handler == 'function') { - if (arguments.length <= 3) { - // fast case - handler.call(this, arguments[1], arguments[2]); - } else { + switch (arguments.length) { + // fast cases + case 1: + handler.call(this); + break; + case 2: + handler.call(this, arguments[1]); + break; + case 3: + handler.call(this, arguments[1], arguments[2]); + break; // slower - var args = Array.prototype.slice.call(arguments, 1); - handler.apply(this, args); + default: + var args = Array.prototype.slice.call(arguments, 1); + handler.apply(this, args); } return true; } else if (isArray(handler)) { var args = Array.prototype.slice.call(arguments, 1); - var listeners = handler.slice(); for (var i = 0, l = listeners.length; i < l; i++) { listeners[i].apply(this, args); diff --git a/test/simple/test-event-emitter-num-args.js b/test/simple/test-event-emitter-num-args.js new file mode 100644 index 000000000000..93a5149cc7aa --- /dev/null +++ b/test/simple/test-event-emitter-num-args.js @@ -0,0 +1,27 @@ +common = require("../common"); +assert = common.assert +var events = require('events'); + +var e = new events.EventEmitter(), + num_args_emited = []; + +e.on("numArgs", function() { + var numArgs = arguments.length; + console.log("numArgs: " + numArgs); + num_args_emited.push(numArgs); +}); + +console.log("start"); + +e.emit("numArgs"); +e.emit("numArgs", null); +e.emit("numArgs", null, null); +e.emit("numArgs", null, null, null); +e.emit("numArgs", null, null, null, null); +e.emit("numArgs", null, null, null, null, null); + +process.addListener("exit", function () { + assert.deepEqual([0, 1, 2, 3, 4, 5], num_args_emited); +}); + + From a6862bf999d5040ee830a10e2304f0e598e6514c Mon Sep 17 00:00:00 2001 From: Jeremy Martin Date: Sun, 12 Dec 2010 03:12:41 -0500 Subject: [PATCH 2/7] url.parse(url, true) defaults query field to {}, plus test-case fix --- lib/querystring.js | 2 +- lib/url.js | 3 +++ test/simple/test-event-emitter-num-args.js | 4 ++-- test/simple/test-url.js | 17 +++++++++++++++++ 4 files changed, 23 insertions(+), 3 deletions(-) diff --git a/lib/querystring.js b/lib/querystring.js index eeeada046735..87c4391a55d9 100644 --- a/lib/querystring.js +++ b/lib/querystring.js @@ -136,7 +136,7 @@ QueryString.parse = QueryString.decode = function(qs, sep, eq) { eq = eq || '='; var obj = {}; - if (typeof qs !== 'string') { + if (typeof qs !== 'string' || qs.length === 0) { return obj; } diff --git a/lib/url.js b/lib/url.js index a0f274edea50..b8c1105a9f28 100644 --- a/lib/url.js +++ b/lib/url.js @@ -98,6 +98,9 @@ function urlParse(url, parseQueryString, slashesDenoteHost) { out.query = querystring.parse(out.query); } rest = rest.slice(0, qm); + } else if (parseQueryString) { + // no query string, but parseQueryString still requested + out.query = {}; } if (rest) out.pathname = rest; diff --git a/test/simple/test-event-emitter-num-args.js b/test/simple/test-event-emitter-num-args.js index 93a5149cc7aa..33c5dbd8f467 100644 --- a/test/simple/test-event-emitter-num-args.js +++ b/test/simple/test-event-emitter-num-args.js @@ -1,5 +1,5 @@ -common = require("../common"); -assert = common.assert +var common = require("../common"); +var assert = require('assert'); var events = require('events'); var e = new events.EventEmitter(), diff --git a/test/simple/test-url.js b/test/simple/test-url.js index c59e92bec3de..91509b2baa86 100644 --- a/test/simple/test-url.js +++ b/test/simple/test-url.js @@ -192,6 +192,23 @@ var parseTestsWithQueryString = { 'baz': 'quux' }, 'pathname': '/foo/bar' + }, + 'http://example.com' : { + 'href': 'http://example.com', + 'protocol': 'http:', + 'slashes': true, + 'host': 'example.com', + 'hostname': 'example.com', + 'query': {} + }, + 'http://example.com?' : { + 'href': 'http://example.com?', + 'protocol': 'http:', + 'slashes': true, + 'host': 'example.com', + 'hostname': 'example.com', + 'search': '?', + 'query': {} } }; for (var u in parseTestsWithQueryString) { From c07c78e2004fb181c02154940f65c08aad1cf60f Mon Sep 17 00:00:00 2001 From: Brian White Date: Thu, 16 Dec 2010 22:57:41 -0500 Subject: [PATCH 3/7] Fix compilation on OpenBSD and FreeBSD While it compiles fine on FreeBSD, at least on amd64 node dies with: "CALL_AND_RETRY_0 allocation failed - process out of memory" --- deps/v8/src/platform-freebsd.cc | 14 +++++++++++--- deps/v8/src/platform-openbsd.cc | 12 +++++++++++- 2 files changed, 22 insertions(+), 4 deletions(-) diff --git a/deps/v8/src/platform-freebsd.cc b/deps/v8/src/platform-freebsd.cc index b58d0662fb1a..3c454d4c3a0e 100644 --- a/deps/v8/src/platform-freebsd.cc +++ b/deps/v8/src/platform-freebsd.cc @@ -500,6 +500,16 @@ class FreeBSDMutex : public Mutex { return result; } + virtual bool TryLock() { + int result = pthread_mutex_trylock(&mutex_); + // Return false if the lock is busy and locking failed. + if (result == EBUSY) { + return false; + } + ASSERT(result == 0); // Verify no other errors. + return true; + } + private: pthread_mutex_t mutex_; // Pthread mutex for POSIX platforms. }; @@ -577,14 +587,12 @@ static void ProfilerSignalHandler(int signal, siginfo_t* info, void* context) { TickSample sample; - // We always sample the VM state. - sample.state = VMState::current_state(); - // If profiling, we extract the current pc and sp. if (active_sampler_->IsProfiling()) { // Extracting the sample from the context is extremely machine dependent. ucontext_t* ucontext = reinterpret_cast(context); mcontext_t& mcontext = ucontext->uc_mcontext; + sample.state = Top::current_vm_state(); #if V8_HOST_ARCH_IA32 sample.pc = reinterpret_cast
(mcontext.mc_eip); sample.sp = reinterpret_cast
(mcontext.mc_esp); diff --git a/deps/v8/src/platform-openbsd.cc b/deps/v8/src/platform-openbsd.cc index b698d16b9a48..7658272e3cd4 100644 --- a/deps/v8/src/platform-openbsd.cc +++ b/deps/v8/src/platform-openbsd.cc @@ -476,6 +476,16 @@ class OpenBSDMutex : public Mutex { return result; } + virtual bool TryLock() { + int result = pthread_mutex_trylock(&mutex_); + // Return false if the lock is busy and locking failed. + if (result == EBUSY) { + return false; + } + ASSERT(result == 0); // Verify no other errors. + return true; + } + private: pthread_mutex_t mutex_; // Pthread mutex for POSIX platforms. }; @@ -554,7 +564,7 @@ static void ProfilerSignalHandler(int signal, siginfo_t* info, void* context) { TickSample sample; // We always sample the VM state. - sample.state = VMState::current_state(); + sample.state = Top::current_vm_state(); active_sampler_->Tick(&sample); } From 4e47256be11a557bd69957ddb90884a2f5dc1d04 Mon Sep 17 00:00:00 2001 From: Ryan Dahl Date: Fri, 17 Dec 2010 09:29:19 -0800 Subject: [PATCH 4/7] Upgrade V8 to 3.0.3 --- deps/v8/src/platform-freebsd.cc | 14 +++----------- deps/v8/src/platform-openbsd.cc | 12 +----------- 2 files changed, 4 insertions(+), 22 deletions(-) diff --git a/deps/v8/src/platform-freebsd.cc b/deps/v8/src/platform-freebsd.cc index 3c454d4c3a0e..b58d0662fb1a 100644 --- a/deps/v8/src/platform-freebsd.cc +++ b/deps/v8/src/platform-freebsd.cc @@ -500,16 +500,6 @@ class FreeBSDMutex : public Mutex { return result; } - virtual bool TryLock() { - int result = pthread_mutex_trylock(&mutex_); - // Return false if the lock is busy and locking failed. - if (result == EBUSY) { - return false; - } - ASSERT(result == 0); // Verify no other errors. - return true; - } - private: pthread_mutex_t mutex_; // Pthread mutex for POSIX platforms. }; @@ -587,12 +577,14 @@ static void ProfilerSignalHandler(int signal, siginfo_t* info, void* context) { TickSample sample; + // We always sample the VM state. + sample.state = VMState::current_state(); + // If profiling, we extract the current pc and sp. if (active_sampler_->IsProfiling()) { // Extracting the sample from the context is extremely machine dependent. ucontext_t* ucontext = reinterpret_cast(context); mcontext_t& mcontext = ucontext->uc_mcontext; - sample.state = Top::current_vm_state(); #if V8_HOST_ARCH_IA32 sample.pc = reinterpret_cast
(mcontext.mc_eip); sample.sp = reinterpret_cast
(mcontext.mc_esp); diff --git a/deps/v8/src/platform-openbsd.cc b/deps/v8/src/platform-openbsd.cc index 7658272e3cd4..b698d16b9a48 100644 --- a/deps/v8/src/platform-openbsd.cc +++ b/deps/v8/src/platform-openbsd.cc @@ -476,16 +476,6 @@ class OpenBSDMutex : public Mutex { return result; } - virtual bool TryLock() { - int result = pthread_mutex_trylock(&mutex_); - // Return false if the lock is busy and locking failed. - if (result == EBUSY) { - return false; - } - ASSERT(result == 0); // Verify no other errors. - return true; - } - private: pthread_mutex_t mutex_; // Pthread mutex for POSIX platforms. }; @@ -564,7 +554,7 @@ static void ProfilerSignalHandler(int signal, siginfo_t* info, void* context) { TickSample sample; // We always sample the VM state. - sample.state = Top::current_vm_state(); + sample.state = VMState::current_state(); active_sampler_->Tick(&sample); } From 786ae53a10c7539a3a942e2ffd3b1aed40d2b26a Mon Sep 17 00:00:00 2001 From: Jeremy Martin Date: Mon, 20 Dec 2010 15:36:39 -0500 Subject: [PATCH 5/7] Revert "url.parse(url, true) defaults query field to {}, plus test-case fix" This reverts commit a6862bf999d5040ee830a10e2304f0e598e6514c. --- lib/querystring.js | 2 +- lib/url.js | 3 --- test/simple/test-event-emitter-num-args.js | 4 ++-- test/simple/test-url.js | 17 ----------------- 4 files changed, 3 insertions(+), 23 deletions(-) diff --git a/lib/querystring.js b/lib/querystring.js index 87c4391a55d9..eeeada046735 100644 --- a/lib/querystring.js +++ b/lib/querystring.js @@ -136,7 +136,7 @@ QueryString.parse = QueryString.decode = function(qs, sep, eq) { eq = eq || '='; var obj = {}; - if (typeof qs !== 'string' || qs.length === 0) { + if (typeof qs !== 'string') { return obj; } diff --git a/lib/url.js b/lib/url.js index b8c1105a9f28..a0f274edea50 100644 --- a/lib/url.js +++ b/lib/url.js @@ -98,9 +98,6 @@ function urlParse(url, parseQueryString, slashesDenoteHost) { out.query = querystring.parse(out.query); } rest = rest.slice(0, qm); - } else if (parseQueryString) { - // no query string, but parseQueryString still requested - out.query = {}; } if (rest) out.pathname = rest; diff --git a/test/simple/test-event-emitter-num-args.js b/test/simple/test-event-emitter-num-args.js index 33c5dbd8f467..93a5149cc7aa 100644 --- a/test/simple/test-event-emitter-num-args.js +++ b/test/simple/test-event-emitter-num-args.js @@ -1,5 +1,5 @@ -var common = require("../common"); -var assert = require('assert'); +common = require("../common"); +assert = common.assert var events = require('events'); var e = new events.EventEmitter(), diff --git a/test/simple/test-url.js b/test/simple/test-url.js index 91509b2baa86..c59e92bec3de 100644 --- a/test/simple/test-url.js +++ b/test/simple/test-url.js @@ -192,23 +192,6 @@ var parseTestsWithQueryString = { 'baz': 'quux' }, 'pathname': '/foo/bar' - }, - 'http://example.com' : { - 'href': 'http://example.com', - 'protocol': 'http:', - 'slashes': true, - 'host': 'example.com', - 'hostname': 'example.com', - 'query': {} - }, - 'http://example.com?' : { - 'href': 'http://example.com?', - 'protocol': 'http:', - 'slashes': true, - 'host': 'example.com', - 'hostname': 'example.com', - 'search': '?', - 'query': {} } }; for (var u in parseTestsWithQueryString) { From 03103cbd38be3263380180f1fe11c926aeda11b4 Mon Sep 17 00:00:00 2001 From: Jeremy Martin Date: Mon, 20 Dec 2010 16:21:02 -0500 Subject: [PATCH 6/7] url.parse(url, true) defaults query field to {} --- lib/querystring.js | 2 +- lib/url.js | 3 +++ test/simple/test-url.js | 17 +++++++++++++++++ 3 files changed, 21 insertions(+), 1 deletion(-) diff --git a/lib/querystring.js b/lib/querystring.js index eeeada046735..87c4391a55d9 100644 --- a/lib/querystring.js +++ b/lib/querystring.js @@ -136,7 +136,7 @@ QueryString.parse = QueryString.decode = function(qs, sep, eq) { eq = eq || '='; var obj = {}; - if (typeof qs !== 'string') { + if (typeof qs !== 'string' || qs.length === 0) { return obj; } diff --git a/lib/url.js b/lib/url.js index a0f274edea50..b8c1105a9f28 100644 --- a/lib/url.js +++ b/lib/url.js @@ -98,6 +98,9 @@ function urlParse(url, parseQueryString, slashesDenoteHost) { out.query = querystring.parse(out.query); } rest = rest.slice(0, qm); + } else if (parseQueryString) { + // no query string, but parseQueryString still requested + out.query = {}; } if (rest) out.pathname = rest; diff --git a/test/simple/test-url.js b/test/simple/test-url.js index c59e92bec3de..91509b2baa86 100644 --- a/test/simple/test-url.js +++ b/test/simple/test-url.js @@ -192,6 +192,23 @@ var parseTestsWithQueryString = { 'baz': 'quux' }, 'pathname': '/foo/bar' + }, + 'http://example.com' : { + 'href': 'http://example.com', + 'protocol': 'http:', + 'slashes': true, + 'host': 'example.com', + 'hostname': 'example.com', + 'query': {} + }, + 'http://example.com?' : { + 'href': 'http://example.com?', + 'protocol': 'http:', + 'slashes': true, + 'host': 'example.com', + 'hostname': 'example.com', + 'search': '?', + 'query': {} } }; for (var u in parseTestsWithQueryString) { From 58fc508b1e4644324c3acddcfe7befc759cfbff9 Mon Sep 17 00:00:00 2001 From: "Gun.io Whitespace Robot" Date: Sat, 29 Oct 2011 17:42:14 -0400 Subject: [PATCH 7/7] Remove whitespace [Gun.io WhitespaceBot] --- ChangeLog | 10 +-- LICENSE | 4 +- README.cmake | 2 +- benchmark/function_call/bench.js | 4 +- benchmark/http_simple_bench.sh | 8 +-- benchmark/idle_server.js | 2 +- benchmark/io.c | 2 +- benchmark/io.js | 2 +- benchmark/plot.R | 10 +-- cmake/node_build.cmake | 2 +- cmake/v8_build.cmake | 14 ++-- deps/c-ares/README.msvc | 4 +- deps/c-ares/ares_destroy.c | 2 +- deps/c-ares/ares_parse_ptr_reply.c | 2 +- deps/http_parser/LICENSE-MIT | 2 +- deps/libeio/aclocal.m4 | 2 +- deps/libeio/eio.3 | 4 +- deps/libeio/eio.c | 38 +++++------ deps/libeio/eio.h | 6 +- deps/libeio/wscript | 2 +- deps/libev/README | 2 +- deps/libev/ev.3 | 8 +-- deps/libev/ev.c | 12 ++-- deps/libev/ev.pod | 12 ++-- deps/libev/ev_poll.c | 2 +- deps/libev/ev_win32.c | 2 +- deps/libev/event_compat.h | 2 +- deps/libev/libev.m4 | 16 ++--- deps/libev/wscript | 2 +- deps/v8/LICENSE.valgrind | 10 +-- deps/v8/benchmarks/crypto.js | 2 +- deps/v8/benchmarks/earley-boyer.js | 66 +++++++++---------- deps/v8/benchmarks/regexp.js | 6 +- deps/v8/benchmarks/run.html | 18 ++--- deps/v8/benchmarks/style.css | 4 +- deps/v8/src/array.js | 10 +-- deps/v8/src/d8.js | 10 +-- deps/v8/src/date.js | 10 +-- deps/v8/src/debug-debugger.js | 10 +-- deps/v8/src/json.js | 6 +- deps/v8/src/regexp.js | 12 ++-- deps/v8/src/string.js | 4 +- deps/v8/src/third_party/valgrind/valgrind.h | 44 ++++++------- deps/v8/test/es5conform/es5conform.status | 6 +- deps/v8/test/mjsunit/apply.js | 2 +- deps/v8/test/mjsunit/array-constructor.js | 8 +-- deps/v8/test/mjsunit/array-iteration.js | 12 ++-- deps/v8/test/mjsunit/array-sort.js | 2 +- deps/v8/test/mjsunit/bugs/618.js | 4 +- deps/v8/test/mjsunit/bugs/bug-618.js | 6 +- deps/v8/test/mjsunit/const-redecl.js | 4 +- deps/v8/test/mjsunit/debug-compile-event.js | 2 +- .../test/mjsunit/debug-evaluate-recursive.js | 2 +- deps/v8/test/mjsunit/debug-handle.js | 4 +- deps/v8/test/mjsunit/debug-listbreakpoints.js | 2 +- deps/v8/test/mjsunit/debug-references.js | 4 +- deps/v8/test/mjsunit/debug-return-value.js | 8 +-- .../debug-stepin-call-function-stub.js | 4 +- .../test/mjsunit/debug-stepin-constructor.js | 2 +- deps/v8/test/mjsunit/delete-in-with.js | 2 +- deps/v8/test/mjsunit/function-bind.js | 4 +- deps/v8/test/mjsunit/function-source.js | 2 +- .../mjsunit/get-own-property-descriptor.js | 2 +- .../mjsunit/global-deleted-property-keyed.js | 2 +- deps/v8/test/mjsunit/html-string-funcs.js | 2 +- deps/v8/test/mjsunit/in.js | 2 +- deps/v8/test/mjsunit/instanceof.js | 6 +- deps/v8/test/mjsunit/json.js | 8 +-- deps/v8/test/mjsunit/keyed-storage-extend.js | 2 +- deps/v8/test/mjsunit/math-sqrt.js | 2 +- deps/v8/test/mjsunit/mirror-array.js | 4 +- deps/v8/test/mjsunit/mirror-function.js | 2 +- deps/v8/test/mjsunit/mirror-object.js | 2 +- deps/v8/test/mjsunit/mirror-script.js | 2 +- .../mjsunit/mirror-unresolved-function.js | 2 +- deps/v8/test/mjsunit/no-semicolon.js | 2 +- .../test/mjsunit/object-define-properties.js | 2 +- deps/v8/test/mjsunit/object-freeze.js | 2 +- .../mjsunit/object-literal-conversions.js | 1 - .../test/mjsunit/object-literal-overwrite.js | 2 +- .../test/mjsunit/object-prevent-extensions.js | 2 +- deps/v8/test/mjsunit/object-seal.js | 2 +- deps/v8/test/mjsunit/regexp-capture.js | 16 ++--- deps/v8/test/mjsunit/regexp-compile.js | 2 +- deps/v8/test/mjsunit/regexp.js | 20 +++--- .../test/mjsunit/regress/regress-1081309.js | 2 +- deps/v8/test/mjsunit/regress/regress-1092.js | 2 +- deps/v8/test/mjsunit/regress/regress-1110.js | 2 +- .../test/mjsunit/regress/regress-1213575.js | 2 +- .../test/mjsunit/regress/regress-1919169.js | 2 +- .../test/mjsunit/regress/regress-20070207.js | 2 +- deps/v8/test/mjsunit/regress/regress-269.js | 2 +- deps/v8/test/mjsunit/regress/regress-619.js | 2 +- .../v8/test/mjsunit/regress/regress-678525.js | 8 +-- deps/v8/test/mjsunit/regress/regress-696.js | 2 +- deps/v8/test/mjsunit/regress/regress-720.js | 2 +- deps/v8/test/mjsunit/regress/regress-747.js | 4 +- deps/v8/test/mjsunit/regress/regress-760-1.js | 2 +- deps/v8/test/mjsunit/regress/regress-760-2.js | 2 +- deps/v8/test/mjsunit/regress/regress-798.js | 14 ++-- deps/v8/test/mjsunit/regress/regress-918.js | 2 +- .../v8/test/mjsunit/regress/regress-925537.js | 4 +- .../v8/test/mjsunit/regress/regress-937896.js | 2 +- .../setter-on-constructor-prototype.js | 26 ++++---- .../test/mjsunit/string-compare-alignment.js | 2 +- deps/v8/test/mjsunit/string-indexof-1.js | 4 +- deps/v8/test/mjsunit/string-indexof-2.js | 6 +- deps/v8/test/mjsunit/string-split.js | 4 +- deps/v8/test/mjsunit/substr.js | 2 +- .../test/mjsunit/third_party/string-trim.js | 2 +- .../test/mjsunit/this-property-assignment.js | 2 +- deps/v8/test/mjsunit/try.js | 4 +- deps/v8/test/mjsunit/unicode-test.js | 4 +- deps/v8/test/mjsunit/value-wrapper.js | 14 ++-- deps/v8/test/mozilla/mozilla.status | 6 +- deps/v8/tools/generate-ten-powers.scm | 2 +- doc/api/assert.markdown | 2 +- doc/api/http.markdown | 2 +- doc/api/path.markdown | 4 +- doc/api_assets/style.css | 14 ++-- doc/index.html | 6 +- doc/node.1 | 4 +- doc/pipe.css | 14 ++-- src/node_buffer.h | 2 +- src/node_crypto.cc | 14 ++-- src/node_dtrace.cc | 4 +- src/node_extensions.cc | 2 +- test/disabled/test-https-loop-to-google.js | 12 ++-- test/fixtures/fixture.ini | 6 +- test/simple/test-http-dns-fail.js | 2 +- test/simple/test-timers-linked-list.js | 2 +- test/simple/test-tls-client-verify.js | 14 ++-- tools/closure_linter/setup.cfg | 2 +- tools/doctool/markdown.js | 2 +- wscript | 10 +-- 135 files changed, 407 insertions(+), 408 deletions(-) diff --git a/ChangeLog b/ChangeLog index 4b4b7a218a73..4651f8f52244 100644 --- a/ChangeLog +++ b/ChangeLog @@ -151,7 +151,7 @@ * HTTPS server -* Built in debugger 'node debug script.js' +* Built in debugger 'node debug script.js' * realpath files during module load (Mihai Călin Bazon) @@ -293,7 +293,7 @@ * fs bugfixes (Tj Holowaychuk, Tobie Langel, Marco Rogers, isaacs) -* http bug fixes (Fedor Indutny, Mikeal Rogers) +* http bug fixes (Fedor Indutny, Mikeal Rogers) * Faster buffers; breaks C++ API (Tim-Smart, Stéphan Kochen) @@ -462,7 +462,7 @@ * Upgrade http-parser, V8 to 2.2.21 -2010.06.21, Version 0.1.99, a620b7298f68f68a855306437a3b60b650d61d78 +2010.06.21, Version 0.1.99, a620b7298f68f68a855306437a3b60b650d61d78 * Datagram sockets (Paul Querna) @@ -568,7 +568,7 @@ 2010.05.06, Version 0.1.94, f711d5343b29d1e72e87107315708e40951a7826 -* Look in /usr/local/lib/node for modules, so that there's a way +* Look in /usr/local/lib/node for modules, so that there's a way to install modules globally (Issac Schlueter) * SSL improvements (Rhys Jones, Paulo Matias) @@ -588,7 +588,7 @@ * Bugfix: destroy() instead of end() http connection at end of pipeline -* Bugfix: http.Client may be prematurely released back to the +* Bugfix: http.Client may be prematurely released back to the free pool. (Thomas Lee) * Upgrade V8 to 2.2.8 diff --git a/LICENSE b/LICENSE index 6437f04da696..19cc1d348ec5 100644 --- a/LICENSE +++ b/LICENSE @@ -5,7 +5,7 @@ are: - v8, located under deps/v8, which is copyrighted by the Google, Inc. v8 has a BSD license. - - libev, located under deps/libev, and libeio, located at deps/libeio. + - libev, located under deps/libev, and libeio, located at deps/libeio. This code is copyrighted by Marc Alexander Lehmann. Both are dually licensed under MIT and GPL2. @@ -60,4 +60,4 @@ FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS -IN THE SOFTWARE. +IN THE SOFTWARE. diff --git a/README.cmake b/README.cmake index 925249c8ae5e..07cbd552fe68 100644 --- a/README.cmake +++ b/README.cmake @@ -17,7 +17,7 @@ To run the tests: To build the documentation: make -f Makefile.cmake doc - + To read the documentation: man doc/node.1 diff --git a/benchmark/function_call/bench.js b/benchmark/function_call/bench.js index 55e6ea116fd5..1d86621a37fd 100644 --- a/benchmark/function_call/bench.js +++ b/benchmark/function_call/bench.js @@ -1,6 +1,6 @@ var binding = require('./build/default/binding'); -c = 0 +c = 0 function js() { return c++; //(new Date()).getTime(); @@ -38,6 +38,6 @@ console.log("\nJS function call speed: %d microseconds", toMicro(jsDiff)); console.log("C++ function call speed: %d microseconds", toMicro(cxxDiff)); -console.log("\nJS speedup " + (cxxDiff / jsDiff)); +console.log("\nJS speedup " + (cxxDiff / jsDiff)); diff --git a/benchmark/http_simple_bench.sh b/benchmark/http_simple_bench.sh index 6ba8e0664dcc..5070769b0d0c 100755 --- a/benchmark/http_simple_bench.sh +++ b/benchmark/http_simple_bench.sh @@ -4,7 +4,7 @@ SERVER=127.0.0.1 PORT=8000 # You may want to configure your TCP settings to make many ports available -# to node and ab. On macintosh use: +# to node and ab. On macintosh use: # sudo sysctl -w net.inet.ip.portrange.first=32768 # sudo sysctl -w net.inet.tcp.msl=1000 @@ -27,7 +27,7 @@ date=`date "+%Y%m%d%H%M%S"` ab_hello_world() { local type="$1" local ressize="$2" - if [ $type == "string" ]; then + if [ $type == "string" ]; then local uri="bytes/$ressize" else local uri="buffer/$ressize" @@ -57,7 +57,7 @@ ab_hello_world() { echo "webserver-rev: $rev" >> $summary_fn echo "webserver-uname: $uname" >> $summary_fn - grep Req $summary_fn + grep Req $summary_fn echo "Summary: $summary_fn" echo @@ -67,7 +67,7 @@ ab_hello_world() { ab_hello_world 'string' '1024' ab_hello_world 'buffer' '1024' -# 100k +# 100k ab_hello_world 'string' '102400' ab_hello_world 'buffer' '102400' diff --git a/benchmark/idle_server.js b/benchmark/idle_server.js index a4c70d76d36f..719c866429bf 100644 --- a/benchmark/idle_server.js +++ b/benchmark/idle_server.js @@ -6,7 +6,7 @@ var errors = 0; server = net.Server(function (socket) { socket.on('error', function () { - errors++; + errors++; }); }); diff --git a/benchmark/io.c b/benchmark/io.c index db3f04c107e3..6f6316a243e7 100644 --- a/benchmark/io.c +++ b/benchmark/io.c @@ -9,7 +9,7 @@ #include #include #include - + int tsize = 1000 * 1048576; const char *path = "/tmp/wt.dat"; diff --git a/benchmark/io.js b/benchmark/io.js index 505d8d03aae8..59535d1e83d5 100644 --- a/benchmark/io.js +++ b/benchmark/io.js @@ -55,7 +55,7 @@ function readtest(size, bsize) { var s = fs.createReadStream(path, {'flags': 'r', 'encoding': 'binary', 'mode': 0644, 'bufferSize': bsize}); s.addListener("data", function (chunk) { // got a chunk... - + }); return s; } diff --git a/benchmark/plot.R b/benchmark/plot.R index 1f902eddfe60..5f326b71a189 100755 --- a/benchmark/plot.R +++ b/benchmark/plot.R @@ -1,14 +1,14 @@ #!/usr/bin/env Rscript # To use this script you'll need to install R: http://www.r-project.org/ -# and a library for R called ggplot2 +# and a library for R called ggplot2 # Which can be done by starting R and typing install.packages("ggplot2") # like this: # # shell% R # R version 2.11.0 beta (2010-04-12 r51689) # > install.packages("ggplot2") -# (follow prompt) +# (follow prompt) # # Then you can try this script by providing a full path to .data file # outputed from 'make bench' @@ -17,7 +17,7 @@ # > make bench # ... # > ./benchmark/plot.R .benchmark_reports/ab-hello-world-buffer-1024/ff456b38862de3fd0118c6ac6b3f46edb1fbb87f/20101013162056.data -# +# # This will generate a PNG file which you can view # # @@ -39,14 +39,14 @@ ab.load <- function (filename, name) { #ab.tsPoint <- function (d) { # qplot(time_s, ttime, data=d, facets=server~., # geom="point", alpha=I(1/15), ylab="response time (ms)", -# xlab="time (s)", main="c=30, res=26kb", +# xlab="time (s)", main="c=30, res=26kb", # ylim=c(0,100)) #} # #ab.tsLine <- function (d) { # qplot(time_s, ttime, data=d, facets=server~., # geom="line", ylab="response time (ms)", -# xlab="time (s)", main="c=30, res=26kb", +# xlab="time (s)", main="c=30, res=26kb", # ylim=c(0,100)) #} diff --git a/cmake/node_build.cmake b/cmake/node_build.cmake index 295bb3e632d7..a6efe08e83b5 100644 --- a/cmake/node_build.cmake +++ b/cmake/node_build.cmake @@ -128,7 +128,7 @@ if(DTRACE) endif() install(TARGETS node RUNTIME DESTINATION bin) -install(FILES +install(FILES ${PROJECT_BINARY_DIR}/config.h src/node.h src/node_object_wrap.h diff --git a/cmake/v8_build.cmake b/cmake/v8_build.cmake index b1ae43fe7846..fb304a649fe2 100644 --- a/cmake/v8_build.cmake +++ b/cmake/v8_build.cmake @@ -24,7 +24,7 @@ if(NOT SHARED_V8) if(V8_GDBJIT) set(v8_gdbjit gdbjit=on) endif() - + if(${node_platform} MATCHES darwin) execute_process(COMMAND hwprefs cpu_count OUTPUT_VARIABLE cpu_count) elseif(${node_platform} MATCHES linux) @@ -54,28 +54,28 @@ if(NOT SHARED_V8) if(CMAKE_VERSION VERSION_GREATER 2.8 OR CMAKE_VERSION VERSION_EQUAL 2.8) # use ExternalProject for CMake >2.8 include(ExternalProject) - + ExternalProject_Add(v8_extprj URL ${PROJECT_SOURCE_DIR}/deps/v8 - + BUILD_IN_SOURCE True BUILD_COMMAND sh -c "${compile_cmd}" SOURCE_DIR ${PROJECT_BINARY_DIR}/deps/v8 # ignore this stuff, it's not needed for building v8 but ExternalProject # demands these steps - + CONFIGURE_COMMAND "true" # fake configure INSTALL_COMMAND "true" # fake install ) - + add_dependencies(node v8_extprj) else() # copy v8 sources inefficiently with CMake versions <2.8 file(GLOB_RECURSE v8_sources RELATIVE ${PROJECT_SOURCE_DIR} deps/v8/*) - + if(NOT ${in_source_build}) file(MAKE_DIRECTORY ${PROJECT_BINARY_DIR}/deps/v8) - + foreach(FILE ${v8_sources}) add_custom_command(OUTPUT ${PROJECT_BINARY_DIR}/${FILE} COMMAND ${CMAKE_COMMAND} -E copy_if_different ${PROJECT_SOURCE_DIR}/${FILE} ${PROJECT_BINARY_DIR}/${FILE} diff --git a/deps/c-ares/README.msvc b/deps/c-ares/README.msvc index 9c1163ac5f10..0898a51b255b 100644 --- a/deps/c-ares/README.msvc +++ b/deps/c-ares/README.msvc @@ -1,6 +1,6 @@ - ___ __ _ _ __ ___ ___ + ___ __ _ _ __ ___ ___ / __| ___ / _` | '__/ _ \/ __| | (_ |___| (_| | | | __/\__ \ \___| \__,_|_| \___||___/ @@ -115,4 +115,4 @@ Have Fun! - + diff --git a/deps/c-ares/ares_destroy.c b/deps/c-ares/ares_destroy.c index 5e274daeef5d..40db21bef614 100644 --- a/deps/c-ares/ares_destroy.c +++ b/deps/c-ares/ares_destroy.c @@ -41,7 +41,7 @@ void ares_destroy(ares_channel channel) struct query *query; struct list_node* list_head; struct list_node* list_node; - + if (!channel) return; diff --git a/deps/c-ares/ares_parse_ptr_reply.c b/deps/c-ares/ares_parse_ptr_reply.c index ccd68a26da11..c9c9a31473f5 100644 --- a/deps/c-ares/ares_parse_ptr_reply.c +++ b/deps/c-ares/ares_parse_ptr_reply.c @@ -198,7 +198,7 @@ int ares_parse_ptr_reply(const unsigned char *abuf, int alen, const void *addr, status = ARES_ENOMEM; } for (i=0 ; i= wanted)) return; - + /* todo: maybe use idle here, but might be less exact */ if (expect_true (0 <= (int)etp_nthreads () + (int)etp_npending () - (int)etp_nreqs ())) return; @@ -1053,7 +1053,7 @@ eio__sendfile (int ofd, int ifd, off_t offset, size_t count, etp_worker *self) while (count) { ssize_t cnt; - + cnt = pread (ifd, eio_buf, count > EIO_BUFSIZE ? EIO_BUFSIZE : count, offset); if (cnt <= 0) @@ -1199,7 +1199,7 @@ eio_dent_insertion_sort (eio_dirent *dents, int size) { int i; eio_dirent *min = dents; - + /* the radix pre-pass ensures that the minimum element is in the first EIO_SORT_CUTOFF + 1 elements */ for (i = size > EIO_SORT_FAST ? EIO_SORT_CUTOFF + 1 : size; --i; ) if (EIO_DENT_CMP (dents [i], <, *min)) @@ -1374,31 +1374,31 @@ eio__scandir (eio_req *req, etp_worker *self) #endif #ifdef DT_CHR case DT_CHR: ent->type = EIO_DT_CHR; break; - #endif + #endif #ifdef DT_MPC case DT_MPC: ent->type = EIO_DT_MPC; break; - #endif + #endif #ifdef DT_DIR case DT_DIR: ent->type = EIO_DT_DIR; break; - #endif + #endif #ifdef DT_NAM case DT_NAM: ent->type = EIO_DT_NAM; break; - #endif + #endif #ifdef DT_BLK case DT_BLK: ent->type = EIO_DT_BLK; break; - #endif + #endif #ifdef DT_MPB case DT_MPB: ent->type = EIO_DT_MPB; break; - #endif + #endif #ifdef DT_REG case DT_REG: ent->type = EIO_DT_REG; break; - #endif + #endif #ifdef DT_NWK case DT_NWK: ent->type = EIO_DT_NWK; break; - #endif + #endif #ifdef DT_CMP case DT_CMP: ent->type = EIO_DT_CMP; break; - #endif + #endif #ifdef DT_LNK case DT_LNK: ent->type = EIO_DT_LNK; break; #endif @@ -1448,7 +1448,7 @@ eio__scandir (eio_req *req, etp_worker *self) /* Windows */ static intptr_t eio_pagesize (void) - { + { SYSTEM_INFO si; GetSystemInfo(&si); return si.dwPageSize; @@ -1627,7 +1627,7 @@ X_THREAD_PROC (etp_proc) --nready; X_UNLOCK (reqlock); - + if (req->type < 0) goto quit; diff --git a/deps/libeio/eio.h b/deps/libeio/eio.h index 1d597e1fa44b..d0114604d81d 100644 --- a/deps/libeio/eio.h +++ b/deps/libeio/eio.h @@ -6,14 +6,14 @@ * * Redistribution and use in source and binary forms, with or without modifica- * tion, are permitted provided that the following conditions are met: - * + * * 1. Redistributions of source code must retain the above copyright notice, * this list of conditions and the following disclaimer. - * + * * 2. Redistributions in binary form must reproduce the above copyright * notice, this list of conditions and the following disclaimer in the * documentation and/or other materials provided with the distribution. - * + * * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR IMPLIED * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MER- * CHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO diff --git a/deps/libeio/wscript b/deps/libeio/wscript index 280dca698176..1b467f68a9ff 100644 --- a/deps/libeio/wscript +++ b/deps/libeio/wscript @@ -69,7 +69,7 @@ def configure(conf): } """) - conf.check_cc(msg="Checking for sendfile(2)" , define_name="HAVE_SENDFILE" , fragment=""" + conf.check_cc(msg="Checking for sendfile(2)" , define_name="HAVE_SENDFILE" , fragment=""" # include #if __linux # include diff --git a/deps/libev/README b/deps/libev/README index ca403c6f4704..9f83c39d065b 100644 --- a/deps/libev/README +++ b/deps/libev/README @@ -14,7 +14,7 @@ ABOUT featureful. And also smaller. Yay. Some of the specialties of libev not commonly found elsewhere are: - + - extensive and detailed, readable documentation (not doxygen garbage). - fully supports fork, can detect fork in various ways and automatically re-arms kernel mechanisms that do not support fork. diff --git a/deps/libev/ev.3 b/deps/libev/ev.3 index f2a4514582eb..e5f86ef3d7c9 100644 --- a/deps/libev/ev.3 +++ b/deps/libev/ev.3 @@ -798,7 +798,7 @@ name, you can call it anytime, but it makes most sense after forking, in the child process. You \fImust\fR call it (or use \f(CW\*(C`EVFLAG_FORKCHECK\*(C'\fR) in the child before resuming or calling \f(CW\*(C`ev_run\*(C'\fR. .Sp -Again, you \fIhave\fR to call it on \fIany\fR loop that you want to re-use after +Again, you \fIhave\fR to call it on \fIany\fR loop that you want to re-use after a fork, \fIeven if you do not plan to use the loop in the parent\fR. This is because some kernel interfaces *cough* \fIkqueue\fR *cough* do funny things during fork. @@ -3184,7 +3184,7 @@ used). \& struct ev_loop *loop_hi = ev_default_init (0); \& struct ev_loop *loop_lo = 0; \& ev_embed embed; -\& +\& \& // see if there is a chance of getting one that works \& // (remember that a flags value of 0 means autodetection) \& loop_lo = ev_embeddable_backends () & ev_recommended_backends () @@ -3210,7 +3210,7 @@ kqueue implementation). Store the kqueue/socket\-only event loop in \& struct ev_loop *loop = ev_default_init (0); \& struct ev_loop *loop_socket = 0; \& ev_embed embed; -\& +\& \& if (ev_supported_backends () & ~ev_recommended_backends () & EVBACKEND_KQUEUE) \& if ((loop_socket = ev_loop_new (EVBACKEND_KQUEUE)) \& { @@ -3990,7 +3990,7 @@ Example: use a functor object as callback. \& ... \& } \& } -\& +\& \& myfunctor f; \& \& ev::io w; diff --git a/deps/libev/ev.c b/deps/libev/ev.c index 5f0391a42a23..ab235eb0416d 100644 --- a/deps/libev/ev.c +++ b/deps/libev/ev.c @@ -101,7 +101,7 @@ # undef EV_USE_POLL # define EV_USE_POLL 0 # endif - + # if HAVE_EPOLL_CTL && HAVE_SYS_EPOLL_H # ifndef EV_USE_EPOLL # define EV_USE_EPOLL EV_FEATURE_BACKENDS @@ -110,7 +110,7 @@ # undef EV_USE_EPOLL # define EV_USE_EPOLL 0 # endif - + # if HAVE_KQUEUE && HAVE_SYS_EVENT_H # ifndef EV_USE_KQUEUE # define EV_USE_KQUEUE EV_FEATURE_BACKENDS @@ -119,7 +119,7 @@ # undef EV_USE_KQUEUE # define EV_USE_KQUEUE 0 # endif - + # if HAVE_PORT_H && HAVE_PORT_CREATE # ifndef EV_USE_PORT # define EV_USE_PORT EV_FEATURE_BACKENDS @@ -155,7 +155,7 @@ # undef EV_USE_EVENTFD # define EV_USE_EVENTFD 0 # endif - + #endif #include @@ -1216,7 +1216,7 @@ downheap (ANHE *heap, int N, int k) heap [k] = heap [c]; ev_active (ANHE_w (heap [k])) = k; - + k = c; } @@ -1584,7 +1584,7 @@ ev_supported_backends (void) if (EV_USE_EPOLL ) flags |= EVBACKEND_EPOLL; if (EV_USE_POLL ) flags |= EVBACKEND_POLL; if (EV_USE_SELECT) flags |= EVBACKEND_SELECT; - + return flags; } diff --git a/deps/libev/ev.pod b/deps/libev/ev.pod index 4bbef1fcf25b..ad8fb2d33e6d 100644 --- a/deps/libev/ev.pod +++ b/deps/libev/ev.pod @@ -677,7 +677,7 @@ name, you can call it anytime, but it makes most sense after forking, in the child process. You I call it (or use C) in the child before resuming or calling C. -Again, you I to call it on I loop that you want to re-use after +Again, you I to call it on I loop that you want to re-use after a fork, I. This is because some kernel interfaces *cough* I *cough* do funny things during fork. @@ -2273,7 +2273,7 @@ Example: Call a callback every hour, starting now: ev_periodic_init (&hourly_tick, clock_cb, fmod (ev_now (loop), 3600.), 3600., 0); ev_periodic_start (loop, &hourly_tick); - + =head2 C - signal me when a signal gets signalled! @@ -3053,7 +3053,7 @@ used). struct ev_loop *loop_hi = ev_default_init (0); struct ev_loop *loop_lo = 0; ev_embed embed; - + // see if there is a chance of getting one that works // (remember that a flags value of 0 means autodetection) loop_lo = ev_embeddable_backends () & ev_recommended_backends () @@ -3077,7 +3077,7 @@ C. (One might optionally use C, too). struct ev_loop *loop = ev_default_init (0); struct ev_loop *loop_socket = 0; ev_embed embed; - + if (ev_supported_backends () & ~ev_recommended_backends () & EVBACKEND_KQUEUE) if ((loop_socket = ev_loop_new (EVBACKEND_KQUEUE)) { @@ -3751,7 +3751,7 @@ you to use some convenience methods to start/stop watchers and also change the callback model to a model using method callbacks on objects. To use it, - + #include This automatically includes F and puts all of its definitions (many @@ -3860,7 +3860,7 @@ Example: use a functor object as callback. ... } } - + myfunctor f; ev::io w; diff --git a/deps/libev/ev_poll.c b/deps/libev/ev_poll.c index e53ae0de93c6..cb03e78bf606 100644 --- a/deps/libev/ev_poll.c +++ b/deps/libev/ev_poll.c @@ -90,7 +90,7 @@ poll_poll (EV_P_ ev_tstamp timeout) { struct pollfd *p; int res; - + EV_RELEASE_CB; res = poll (polls, pollcnt, ev_timeout_to_ms (timeout)); EV_ACQUIRE_CB; diff --git a/deps/libev/ev_win32.c b/deps/libev/ev_win32.c index 338886efe407..53334e2394fb 100644 --- a/deps/libev/ev_win32.c +++ b/deps/libev/ev_win32.c @@ -133,7 +133,7 @@ ev_pipe (int filedes [2]) #undef pipe #define pipe(filedes) ev_pipe (filedes) - + #define EV_HAVE_EV_TIME 1 ev_tstamp ev_time (void) diff --git a/deps/libev/event_compat.h b/deps/libev/event_compat.h index d5cc1effa7c8..c62802c6a03d 100644 --- a/deps/libev/event_compat.h +++ b/deps/libev/event_compat.h @@ -182,7 +182,7 @@ int evbuffer_read(struct evbuffer *, int, int); u_char *evbuffer_find(struct evbuffer *, const u_char *, size_t); void evbuffer_setcb(struct evbuffer *, void (*)(struct evbuffer *, size_t, size_t, void *), void *); -/* +/* * Marshaling tagged data - We assume that all tags are inserted in their * numeric order - so that unknown tags will always be higher than the * known ones - and we can just ignore the end of an event buffer. diff --git a/deps/libev/libev.m4 b/deps/libev/libev.m4 index e3f4c81b236d..1f6987632c6d 100644 --- a/deps/libev/libev.m4 +++ b/deps/libev/libev.m4 @@ -1,12 +1,12 @@ dnl this file is part of libev, do not make local modifications dnl http://software.schmorp.de/pkg/libev -dnl libev support -AC_CHECK_HEADERS(sys/inotify.h sys/epoll.h sys/event.h port.h poll.h sys/select.h sys/eventfd.h sys/signalfd.h) - +dnl libev support +AC_CHECK_HEADERS(sys/inotify.h sys/epoll.h sys/event.h port.h poll.h sys/select.h sys/eventfd.h sys/signalfd.h) + AC_CHECK_FUNCS(inotify_init epoll_ctl kqueue port_create poll select eventfd signalfd) - -AC_CHECK_FUNCS(clock_gettime, [], [ + +AC_CHECK_FUNCS(clock_gettime, [], [ dnl on linux, try syscall wrapper first if test $(uname) = Linux; then AC_MSG_CHECKING(for clock_gettime syscall) @@ -21,15 +21,15 @@ AC_CHECK_FUNCS(clock_gettime, [], [ [AC_MSG_RESULT(no)]) fi if test -z "$LIBEV_M4_AVOID_LIBRT" && test -z "$ac_have_clock_syscall"; then - AC_CHECK_LIB(rt, clock_gettime) + AC_CHECK_LIB(rt, clock_gettime) unset ac_cv_func_clock_gettime AC_CHECK_FUNCS(clock_gettime) fi ]) -AC_CHECK_FUNCS(nanosleep, [], [ +AC_CHECK_FUNCS(nanosleep, [], [ if test -z "$LIBEV_M4_AVOID_LIBRT"; then - AC_CHECK_LIB(rt, nanosleep) + AC_CHECK_LIB(rt, nanosleep) unset ac_cv_func_nanosleep AC_CHECK_FUNCS(nanosleep) fi diff --git a/deps/libev/wscript b/deps/libev/wscript index 4f6c9a882def..8705ccb43c14 100644 --- a/deps/libev/wscript +++ b/deps/libev/wscript @@ -53,7 +53,7 @@ def configure(conf): #include int main() { - struct timespec ts; + struct timespec ts; int status = syscall(SYS_clock_gettime, CLOCK_REALTIME, &ts); return 0; } diff --git a/deps/v8/LICENSE.valgrind b/deps/v8/LICENSE.valgrind index fd8ebaf50992..7361a5866996 100644 --- a/deps/v8/LICENSE.valgrind +++ b/deps/v8/LICENSE.valgrind @@ -20,16 +20,16 @@ are met: 1. Redistributions of source code must retain the above copyright notice, this list of conditions and the following disclaimer. -2. The origin of this software must not be misrepresented; you must - not claim that you wrote the original software. If you use this - software in a product, an acknowledgment in the product +2. The origin of this software must not be misrepresented; you must + not claim that you wrote the original software. If you use this + software in a product, an acknowledgment in the product documentation would be appreciated but is not required. 3. Altered source versions must be plainly marked as such, and must not be misrepresented as being the original software. -4. The name of the author may not be used to endorse or promote - products derived from this software without specific prior written +4. The name of the author may not be used to endorse or promote + products derived from this software without specific prior written permission. THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS diff --git a/deps/v8/benchmarks/crypto.js b/deps/v8/benchmarks/crypto.js index ffa69b53bbfe..531ad456e027 100644 --- a/deps/v8/benchmarks/crypto.js +++ b/deps/v8/benchmarks/crypto.js @@ -1406,7 +1406,7 @@ function rng_seed_int(x) { // Mix in the current time (w/milliseconds) into the pool function rng_seed_time() { - // Use pre-computed date to avoid making the benchmark + // Use pre-computed date to avoid making the benchmark // results dependent on the current date. rng_seed_int(1122926989487); } diff --git a/deps/v8/benchmarks/earley-boyer.js b/deps/v8/benchmarks/earley-boyer.js index 1be480e8eeb5..f2323ff18ff0 100644 --- a/deps/v8/benchmarks/earley-boyer.js +++ b/deps/v8/benchmarks/earley-boyer.js @@ -31,7 +31,7 @@ function initRuntime() { tmp = tmp.replace(/\n/g, "
"); tmp = tmp.replace(/\t/g, "    "); return tmp; - + } document.write("
"); @@ -134,7 +134,7 @@ function sc_rempropBang(sym, key) { /*** META ((export #t)) */ function sc_any2String(o) { return jsstring2string(sc_toDisplayString(o)); -} +} /*** META ((export #t) (peephole (infix 2 2 "===")) @@ -557,7 +557,7 @@ sc_Pair.prototype.sc_toWriteOrDisplayString = function(writeOrDisplay) { } else // current.cdr == null break; } - + res += ")"; return res; @@ -897,7 +897,7 @@ function sc_reverseAppendBang(l1, l2) { } return res; } - + function sc_dualAppend(l1, l2) { if (l1 === null) return l2; if (l2 === null) return l1; @@ -923,7 +923,7 @@ function sc_dualAppendBang(l1, l2) { tmp.cdr = l2; return l1; } - + /*** META ((export #t)) */ function sc_appendBang() { var res = null; @@ -1163,7 +1163,7 @@ sc_Char.readable2char = { "us": "\037", "sp": "\040", "del": "\177"}; - + sc_Char.prototype.toString = function() { return this.val; }; @@ -1533,7 +1533,7 @@ function sc_mapBang(proc, l1) { } return l1_orig; } - + /*** META ((export #t)) */ function sc_forEach(proc, l1) { if (l1 === undefined) @@ -1871,7 +1871,7 @@ function sc_jsNew(c) { evalStr += ", arguments[" + i + "]"; evalStr +=")"; return eval(evalStr); -} +} // ======================== RegExp ==================== /*** META ((export #t)) */ @@ -1883,9 +1883,9 @@ function sc_pregexp(re) { function sc_pregexpMatch(re, s) { var reg = (re instanceof RegExp) ? re : sc_pregexp(re); var tmp = reg.exec(sc_string2jsstring(s)); - + if (tmp == null) return false; - + var res = null; for (var i = tmp.length-1; i >= 0; i--) { if (tmp[i] !== null) { @@ -1896,7 +1896,7 @@ function sc_pregexpMatch(re, s) { } return res; } - + /*** META ((export #t)) */ function sc_pregexpReplace(re, s1, s2) { var reg; @@ -1914,7 +1914,7 @@ function sc_pregexpReplace(re, s1, s2) { return jss1.replace(reg, jss2); } - + /*** META ((export pregexp-replace*)) */ function sc_pregexpReplaceAll(re, s1, s2) { var reg; @@ -1945,7 +1945,7 @@ function sc_pregexpSplit(re, s) { return sc_vector2list(tmp); } - + /* =========================================================================== */ /* Other library stuff */ @@ -2136,7 +2136,7 @@ sc_ErrorInputPort.prototype.getNextChar = function() { sc_ErrorInputPort.prototype.isCharReady = function() { return false; }; - + /* .............. String port ..........................*/ @@ -2200,7 +2200,7 @@ sc_Tokenizer.prototype.readToken = function() { }; sc_Tokenizer.prototype.nextToken = function() { var port = this.port; - + function isNumberChar(c) { return (c >= "0" && c <= "9"); }; @@ -2280,7 +2280,7 @@ sc_Tokenizer.prototype.nextToken = function() { else return new sc_Token(12/*NUMBER*/, res - 0); }; - + function skipWhitespaceAndComments() { var done = false; while (!done) { @@ -2299,7 +2299,7 @@ sc_Tokenizer.prototype.nextToken = function() { } } }; - + function readDot() { if (isWhitespace(port.peekChar())) return new sc_Token(10/*DOT*/); @@ -2329,7 +2329,7 @@ sc_Tokenizer.prototype.nextToken = function() { if (c === "(") return new sc_Token(14/*VECTOR_BEGIN*/); - + if (c === "\\") { // character var tmp = "" while (!isWhitespaceOrEOF(port.peekChar())) @@ -2374,7 +2374,7 @@ sc_Tokenizer.prototype.nextToken = function() { } else return new sc_Token(13/*ERROR*/, "bad #-pattern5"); } - + }; skipWhitespaceAndComments(); @@ -2429,7 +2429,7 @@ sc_Reader.prototype.read = function() { while (true) { var token = tokenizer.peekToken(); - + switch (token.type) { case 2/*CLOSE_PAR*/: case 4/*CLOSE_BRACE*/: @@ -2453,7 +2453,7 @@ sc_Reader.prototype.read = function() { + " " + par.type; else return sc_reverseAppendBang(res, cdr); - + default: res = sc_cons(this.read(), res); @@ -2472,7 +2472,7 @@ sc_Reader.prototype.read = function() { case 2/*CLOSE_PAR*/: tokenizer.readToken(); return a; - + default: a.push(this.read()); } @@ -2484,14 +2484,14 @@ sc_Reader.prototype.read = function() { this.backref[nb] = tmp; return tmp; }; - + function readReference(nb) { if (nb in this.backref) return this.backref[nb]; else throw "bad reference: " + nb; }; - + var tokenizer = this.tokenizer; var token = tokenizer.readToken(); @@ -2499,7 +2499,7 @@ sc_Reader.prototype.read = function() { // handle error if (token.type === 13/*ERROR*/) throw token.val; - + switch (token.type) { case 1/*OPEN_PAR*/: case 3/*OPEN_BRACE*/: @@ -2550,7 +2550,7 @@ function sc_peekChar(port) { port = SC_DEFAULT_IN; // THREAD: shared var... var t = port.peekChar(); return t === SC_EOF_OBJECT? t: new sc_Char(t); -} +} /*** META ((export #t) (type bool)) */ @@ -2722,7 +2722,7 @@ sc_StringOutputPort.prototype.close = function() { function sc_getOutputString(sp) { return sc_jsstring2string(sp.res); } - + function sc_ErrorOutputPort() { } @@ -2852,7 +2852,7 @@ function sc_newline(p) { p = SC_DEFAULT_OUT; p.appendJSString("\n"); } - + /* ------------------ write-char ---------------------------------------------------*/ /*** META ((export #t)) */ @@ -2927,7 +2927,7 @@ sc_Pair.prototype.sc_toWriteCircleString = function(symb, inList) { } var res = ""; - + if (this[symb] !== undefined) { // implies > 0 this[symb + "use"] = true; if (inList) @@ -2939,10 +2939,10 @@ sc_Pair.prototype.sc_toWriteCircleString = function(symb, inList) { if (!inList) res += "("; - + // print car res += sc_genToWriteCircleString(this.car, symb); - + if (sc_isPair(this.cdr)) { res += " " + this.cdr.sc_toWriteCircleString(symb, true); } else if (this.cdr !== null) { @@ -3072,7 +3072,7 @@ function sc_format(s, args) { p.appendJSString(arguments[j].toString(2)); i += 2; j++; break; - + case 37: case 110: // %, n @@ -3186,7 +3186,7 @@ function sc_isEqual(o1, o2) { function sc_number2symbol(x, radix) { return sc_SYMBOL_PREFIX + sc_number2jsstring(x, radix); } - + /*** META ((export number->string integer->string)) */ var sc_number2string = sc_number2jsstring; diff --git a/deps/v8/benchmarks/regexp.js b/deps/v8/benchmarks/regexp.js index 71b9e6362c47..9c831422663e 100644 --- a/deps/v8/benchmarks/regexp.js +++ b/deps/v8/benchmarks/regexp.js @@ -33,7 +33,7 @@ // the popularity of the pages where it occurs and the number of times // it is executed while loading each page. Furthermore the literal // letters in the data are encoded using ROT13 in a way that does not -// affect how the regexps match their input. Finally the strings are +// affect how the regexps match their input. Finally the strings are // scrambled to exercise the regexp engine on different input strings. @@ -47,7 +47,7 @@ function RegExpSetup() { regExpBenchmark = new RegExpBenchmark(); RegExpRun(); // run once to get system initialized } - + function RegExpRun() { regExpBenchmark.run(); } @@ -1759,6 +1759,6 @@ function RegExpBenchmark() { runBlock11(); } } - + this.run = run; } diff --git a/deps/v8/benchmarks/run.html b/deps/v8/benchmarks/run.html index 36d2ad511b1c..572cf60c527c 100644 --- a/deps/v8/benchmarks/run.html +++ b/deps/v8/benchmarks/run.html @@ -52,16 +52,16 @@ BenchmarkSuite.RunSuites({ NotifyStep: ShowProgress, NotifyError: AddError, NotifyResult: AddResult, - NotifyScore: AddScore }); + NotifyScore: AddScore }); } function ShowWarningIfObsolete() { - // If anything goes wrong we will just catch the exception and no + // If anything goes wrong we will just catch the exception and no // warning is shown, i.e., no harm is done. try { var xmlhttp; - var next_version = parseInt(BenchmarkSuite.version) + 1; - var next_version_url = "../v" + next_version + "/run.html"; + var next_version = parseInt(BenchmarkSuite.version) + 1; + var next_version_url = "../v" + next_version + "/run.html"; if (window.XMLHttpRequest) { xmlhttp = new window.XMLHttpRequest(); } else if (window.ActiveXObject) { @@ -75,7 +75,7 @@ }; xmlhttp.send(null); } catch(e) { - // Ignore exception if check for next version fails. + // Ignore exception if check for next version fails. // Hence no warning is displayed. } } @@ -83,7 +83,7 @@ function Load() { var version = BenchmarkSuite.version; document.getElementById("version").innerHTML = version; - ShowWarningIfObsolete(); + ShowWarningIfObsolete(); setTimeout(Run, 200); } @@ -91,11 +91,11 @@

V8 Benchmark Suite - version ?

-
+
Warning! This is not the latest version of the V8 benchmark -suite. Consider running the +suite. Consider running the -latest version. +latest version.
diff --git a/deps/v8/benchmarks/style.css b/deps/v8/benchmarks/style.css index d9f4dbfc0c6b..4eecac65c194 100644 --- a/deps/v8/benchmarks/style.css +++ b/deps/v8/benchmarks/style.css @@ -55,13 +55,13 @@ div.run { border: 1px solid rgb(51, 102, 204); } -div.warning { +div.warning { background: #ffffd9; border: 1px solid #d2d26a; display: none; margin: 1em 0 2em; padding: 8px; - text-align: center; + text-align: center; } #status { diff --git a/deps/v8/src/array.js b/deps/v8/src/array.js index ef82674d789e..8d8646405dc3 100644 --- a/deps/v8/src/array.js +++ b/deps/v8/src/array.js @@ -140,7 +140,7 @@ function Join(array, length, separator, convert) { return %StringBuilderConcat(elements, elements_length, ''); } // Non-empty separator case. - // If the first element is a number then use the heuristic that the + // If the first element is a number then use the heuristic that the // remaining elements are also likely to be numbers. if (!IS_NUMBER(array[0])) { for (var i = 0; i < length; i++) { @@ -148,7 +148,7 @@ function Join(array, length, separator, convert) { if (!IS_STRING(e)) e = convert(e); elements[i] = e; } - } else { + } else { for (var i = 0; i < length; i++) { var e = array[i]; if (IS_NUMBER(e)) elements[i] = %_NumberToString(e); @@ -157,9 +157,9 @@ function Join(array, length, separator, convert) { elements[i] = e; } } - } + } var result = %_FastAsciiArrayJoin(elements, separator); - if (!IS_UNDEFINED(result)) return result; + if (!IS_UNDEFINED(result)) return result; return %StringBuilderJoin(elements, length, separator); } finally { @@ -171,7 +171,7 @@ function Join(array, length, separator, convert) { function ConvertToString(x) { - // Assumes x is a non-string. + // Assumes x is a non-string. if (IS_NUMBER(x)) return %_NumberToString(x); if (IS_BOOLEAN(x)) return x ? 'true' : 'false'; return (IS_NULL_OR_UNDEFINED(x)) ? '' : %ToString(%DefaultString(x)); diff --git a/deps/v8/src/d8.js b/deps/v8/src/d8.js index b0edb706ad7c..bab5da342138 100644 --- a/deps/v8/src/d8.js +++ b/deps/v8/src/d8.js @@ -387,14 +387,14 @@ function DebugRequest(cmd_line) { this.frameCommandToJSONRequest_('' + (Debug.State.currentFrame + 1)); break; - + case 'down': case 'do': this.request_ = this.frameCommandToJSONRequest_('' + (Debug.State.currentFrame - 1)); break; - + case 'set': case 'print': case 'p': @@ -1011,7 +1011,7 @@ DebugRequest.prototype.changeBreakpointCommandToJSONRequest_ = arg2 = 'uncaught'; } excType = arg2; - + // Check for: // en[able] [all|unc[aught]] exc[eptions] // dis[able] [all|unc[aught]] exc[eptions] @@ -1070,7 +1070,7 @@ DebugRequest.prototype.changeBreakpointCommandToJSONRequest_ = request.arguments.ignoreCount = parseInt(otherArgs); break; default: - throw new Error('Invalid arguments.'); + throw new Error('Invalid arguments.'); } } else { throw new Error('Invalid arguments.'); @@ -1423,7 +1423,7 @@ function DebugResponseDetails(response) { } else if (body.breakOnUncaughtExceptions) { result += '* breaking on UNCAUGHT exceptions is enabled\n'; } else { - result += '* all exception breakpoints are disabled\n'; + result += '* all exception breakpoints are disabled\n'; } details.text = result; break; diff --git a/deps/v8/src/date.js b/deps/v8/src/date.js index 242ab7bbcbce..1d03f89401a9 100644 --- a/deps/v8/src/date.js +++ b/deps/v8/src/date.js @@ -981,11 +981,11 @@ function PadInt(n, digits) { function DateToISOString() { var t = DATE_VALUE(this); if (NUMBER_IS_NAN(t)) return kInvalidDate; - return this.getUTCFullYear() + + return this.getUTCFullYear() + '-' + PadInt(this.getUTCMonth() + 1, 2) + - '-' + PadInt(this.getUTCDate(), 2) + + '-' + PadInt(this.getUTCDate(), 2) + 'T' + PadInt(this.getUTCHours(), 2) + - ':' + PadInt(this.getUTCMinutes(), 2) + + ':' + PadInt(this.getUTCMinutes(), 2) + ':' + PadInt(this.getUTCSeconds(), 2) + '.' + PadInt(this.getUTCMilliseconds(), 3) + 'Z'; @@ -995,8 +995,8 @@ function DateToISOString() { function DateToJSON(key) { var o = ToObject(this); var tv = DefaultNumber(o); - if (IS_NUMBER(tv) && !NUMBER_IS_FINITE(tv)) { - return null; + if (IS_NUMBER(tv) && !NUMBER_IS_FINITE(tv)) { + return null; } return o.toISOString(); } diff --git a/deps/v8/src/debug-debugger.js b/deps/v8/src/debug-debugger.js index 1adf73ac7141..4004361d8562 100644 --- a/deps/v8/src/debug-debugger.js +++ b/deps/v8/src/debug-debugger.js @@ -1771,7 +1771,7 @@ DebugCommandProcessor.prototype.setExceptionBreakRequest_ = enabled = !Debug.isBreakOnException(); } else if (type == 'uncaught') { enabled = !Debug.isBreakOnUncaughtException(); - } + } // Pull out and check the 'enabled' argument if present: if (!IS_UNDEFINED(request.arguments.enabled)) { @@ -1955,22 +1955,22 @@ DebugCommandProcessor.prototype.evaluateRequest_ = function(request, response) { if (!IS_UNDEFINED(frame) && global) { return response.failed('Arguments "frame" and "global" are exclusive'); } - + var additional_context_object; if (additional_context) { additional_context_object = {}; for (var i = 0; i < additional_context.length; i++) { var mapping = additional_context[i]; if (!IS_STRING(mapping.name) || !IS_NUMBER(mapping.handle)) { - return response.failed("Context element #" + i + + return response.failed("Context element #" + i + " must contain name:string and handle:number"); - } + } var context_value_mirror = LookupMirror(mapping.handle); if (!context_value_mirror) { return response.failed("Context object '" + mapping.name + "' #" + mapping.handle + "# not found"); } - additional_context_object[mapping.name] = context_value_mirror.value(); + additional_context_object[mapping.name] = context_value_mirror.value(); } } diff --git a/deps/v8/src/json.js b/deps/v8/src/json.js index e6ada51b4871..fe8e79d1a1aa 100644 --- a/deps/v8/src/json.js +++ b/deps/v8/src/json.js @@ -210,8 +210,8 @@ function BasicSerializeArray(value, stack, builder) { builder.push(","); val = value[i]; if (IS_NUMBER(val)) { - builder.push(NUMBER_IS_FINITE(val) - ? %_NumberToString(val) + builder.push(NUMBER_IS_FINITE(val) + ? %_NumberToString(val) : "null"); } else { var before = builder.length; @@ -232,7 +232,7 @@ function BasicSerializeArray(value, stack, builder) { } } stack.pop(); - builder.push("]"); + builder.push("]"); } diff --git a/deps/v8/src/regexp.js b/deps/v8/src/regexp.js index 5b7e3a9d2f80..238a27c89ba1 100644 --- a/deps/v8/src/regexp.js +++ b/deps/v8/src/regexp.js @@ -235,7 +235,7 @@ function RegExpTest(string) { // Conversion is required by the ES5 specification (RegExp.prototype.exec // algorithm, step 5) even if the value is discarded for non-global RegExps. var i = TO_INTEGER(lastIndex); - + if (this.global) { if (i < 0 || i > string.length) { this.lastIndex = 0; @@ -250,11 +250,11 @@ function RegExpTest(string) { } lastMatchInfoOverride = null; this.lastIndex = lastMatchInfo[CAPTURE1]; - return true; + return true; } else { // Non-global regexp. - // Remove irrelevant preceeding '.*' in a non-global test regexp. - // The expression checks whether this.source starts with '.*' and + // Remove irrelevant preceeding '.*' in a non-global test regexp. + // The expression checks whether this.source starts with '.*' and // that the third char is not a '?'. if (%_StringCharCodeAt(this.source, 0) == 46 && // '.' %_StringCharCodeAt(this.source, 1) == 42 && // '*' @@ -262,14 +262,14 @@ function RegExpTest(string) { if (!%_ObjectEquals(regexp_key, this)) { regexp_key = this; regexp_val = new $RegExp(SubString(this.source, 2, this.source.length), - (!this.ignoreCase + (!this.ignoreCase ? !this.multiline ? "" : "m" : !this.multiline ? "i" : "im")); } if (%_RegExpExec(regexp_val, string, 0, lastMatchInfo) === null) { return false; } - } + } %_Log('regexp', 'regexp-exec,%0r,%1S,%2i', [this, string, lastIndex]); // matchIndices is either null or the lastMatchInfo array. var matchIndices = %_RegExpExec(this, string, 0, lastMatchInfo); diff --git a/deps/v8/src/string.js b/deps/v8/src/string.js index 2b73e0f6e952..04480b7c0553 100644 --- a/deps/v8/src/string.js +++ b/deps/v8/src/string.js @@ -147,7 +147,7 @@ function StringLastIndexOf(pat /* position */) { // length == 1 // do anything locale specific. function StringLocaleCompare(other) { if (%_ArgumentsLength() === 0) return 0; - return %StringLocaleCompare(TO_STRING_INLINE(this), + return %StringLocaleCompare(TO_STRING_INLINE(this), TO_STRING_INLINE(other)); } @@ -243,7 +243,7 @@ function StringReplace(search, replace) { // the result. function ExpandReplacement(string, subject, matchInfo, builder) { var length = string.length; - var builder_elements = builder.elements; + var builder_elements = builder.elements; var next = %StringIndexOf(string, '$', 0); if (next < 0) { if (length > 0) builder_elements.push(string); diff --git a/deps/v8/src/third_party/valgrind/valgrind.h b/deps/v8/src/third_party/valgrind/valgrind.h index a94dc58bd605..c4e8c595dd91 100644 --- a/deps/v8/src/third_party/valgrind/valgrind.h +++ b/deps/v8/src/third_party/valgrind/valgrind.h @@ -21,16 +21,16 @@ 1. Redistributions of source code must retain the above copyright notice, this list of conditions and the following disclaimer. - 2. The origin of this software must not be misrepresented; you must - not claim that you wrote the original software. If you use this - software in a product, an acknowledgment in the product + 2. The origin of this software must not be misrepresented; you must + not claim that you wrote the original software. If you use this + software in a product, an acknowledgment in the product documentation would be appreciated but is not required. 3. Altered source versions must be plainly marked as such, and must not be misrepresented as being the original software. - 4. The name of the author may not be used to endorse or promote - products derived from this software without specific prior written + 4. The name of the author may not be used to endorse or promote + products derived from this software without specific prior written permission. THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS @@ -52,13 +52,13 @@ the terms of the GNU General Public License, version 2. See the COPYING file in the source distribution for details. - ---------------------------------------------------------------- + ---------------------------------------------------------------- */ /* This file is for inclusion into client (your!) code. - You can use these macros to manipulate and query Valgrind's + You can use these macros to manipulate and query Valgrind's execution inside your own programs. The resulting executables will still run without Valgrind, just a @@ -151,8 +151,8 @@ this is executed not under Valgrind. Args are passed in a memory block, and so there's no intrinsic limit to the number that could be passed, but it's currently five. - - The macro args are: + + The macro args are: _zzq_rlval result lvalue _zzq_default default value (result returned when running on real CPU) _zzq_request request code @@ -178,7 +178,7 @@ #if defined(PLAT_x86_linux) typedef - struct { + struct { unsigned int nraddr; /* where's the code? */ } OrigFn; @@ -232,7 +232,7 @@ typedef #if defined(PLAT_amd64_linux) typedef - struct { + struct { uint64_t nraddr; /* where's the code? */ } OrigFn; @@ -286,7 +286,7 @@ typedef #if defined(PLAT_ppc32_linux) typedef - struct { + struct { unsigned int nraddr; /* where's the code? */ } OrigFn; @@ -346,7 +346,7 @@ typedef #if defined(PLAT_ppc64_linux) typedef - struct { + struct { uint64_t nraddr; /* where's the code? */ uint64_t r2; /* what tocptr do we need? */ } @@ -412,7 +412,7 @@ typedef #if defined(PLAT_ppc32_aix5) typedef - struct { + struct { unsigned int nraddr; /* where's the code? */ unsigned int r2; /* what tocptr do we need? */ } @@ -484,7 +484,7 @@ typedef #if defined(PLAT_ppc64_aix5) typedef - struct { + struct { uint64_t nraddr; /* where's the code? */ uint64_t r2; /* what tocptr do we need? */ } @@ -1482,7 +1482,7 @@ typedef "r0", "r2", "r3", "r4", "r5", "r6", "r7", "r8", "r9", "r10", \ "r11", "r12", "r13" -/* These CALL_FN_ macros assume that on ppc32-linux, +/* These CALL_FN_ macros assume that on ppc32-linux, sizeof(unsigned long) == 4. */ #define CALL_FN_W_v(lval, orig) \ @@ -3582,7 +3582,7 @@ typedef #define VG_IS_TOOL_USERREQ(a, b, v) \ (VG_USERREQ_TOOL_BASE(a,b) == ((v) & 0xffff0000)) -/* !! ABIWARNING !! ABIWARNING !! ABIWARNING !! ABIWARNING !! +/* !! ABIWARNING !! ABIWARNING !! ABIWARNING !! ABIWARNING !! This enum comprises an ABI exported by Valgrind to programs which use client requests. DO NOT CHANGE THE ORDER OF THESE ENTRIES, NOR DELETE ANY -- add new ones at the end. */ @@ -3679,7 +3679,7 @@ VALGRIND_PRINTF(const char *format, ...) va_list vargs; va_start(vargs, format); VALGRIND_DO_CLIENT_REQUEST(_qzz_res, 0, VG_USERREQ__PRINTF, - (unsigned long)format, (unsigned long)vargs, + (unsigned long)format, (unsigned long)vargs, 0, 0, 0); va_end(vargs); return (int)_qzz_res; @@ -3694,7 +3694,7 @@ VALGRIND_PRINTF_BACKTRACE(const char *format, ...) va_list vargs; va_start(vargs, format); VALGRIND_DO_CLIENT_REQUEST(_qzz_res, 0, VG_USERREQ__PRINTF_BACKTRACE, - (unsigned long)format, (unsigned long)vargs, + (unsigned long)format, (unsigned long)vargs, 0, 0, 0); va_end(vargs); return (int)_qzz_res; @@ -3705,7 +3705,7 @@ VALGRIND_PRINTF_BACKTRACE(const char *format, ...) /* These requests allow control to move from the simulated CPU to the real CPU, calling an arbitary function. - + Note that the current ThreadId is inserted as the first argument. So this call: @@ -3786,8 +3786,8 @@ VALGRIND_PRINTF_BACKTRACE(const char *format, ...) use '0' if not. Adding redzones makes it more likely Valgrind will spot block overruns. `is_zeroed' indicates if the memory is zeroed, as it is for calloc(). Put it immediately after the point where a block is - allocated. - + allocated. + If you're using Memcheck: If you're allocating memory via superblocks, and then handing out small chunks of each superblock, if you don't have redzones on your small blocks, it's worth marking the superblock with diff --git a/deps/v8/test/es5conform/es5conform.status b/deps/v8/test/es5conform/es5conform.status index e021fc54dc6e..5d9d4089be79 100644 --- a/deps/v8/test/es5conform/es5conform.status +++ b/deps/v8/test/es5conform/es5conform.status @@ -75,11 +75,11 @@ chapter15/15.2/15.2.3/15.2.3.3/15.2.3.3-4-214: UNIMPLEMENTED # NOT IMPLEMENTED: RegExp.prototype.multiline chapter15/15.2/15.2.3/15.2.3.3/15.2.3.3-4-215: UNIMPLEMENTED -# All of the tests below marked SUBSETFAIL (in 15.2.3.4) fail because +# All of the tests below marked SUBSETFAIL (in 15.2.3.4) fail because # the tests assumes that objects can not have more properties -# than those described in the spec - but according to spec they can +# than those described in the spec - but according to spec they can # have additional properties. -# All compareArray calls in these tests could be exchanged with a +# All compareArray calls in these tests could be exchanged with a # isSubsetOfArray call (I will upload a patch to the es5conform site). # SUBSETFAIL diff --git a/deps/v8/test/mjsunit/apply.js b/deps/v8/test/mjsunit/apply.js index 613d37d9e391..afc59a8c205d 100644 --- a/deps/v8/test/mjsunit/apply.js +++ b/deps/v8/test/mjsunit/apply.js @@ -186,7 +186,7 @@ primes[0] = ""; primes[1] = holey; assertThrows("String.prototype.concat.apply.apply('foo', primes)"); assertEquals("morseper", - String.prototype.concat.apply.apply(String.prototype.concat, primes), + String.prototype.concat.apply.apply(String.prototype.concat, primes), "moreseper-prime"); delete(Array.prototype["1"]); diff --git a/deps/v8/test/mjsunit/array-constructor.js b/deps/v8/test/mjsunit/array-constructor.js index 063ccde5832d..bf5d3d611a9d 100644 --- a/deps/v8/test/mjsunit/array-constructor.js +++ b/deps/v8/test/mjsunit/array-constructor.js @@ -73,7 +73,7 @@ for (var i = 0; i < loop_count; i++) { a = new Array(0, 1, 2, 3, 4, 5, 6, 7, 8); assertArrayEquals([0, 1, 2, 3, 4, 5, 6, 7, 8], a); a = new Array(0, 1, 2, 3, 4, 5, 6, 7, 8, 9); - assertArrayEquals([0, 1, 2, 3, 4, 5, 6, 7, 8, 9], a); + assertArrayEquals([0, 1, 2, 3, 4, 5, 6, 7, 8, 9], a); } @@ -91,9 +91,9 @@ function testConstructOfSizeSize(n) { var a = eval('[' + str + ']'); var b = eval('new Array(' + str + ')') var c = eval('Array(' + str + ')') - assertEquals(n, a.length); - assertArrayEquals(a, b); - assertArrayEquals(a, c); + assertEquals(n, a.length); + assertArrayEquals(a, b); + assertArrayEquals(a, c); } diff --git a/deps/v8/test/mjsunit/array-iteration.js b/deps/v8/test/mjsunit/array-iteration.js index f11b51cb8ff1..0ee2e6e9ac39 100644 --- a/deps/v8/test/mjsunit/array-iteration.js +++ b/deps/v8/test/mjsunit/array-iteration.js @@ -134,7 +134,7 @@ a = [0,1]; assertFalse(a.every(function(n, index, array) { array[index] = n + 1; return n == 1;})); assertArrayEquals([1,1], a); - + // Only loop through initial part of array eventhough elements are // added. a = [1,1]; @@ -156,23 +156,23 @@ // (function() { var a = [0,1,2,3,4]; - + // Simple use. var result = [1,2,3,4,5]; assertArrayEquals(result, a.map(function(n) { return n + 1; })); assertEquals(a, a); - + // Use specified object as this object when calling the function. var o = { delta: 42 } result = [42,43,44,45,46]; assertArrayEquals(result, a.map(function(n) { return this.delta + n; }, o)); - + // Modify original array. a = [0,1,2,3,4]; result = [1,2,3,4,5]; assertArrayEquals(result, a.map(function(n, index, array) { array[index] = n + 1; return n + 1;})); assertArrayEquals(result, a); - + // Only loop through initial part of array eventhough elements are // added. a = [0,1,2,3,4]; @@ -197,7 +197,7 @@ // Simple use. assertTrue(a.some(function(n) { return n == 3})); assertFalse(a.some(function(n) { return n == 5})); - + // Use specified object as this object when calling the function. var o = { element: 42 }; a = [1,42,3]; diff --git a/deps/v8/test/mjsunit/array-sort.js b/deps/v8/test/mjsunit/array-sort.js index 7060c5f366a4..489f93e087e9 100644 --- a/deps/v8/test/mjsunit/array-sort.js +++ b/deps/v8/test/mjsunit/array-sort.js @@ -363,7 +363,7 @@ TestSpecialCasesInheritedElementSort(); // Test that sort calls compare function with global object as receiver, // and with only elements of the array as arguments. -function o(v) { +function o(v) { return {__proto__: o.prototype, val: v}; } var arr = [o(1), o(2), o(4), o(8), o(16), o(32), o(64), o(128), o(256), o(-0)]; diff --git a/deps/v8/test/mjsunit/bugs/618.js b/deps/v8/test/mjsunit/bugs/618.js index afa9929a60ed..ddc0c19c8866 100644 --- a/deps/v8/test/mjsunit/bugs/618.js +++ b/deps/v8/test/mjsunit/bugs/618.js @@ -32,14 +32,14 @@ function C1() { var c1 = new C1(); assertEquals(23, c1.x); assertEquals("undefined", typeof c1.y); - + // Add setter somewhere on the prototype chain after having constructed the // first instance. C1.prototype = { set x(value) { this.y = 23; } }; var c1 = new C1(); assertEquals("undefined", typeof c1.x); assertEquals(23, c1.y); - + // Simple class using inline constructor. function C2() { this.x = 23; diff --git a/deps/v8/test/mjsunit/bugs/bug-618.js b/deps/v8/test/mjsunit/bugs/bug-618.js index 8f4744035411..ae843267ff5f 100644 --- a/deps/v8/test/mjsunit/bugs/bug-618.js +++ b/deps/v8/test/mjsunit/bugs/bug-618.js @@ -33,11 +33,11 @@ function C() { this.x = 23; } -// If a setter is added to the prototype chain of a simple constructor setting -// one of the properties assigned in the constructor then this setter is +// If a setter is added to the prototype chain of a simple constructor setting +// one of the properties assigned in the constructor then this setter is // ignored when constructing new objects from the constructor. -// This only happens if the setter is added _after_ an instance has been +// This only happens if the setter is added _after_ an instance has been // created. assertEquals(23, new C().x); diff --git a/deps/v8/test/mjsunit/const-redecl.js b/deps/v8/test/mjsunit/const-redecl.js index 26d765b97a31..945970891b3e 100644 --- a/deps/v8/test/mjsunit/const-redecl.js +++ b/deps/v8/test/mjsunit/const-redecl.js @@ -55,7 +55,7 @@ function TestLocal(s,e) { function TestGlobal(s,e) { // Collect the global properties before the call. var properties = []; - for (var key in this) properties.push(key); + for (var key in this) properties.push(key); // Compute the result. var result; try { @@ -113,7 +113,7 @@ function TestConflict(def0, def1) { // Eval second definition. TestAll("TypeError", def0 + '; eval("' + def1 + '")'); // Eval both definitions separately. - TestAll("TypeError", 'eval("' + def0 +'"); eval("' + def1 + '")'); + TestAll("TypeError", 'eval("' + def0 +'"); eval("' + def1 + '")'); } diff --git a/deps/v8/test/mjsunit/debug-compile-event.js b/deps/v8/test/mjsunit/debug-compile-event.js index b00a907a3cf7..94dddfa1049f 100644 --- a/deps/v8/test/mjsunit/debug-compile-event.js +++ b/deps/v8/test/mjsunit/debug-compile-event.js @@ -81,7 +81,7 @@ function listener(event, exec_state, event_data, data) { assertTrue('context' in msg.body.script); // Check that we pick script name from //@ sourceURL, iff present - assertEquals(current_source.indexOf('sourceURL') >= 0 ? + assertEquals(current_source.indexOf('sourceURL') >= 0 ? 'myscript.js' : undefined, event_data.script().name()); } diff --git a/deps/v8/test/mjsunit/debug-evaluate-recursive.js b/deps/v8/test/mjsunit/debug-evaluate-recursive.js index 6ee391b63bff..f34943e5f40a 100644 --- a/deps/v8/test/mjsunit/debug-evaluate-recursive.js +++ b/deps/v8/test/mjsunit/debug-evaluate-recursive.js @@ -110,7 +110,7 @@ function listener_recurse(event, exec_state, event_data, data) { if (event == Debug.DebugEvent.Break) { break_count++; - + // Call functions with break using the FrameMirror directly. if (break_count == 1) { // First break event evaluates with break enabled. diff --git a/deps/v8/test/mjsunit/debug-handle.js b/deps/v8/test/mjsunit/debug-handle.js index 98875ceb4168..1582b9f12192 100644 --- a/deps/v8/test/mjsunit/debug-handle.js +++ b/deps/v8/test/mjsunit/debug-handle.js @@ -72,7 +72,7 @@ function lookupRequest(exec_state, arguments, success) { // The base part of all lookup requests. var base_request = '"seq":0,"type":"request","command":"lookup"' - + // Generate request with the supplied arguments. var request; if (arguments) { @@ -214,7 +214,7 @@ function listener(event, exec_state, event_data, data) { 'Handle not in the request: ' + handle); count++; } - assertEquals(count, obj.properties.length, + assertEquals(count, obj.properties.length, 'Unexpected number of resolved objects'); diff --git a/deps/v8/test/mjsunit/debug-listbreakpoints.js b/deps/v8/test/mjsunit/debug-listbreakpoints.js index de0114fe098b..1d4755fd1b7f 100644 --- a/deps/v8/test/mjsunit/debug-listbreakpoints.js +++ b/deps/v8/test/mjsunit/debug-listbreakpoints.js @@ -39,7 +39,7 @@ Debug = debug.Debug // below. The test checks for these line numbers. function g() { // line 40 - var x = 5; + var x = 5; var y = 6; var z = 7; }; diff --git a/deps/v8/test/mjsunit/debug-references.js b/deps/v8/test/mjsunit/debug-references.js index ab6c6292e35a..763e354fc801 100644 --- a/deps/v8/test/mjsunit/debug-references.js +++ b/deps/v8/test/mjsunit/debug-references.js @@ -52,7 +52,7 @@ function testRequest(dcp, arguments, success, count) { } else { request = '{' + base_request + '}' } - + // Process the request and check expectation. var response = safeEval(dcp.processDebugJSONRequest(request)); if (success) { @@ -88,7 +88,7 @@ function listener(event, exec_state, event_data, data) { var response = safeEval(dcp.processDebugJSONRequest(evaluate_point)); assertTrue(response.success, "Evaluation of Point failed"); var handle = response.body.handle; - + // Test some legal references requests. testRequest(dcp, '{"handle":' + handle + ',"type":"referencedBy"}', true); testRequest(dcp, '{"handle":' + handle + ',"type":"constructedBy"}', diff --git a/deps/v8/test/mjsunit/debug-return-value.js b/deps/v8/test/mjsunit/debug-return-value.js index 3982ea91b381..02d6a7cbc93f 100644 --- a/deps/v8/test/mjsunit/debug-return-value.js +++ b/deps/v8/test/mjsunit/debug-return-value.js @@ -103,12 +103,12 @@ function listener(event, exec_state, event_data, data) { // Position at the end of the function. assertEquals(debugger_source_position + 50, exec_state.frame(0).sourcePosition()); - + // Just about to return from the function. assertTrue(exec_state.frame(0).isAtReturn()) assertEquals(expected_return_value, exec_state.frame(0).returnValue().value()); - + // Check the same using the JSON commands. var dcp = exec_state.debugCommandProcessor(false); var request = '{"seq":0,"type":"request","command":"backtrace"}'; @@ -118,7 +118,7 @@ function listener(event, exec_state, event_data, data) { assertTrue(frames[0].atReturn); assertEquals(expected_return_value, response.lookup(frames[0].returnValue.ref).value); - + listener_complete = true; } } @@ -132,7 +132,7 @@ Debug.setListener(listener); // Four steps from the debugger statement in this function will position us at // the function return. -// 0 1 2 3 4 5 +// 0 1 2 3 4 5 // 0123456789012345678901234567890123456789012345678901 function f(x) {debugger; if (x) { return 1; } else { return 2; } }; diff --git a/deps/v8/test/mjsunit/debug-stepin-call-function-stub.js b/deps/v8/test/mjsunit/debug-stepin-call-function-stub.js index c5cf8fdf3a77..053b8bfe8a99 100644 --- a/deps/v8/test/mjsunit/debug-stepin-call-function-stub.js +++ b/deps/v8/test/mjsunit/debug-stepin-call-function-stub.js @@ -62,7 +62,7 @@ function listener(event, exec_state, event_data, data) { Debug.setListener(listener); -function g() { +function g() { return "s"; // expected line } @@ -71,7 +71,7 @@ function testFunction() { var s = 1 +f(10); } -function g2() { +function g2() { return "s2"; // expected line } diff --git a/deps/v8/test/mjsunit/debug-stepin-constructor.js b/deps/v8/test/mjsunit/debug-stepin-constructor.js index 6ee33473529e..5549814a6506 100644 --- a/deps/v8/test/mjsunit/debug-stepin-constructor.js +++ b/deps/v8/test/mjsunit/debug-stepin-constructor.js @@ -38,7 +38,7 @@ function listener(event, exec_state, event_data, data) { if (exec_state.frameCount() > 1) { exec_state.prepareStep(Debug.StepAction.StepIn); } - + // Test that there is a script. assertTrue(typeof(event_data.func().script()) == 'object'); } diff --git a/deps/v8/test/mjsunit/delete-in-with.js b/deps/v8/test/mjsunit/delete-in-with.js index 1efc18de11fd..cbcfe991b891 100644 --- a/deps/v8/test/mjsunit/delete-in-with.js +++ b/deps/v8/test/mjsunit/delete-in-with.js @@ -29,6 +29,6 @@ // objects from within 'with' statements. (function(){ var tmp = { x: 12 }; - with (tmp) { assertTrue(delete x); } + with (tmp) { assertTrue(delete x); } assertFalse("x" in tmp); })(); diff --git a/deps/v8/test/mjsunit/function-bind.js b/deps/v8/test/mjsunit/function-bind.js index 7a72cd5e4942..8f54b964a444 100644 --- a/deps/v8/test/mjsunit/function-bind.js +++ b/deps/v8/test/mjsunit/function-bind.js @@ -62,7 +62,7 @@ var y = 44; function f_bound_this(z) { return z + this.y - this.x; -} +} assertEquals(3, f_bound_this(1)) f = f_bound_this.bind(obj); @@ -75,7 +75,7 @@ assertEquals(0, f.length); // Test chained binds. -// When only giving the thisArg, any number of binds should have +// When only giving the thisArg, any number of binds should have // the same effect. f = foo.bind(foo); assertEquals(3, f(1, 1, 1)); diff --git a/deps/v8/test/mjsunit/function-source.js b/deps/v8/test/mjsunit/function-source.js index 75257756d686..8f2fc2265c36 100644 --- a/deps/v8/test/mjsunit/function-source.js +++ b/deps/v8/test/mjsunit/function-source.js @@ -36,7 +36,7 @@ function f() { } h(); } - + function g() { function h() { assertEquals(Debug.scriptSource(f), Debug.scriptSource(h)); diff --git a/deps/v8/test/mjsunit/get-own-property-descriptor.js b/deps/v8/test/mjsunit/get-own-property-descriptor.js index 79c1fac6ae84..abb24200343d 100644 --- a/deps/v8/test/mjsunit/get-own-property-descriptor.js +++ b/deps/v8/test/mjsunit/get-own-property-descriptor.js @@ -27,7 +27,7 @@ // This file only tests very simple descriptors that always have // configurable, enumerable, and writable set to true. -// A range of more elaborate tests are performed in +// A range of more elaborate tests are performed in // object-define-property.js function get() { return x; } diff --git a/deps/v8/test/mjsunit/global-deleted-property-keyed.js b/deps/v8/test/mjsunit/global-deleted-property-keyed.js index 1a1d3cb99bc3..dba3a4d4057c 100644 --- a/deps/v8/test/mjsunit/global-deleted-property-keyed.js +++ b/deps/v8/test/mjsunit/global-deleted-property-keyed.js @@ -33,6 +33,6 @@ var name = "fisk"; natives[name] = name; function foo() { natives[name] + 12; } -for(var i = 0; i < 3; i++) foo(); +for(var i = 0; i < 3; i++) foo(); delete natives[name]; for(var i = 0; i < 3; i++) foo(); diff --git a/deps/v8/test/mjsunit/html-string-funcs.js b/deps/v8/test/mjsunit/html-string-funcs.js index 213b7f341210..b640639d8a3b 100644 --- a/deps/v8/test/mjsunit/html-string-funcs.js +++ b/deps/v8/test/mjsunit/html-string-funcs.js @@ -29,7 +29,7 @@ // HTML. function CheckSimple(f, tag) { assertEquals('<' + tag + '>foo', - "foo"[f]().toLowerCase()); + "foo"[f]().toLowerCase()); }; var simple = { big: 'big', blink: 'blink', bold: 'b', fixed: 'tt', italics: 'i', small: 'small', diff --git a/deps/v8/test/mjsunit/in.js b/deps/v8/test/mjsunit/in.js index f98db42f6197..cca618782795 100644 --- a/deps/v8/test/mjsunit/in.js +++ b/deps/v8/test/mjsunit/in.js @@ -86,7 +86,7 @@ a[1] = 2; assertFalse(0 in a); assertTrue(1 in a); assertFalse(2 in a); -assertFalse('0' in a); +assertFalse('0' in a); assertTrue('1' in a); assertFalse('2' in a); assertTrue('toString' in a, "toString"); diff --git a/deps/v8/test/mjsunit/instanceof.js b/deps/v8/test/mjsunit/instanceof.js index 01ea4268e6d6..050ef2d9d77d 100644 --- a/deps/v8/test/mjsunit/instanceof.js +++ b/deps/v8/test/mjsunit/instanceof.js @@ -60,10 +60,10 @@ TestChains(); function TestExceptions() { function F() { } - var items = [ 1, new Number(42), - true, + var items = [ 1, new Number(42), + true, 'string', new String('hest'), - {}, [], + {}, [], F, new F(), Object, String ]; diff --git a/deps/v8/test/mjsunit/json.js b/deps/v8/test/mjsunit/json.js index 812ffeb5a7ba..8994defd46c8 100644 --- a/deps/v8/test/mjsunit/json.js +++ b/deps/v8/test/mjsunit/json.js @@ -67,7 +67,7 @@ var d4 = {toJSON: Date.prototype.toJSON, valueOf: "not callable", toString: "not callable either", toISOString: function() { return 42; }}; -assertThrows("d4.toJSON()", TypeError); // ToPrimitive throws. +assertThrows("d4.toJSON()", TypeError); // ToPrimitive throws. var d5 = {toJSON: Date.prototype.toJSON, valueOf: "not callable", @@ -419,9 +419,9 @@ assertEquals('"42"', JSON.stringify(falseNum)); // We don't currently allow plain properties called __proto__ in JSON // objects in JSON.parse. Instead we read them as we would JS object // literals. If we change that, this test should change with it. -// -// Parse a non-object value as __proto__. This must not create a -// __proto__ property different from the original, and should not +// +// Parse a non-object value as __proto__. This must not create a +// __proto__ property different from the original, and should not // change the original. var o = JSON.parse('{"__proto__":5}'); assertEquals(Object.prototype, o.__proto__); // __proto__ isn't changed. diff --git a/deps/v8/test/mjsunit/keyed-storage-extend.js b/deps/v8/test/mjsunit/keyed-storage-extend.js index 04d2f0477aa2..d7e157b84654 100644 --- a/deps/v8/test/mjsunit/keyed-storage-extend.js +++ b/deps/v8/test/mjsunit/keyed-storage-extend.js @@ -37,7 +37,7 @@ function GrowNamed(o) { } function GrowKeyed(o) { - var names = ['a','b','c','d','e','f']; + var names = ['a','b','c','d','e','f']; var i = 0; o[names[i++]] = i; o[names[i++]] = i; diff --git a/deps/v8/test/mjsunit/math-sqrt.js b/deps/v8/test/mjsunit/math-sqrt.js index fb00d5ba8ab1..b8fd2cb63c2e 100644 --- a/deps/v8/test/mjsunit/math-sqrt.js +++ b/deps/v8/test/mjsunit/math-sqrt.js @@ -29,7 +29,7 @@ function test(expected_sqrt, value) { assertEquals(expected_sqrt, Math.sqrt(value)); - if (isFinite(value)) { + if (isFinite(value)) { assertEquals(expected_sqrt, Math.pow(value, 0.5)); } } diff --git a/deps/v8/test/mjsunit/mirror-array.js b/deps/v8/test/mjsunit/mirror-array.js index eb8f72a8c993..92e3913f31eb 100644 --- a/deps/v8/test/mjsunit/mirror-array.js +++ b/deps/v8/test/mjsunit/mirror-array.js @@ -64,7 +64,7 @@ function testArrayMirror(a, names) { assertTrue(mirror.protoObject() instanceof debug.Mirror, 'Unexpected mirror hierachy'); assertTrue(mirror.prototypeObject() instanceof debug.Mirror, 'Unexpected mirror hierachy'); assertEquals(mirror.length(), a.length, "Length mismatch"); - + var indexedProperties = mirror.indexedPropertiesFromRange(); assertEquals(indexedProperties.length, a.length); for (var i = 0; i < indexedProperties.length; i++) { @@ -110,7 +110,7 @@ function testArrayMirror(a, names) { var found = false; for (var j = 0; j < fromJSON.properties.length; j++) { if (names[i] == fromJSON.properties[j].name) { - found = true; + found = true; } } assertTrue(found, names[i]) diff --git a/deps/v8/test/mjsunit/mirror-function.js b/deps/v8/test/mjsunit/mirror-function.js index 58aee3dae8e0..cda815df68d7 100644 --- a/deps/v8/test/mjsunit/mirror-function.js +++ b/deps/v8/test/mjsunit/mirror-function.js @@ -65,7 +65,7 @@ function testFunctionMirror(f) { assertTrue(mirror.constructorFunction() instanceof debug.ObjectMirror); assertTrue(mirror.protoObject() instanceof debug.Mirror); assertTrue(mirror.prototypeObject() instanceof debug.Mirror); - + // Test text representation assertEquals(f.toString(), mirror.toText()); diff --git a/deps/v8/test/mjsunit/mirror-object.js b/deps/v8/test/mjsunit/mirror-object.js index 188855497d23..8ce43b6d985b 100644 --- a/deps/v8/test/mjsunit/mirror-object.js +++ b/deps/v8/test/mjsunit/mirror-object.js @@ -130,7 +130,7 @@ function testObjectMirror(obj, cls_name, ctor_name, hasSpecialProperties) { assertTrue(typeof(fromJSON.properties[i].attributes) === 'undefined', 'Unexpected serialized attributes'); } - // Lookup the serialized object from the handle reference. + // Lookup the serialized object from the handle reference. var o = refs.lookup(fromJSON.properties[i].ref); assertTrue(o != void 0, 'Referenced object is not serialized'); diff --git a/deps/v8/test/mjsunit/mirror-script.js b/deps/v8/test/mjsunit/mirror-script.js index 71561701a238..1d64ac26bf7a 100644 --- a/deps/v8/test/mjsunit/mirror-script.js +++ b/deps/v8/test/mjsunit/mirror-script.js @@ -62,7 +62,7 @@ function testScriptMirror(f, file_name, file_lines, type, compilation_type, if (eval_from_line) { assertEquals(eval_from_line, mirror.evalFromLocation().line); } - + // Parse JSON representation and check. var fromJSON = JSON.parse(json); assertEquals('script', fromJSON.type); diff --git a/deps/v8/test/mjsunit/mirror-unresolved-function.js b/deps/v8/test/mjsunit/mirror-unresolved-function.js index c1fe4a3ef094..46f22a08a767 100644 --- a/deps/v8/test/mjsunit/mirror-unresolved-function.js +++ b/deps/v8/test/mjsunit/mirror-unresolved-function.js @@ -64,7 +64,7 @@ assertEquals(void 0, mirror.source()); assertEquals('undefined', mirror.constructorFunction().type()); assertEquals('undefined', mirror.protoObject().type()); assertEquals('undefined', mirror.prototypeObject().type()); - + // Parse JSON representation of unresolved functions and check. var fromJSON = eval('(' + json + ')'); assertEquals('function', fromJSON.type, 'Unexpected mirror type in JSON'); diff --git a/deps/v8/test/mjsunit/no-semicolon.js b/deps/v8/test/mjsunit/no-semicolon.js index fa6ccba89dc9..c939c3922acb 100644 --- a/deps/v8/test/mjsunit/no-semicolon.js +++ b/deps/v8/test/mjsunit/no-semicolon.js @@ -30,7 +30,7 @@ function f() { return } -function g() { +function g() { return 4; } diff --git a/deps/v8/test/mjsunit/object-define-properties.js b/deps/v8/test/mjsunit/object-define-properties.js index 6b3725b392f4..128df694d3a6 100644 --- a/deps/v8/test/mjsunit/object-define-properties.js +++ b/deps/v8/test/mjsunit/object-define-properties.js @@ -26,7 +26,7 @@ // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. // Tests the Object.defineProperties method - ES 15.2.3.7 -// Note that the internal DefineOwnProperty method is tested through +// Note that the internal DefineOwnProperty method is tested through // object-define-property.js, this file only contains tests specific for // Object.defineProperties. Also note that object-create.js contains // a range of indirect tests on this method since Object.create uses diff --git a/deps/v8/test/mjsunit/object-freeze.js b/deps/v8/test/mjsunit/object-freeze.js index 15e19abbd18f..21ef85dae83f 100644 --- a/deps/v8/test/mjsunit/object-freeze.js +++ b/deps/v8/test/mjsunit/object-freeze.js @@ -88,7 +88,7 @@ assertFalse(desc.configurable); assertEquals("foobar", desc.value); // Make sure that even if we try overwrite a value that is not writable, it is -// not changed. +// not changed. obj.x = "tete"; assertEquals(42, obj.x); obj.x = { get: function() {return 43}, set: function() {} }; diff --git a/deps/v8/test/mjsunit/object-literal-conversions.js b/deps/v8/test/mjsunit/object-literal-conversions.js index 8540d93082d3..7db2cf519c74 100644 --- a/deps/v8/test/mjsunit/object-literal-conversions.js +++ b/deps/v8/test/mjsunit/object-literal-conversions.js @@ -43,4 +43,3 @@ var test6 = { 17.31: function() {}, "17.31": 7 }; assertEquals(7, test5[13]); assertEquals(7, test6[17.31]); - \ No newline at end of file diff --git a/deps/v8/test/mjsunit/object-literal-overwrite.js b/deps/v8/test/mjsunit/object-literal-overwrite.js index 5c58a2ddb68f..59486e370ea7 100644 --- a/deps/v8/test/mjsunit/object-literal-overwrite.js +++ b/deps/v8/test/mjsunit/object-literal-overwrite.js @@ -79,7 +79,7 @@ assertEquals(7, foo7[15]); // Test for the classic code generator. function fun(x) { - var inner = { j: function(x) { return x; }, j: 7 }; + var inner = { j: function(x) { return x; }, j: 7 }; return inner.j; } diff --git a/deps/v8/test/mjsunit/object-prevent-extensions.js b/deps/v8/test/mjsunit/object-prevent-extensions.js index ebc2cfa69d6d..aa3b7148b773 100644 --- a/deps/v8/test/mjsunit/object-prevent-extensions.js +++ b/deps/v8/test/mjsunit/object-prevent-extensions.js @@ -33,7 +33,7 @@ var obj1 = {}; assertTrue(Object.isExtensible(obj1)); Object.preventExtensions(obj1); -// Make sure the is_extensible flag is set. +// Make sure the is_extensible flag is set. assertFalse(Object.isExtensible(obj1)); // Try adding a new property. try { diff --git a/deps/v8/test/mjsunit/object-seal.js b/deps/v8/test/mjsunit/object-seal.js index 9e7f44b9c685..0f14b3fe03e1 100644 --- a/deps/v8/test/mjsunit/object-seal.js +++ b/deps/v8/test/mjsunit/object-seal.js @@ -151,7 +151,7 @@ assertFalse(Object.isSealed(arr)); Object.seal(arr); assertTrue(Object.isSealed(arr)); assertFalse(Object.isExtensible(arr)); -// Since the values in the array is still writable this object +// Since the values in the array is still writable this object // is not frozen. assertFalse(Object.isFrozen(arr)); diff --git a/deps/v8/test/mjsunit/regexp-capture.js b/deps/v8/test/mjsunit/regexp-capture.js index dc24491d9c2b..026af3cab78b 100755 --- a/deps/v8/test/mjsunit/regexp-capture.js +++ b/deps/v8/test/mjsunit/regexp-capture.js @@ -39,16 +39,16 @@ assertEquals(0, "y".search(/(x)?\1y/)); assertEquals("z", "y".replace(/(x)?\1y/, "z")); assertEquals("", "y".replace(/(x)?y/, "$1")); assertEquals("undefined", "y".replace(/(x)?\1y/, - function($0, $1){ - return String($1); + function($0, $1){ + return String($1); })); -assertEquals("undefined", "y".replace(/(x)?y/, - function($0, $1){ - return String($1); +assertEquals("undefined", "y".replace(/(x)?y/, + function($0, $1){ + return String($1); })); -assertEquals("undefined", "y".replace(/(x)?y/, - function($0, $1){ - return $1; +assertEquals("undefined", "y".replace(/(x)?y/, + function($0, $1){ + return $1; })); // See https://bugzilla.mozilla.org/show_bug.cgi?id=476146 diff --git a/deps/v8/test/mjsunit/regexp-compile.js b/deps/v8/test/mjsunit/regexp-compile.js index 6f8e75196d45..36ddb43f5a5d 100644 --- a/deps/v8/test/mjsunit/regexp-compile.js +++ b/deps/v8/test/mjsunit/regexp-compile.js @@ -27,7 +27,7 @@ // Test that we don't cache the result of a regexp match across a // compile event. -var re = /x/; +var re = /x/; assertEquals("a.yb", "axyb".replace(re, ".")); re.compile("y") diff --git a/deps/v8/test/mjsunit/regexp.js b/deps/v8/test/mjsunit/regexp.js index 24e1b21e849b..a9beacc3dad4 100644 --- a/deps/v8/test/mjsunit/regexp.js +++ b/deps/v8/test/mjsunit/regexp.js @@ -435,8 +435,8 @@ assertEquals(0, re.lastIndex); re.lastIndex = 42; re.someOtherProperty = 42; re.someDeletableProperty = 42; -re[37] = 37; -re[42] = 42; +re[37] = 37; +re[42] = 42; re.compile("ra+", "i"); assertEquals("ra+", re.source); @@ -466,7 +466,7 @@ assertEquals(37, re.someOtherProperty); assertEquals(37, re[42]); // Test boundary-checks. -function assertRegExpTest(re, input, test) { +function assertRegExpTest(re, input, test) { assertEquals(test, re.test(input), "test:" + re + ":" + input); } @@ -525,7 +525,7 @@ for (var i = 0; i < 100; i++) { assertEquals(1, res.index); assertEquals("axyzb", res.input); assertEquals(undefined, res.foobar); - + res.foobar = "Arglebargle"; res[3] = "Glopglyf"; assertEquals("Arglebargle", res.foobar); @@ -534,18 +534,18 @@ for (var i = 0; i < 100; i++) { // Test that we perform the spec required conversions in the correct order. var log; var string = "the string"; -var fakeLastIndex = { - valueOf: function() { +var fakeLastIndex = { + valueOf: function() { log.push("li"); return 0; - } + } }; -var fakeString = { +var fakeString = { toString: function() { log.push("ts"); return string; - }, - length: 0 + }, + length: 0 }; var re = /str/; diff --git a/deps/v8/test/mjsunit/regress/regress-1081309.js b/deps/v8/test/mjsunit/regress/regress-1081309.js index 009ede15166d..5a6c52412ed7 100644 --- a/deps/v8/test/mjsunit/regress/regress-1081309.js +++ b/deps/v8/test/mjsunit/regress/regress-1081309.js @@ -67,7 +67,7 @@ function listener(event, exec_state, event_data, data) { // The expected backtrace is // 1: g // 0: [anonymous] - + // Get the debug command processor. var dcp = exec_state.debugCommandProcessor(false); diff --git a/deps/v8/test/mjsunit/regress/regress-1092.js b/deps/v8/test/mjsunit/regress/regress-1092.js index 0b29231a4b3d..00422cb452f5 100644 --- a/deps/v8/test/mjsunit/regress/regress-1092.js +++ b/deps/v8/test/mjsunit/regress/regress-1092.js @@ -25,7 +25,7 @@ // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. -// Test that CodeGenerator::EmitKeyedPropertyAssignment for the start +// Test that CodeGenerator::EmitKeyedPropertyAssignment for the start // of an initialization block doesn't normalize the properties of the // JSGlobalProxy. this.w = 0; diff --git a/deps/v8/test/mjsunit/regress/regress-1110.js b/deps/v8/test/mjsunit/regress/regress-1110.js index 204a87ba3d16..43b8d77aeb76 100644 --- a/deps/v8/test/mjsunit/regress/regress-1110.js +++ b/deps/v8/test/mjsunit/regress/regress-1110.js @@ -29,7 +29,7 @@ try { function Crash() { continue;if (Crash) { - } } + } } Crash(); assertTrue(false); } catch (e) { diff --git a/deps/v8/test/mjsunit/regress/regress-1213575.js b/deps/v8/test/mjsunit/regress/regress-1213575.js index 0c3dcc28c604..9d82064e4730 100644 --- a/deps/v8/test/mjsunit/regress/regress-1213575.js +++ b/deps/v8/test/mjsunit/regress/regress-1213575.js @@ -33,7 +33,7 @@ this.__defineSetter__('x', function(value) { assertTrue(false); }); var caught = false; try { - eval('const x'); + eval('const x'); } catch(e) { assertTrue(e instanceof TypeError); caught = true; diff --git a/deps/v8/test/mjsunit/regress/regress-1919169.js b/deps/v8/test/mjsunit/regress/regress-1919169.js index 774f26558d1f..a73231289ff5 100644 --- a/deps/v8/test/mjsunit/regress/regress-1919169.js +++ b/deps/v8/test/mjsunit/regress/regress-1919169.js @@ -30,7 +30,7 @@ function test() { var s2 = "s2"; for (var i = 0; i < 2; i++) { // Crashes in round i==1 with IllegalAccess in %StringAdd(x,y) - var res = 1 + s2; + var res = 1 + s2; s2 = 2; } } diff --git a/deps/v8/test/mjsunit/regress/regress-20070207.js b/deps/v8/test/mjsunit/regress/regress-20070207.js index e90b2ec589d1..b7f7a5cc6fda 100644 --- a/deps/v8/test/mjsunit/regress/regress-20070207.js +++ b/deps/v8/test/mjsunit/regress/regress-20070207.js @@ -26,7 +26,7 @@ // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. // The following regression test illustrates a problem in using the -// value of setting a property in the arguments object. +// value of setting a property in the arguments object. function f(s) { arguments.length; diff --git a/deps/v8/test/mjsunit/regress/regress-269.js b/deps/v8/test/mjsunit/regress/regress-269.js index 49b24c0b43d3..746586125eb7 100644 --- a/deps/v8/test/mjsunit/regress/regress-269.js +++ b/deps/v8/test/mjsunit/regress/regress-269.js @@ -40,7 +40,7 @@ Debug.setListener(listener); function g() { } - + function f() { debugger; g.apply(null, ['']); diff --git a/deps/v8/test/mjsunit/regress/regress-619.js b/deps/v8/test/mjsunit/regress/regress-619.js index 24bdbc187989..4d3e66b29821 100644 --- a/deps/v8/test/mjsunit/regress/regress-619.js +++ b/deps/v8/test/mjsunit/regress/regress-619.js @@ -25,7 +25,7 @@ // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. -// Tests that Object.defineProperty works correctly on array indices. +// Tests that Object.defineProperty works correctly on array indices. // Please see http://code.google.com/p/v8/issues/detail?id=619 for details. var obj = {}; diff --git a/deps/v8/test/mjsunit/regress/regress-678525.js b/deps/v8/test/mjsunit/regress/regress-678525.js index 5ff9c3d9e419..11eaf74fc815 100644 --- a/deps/v8/test/mjsunit/regress/regress-678525.js +++ b/deps/v8/test/mjsunit/regress/regress-678525.js @@ -36,16 +36,16 @@ assertEquals(7, '\7'.charCodeAt(0)); assertEquals(56, '\8'.charCodeAt(0)); assertEquals('\010', '\10'); -assertEquals('\011', '\11'); +assertEquals('\011', '\11'); assertEquals('\012', '\12'); assertEquals('\013', '\13'); assertEquals('\014', '\14'); assertEquals('\015', '\15'); assertEquals('\016', '\16'); assertEquals('\017', '\17'); - + assertEquals('\020', '\20'); -assertEquals('\021', '\21'); +assertEquals('\021', '\21'); assertEquals('\022', '\22'); assertEquals('\023', '\23'); assertEquals('\024', '\24'); @@ -56,4 +56,4 @@ assertEquals('\027', '\27'); assertEquals(73, '\111'.charCodeAt(0)); assertEquals(105, '\151'.charCodeAt(0)); - + diff --git a/deps/v8/test/mjsunit/regress/regress-696.js b/deps/v8/test/mjsunit/regress/regress-696.js index 21977e1c822c..e443c4243dc8 100644 --- a/deps/v8/test/mjsunit/regress/regress-696.js +++ b/deps/v8/test/mjsunit/regress/regress-696.js @@ -28,7 +28,7 @@ // See: http://code.google.com/p/v8/issues/detail?id=696 // Because of the change in dateparser in revision 4557 to support time // only strings in Date.parse we also misleadingly supported strings with non -// leading numbers. +// leading numbers. assertTrue(isNaN(Date.parse('x'))); assertTrue(isNaN(Date.parse('1x'))); diff --git a/deps/v8/test/mjsunit/regress/regress-720.js b/deps/v8/test/mjsunit/regress/regress-720.js index 97e1284e09ad..267b32d08859 100644 --- a/deps/v8/test/mjsunit/regress/regress-720.js +++ b/deps/v8/test/mjsunit/regress/regress-720.js @@ -27,7 +27,7 @@ // This regression test is used to ensure that Object.defineProperty // keeps the existing value of the writable flag if none is given -// in the provided descriptor. +// in the provided descriptor. // See: http://code.google.com/p/v8/issues/detail?id=720 var o = {x: 10}; diff --git a/deps/v8/test/mjsunit/regress/regress-747.js b/deps/v8/test/mjsunit/regress/regress-747.js index 6fcc0000a6dc..648c36684c9c 100644 --- a/deps/v8/test/mjsunit/regress/regress-747.js +++ b/deps/v8/test/mjsunit/regress/regress-747.js @@ -40,7 +40,7 @@ try { callEval(); } catch (e) { assertUnreachable(); -} +} gc(); gc(); @@ -53,4 +53,4 @@ try { callEval(); } catch (e) { assertUnreachable(); -} +} diff --git a/deps/v8/test/mjsunit/regress/regress-760-1.js b/deps/v8/test/mjsunit/regress/regress-760-1.js index 2e0cee5f8fd3..081c99309dfc 100644 --- a/deps/v8/test/mjsunit/regress/regress-760-1.js +++ b/deps/v8/test/mjsunit/regress/regress-760-1.js @@ -26,7 +26,7 @@ // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. // Check that when valueOf for a String object is overwritten it is called and -// the result used when that object is added with a string. +// the result used when that object is added with a string. // See: http://code.google.com/p/v8/issues/detail?id=760 diff --git a/deps/v8/test/mjsunit/regress/regress-760-2.js b/deps/v8/test/mjsunit/regress/regress-760-2.js index 1b1cbfebed2b..549ed4ee41cb 100644 --- a/deps/v8/test/mjsunit/regress/regress-760-2.js +++ b/deps/v8/test/mjsunit/regress/regress-760-2.js @@ -26,7 +26,7 @@ // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. // Check that when valueOf for a String object is overwritten it is called and -// the result used when that object is added with a string. +// the result used when that object is added with a string. // See: http://code.google.com/p/v8/issues/detail?id=760 diff --git a/deps/v8/test/mjsunit/regress/regress-798.js b/deps/v8/test/mjsunit/regress/regress-798.js index 423c8832a216..eebe48a7f434 100644 --- a/deps/v8/test/mjsunit/regress/regress-798.js +++ b/deps/v8/test/mjsunit/regress/regress-798.js @@ -32,7 +32,7 @@ x.__defineGetter__("a", function() { try { y.x = 40; } catch (e) { - assertEquals(3, e.stack.split('\n').length); + assertEquals(3, e.stack.split('\n').length); } return 40; }); @@ -41,7 +41,7 @@ x.__defineSetter__("a", function(val) { try { y.x = 40; } catch(e) { - assertEquals(3, e.stack.split('\n').length); + assertEquals(3, e.stack.split('\n').length); } }); @@ -50,7 +50,7 @@ function getB() { try { y.x = 30; } catch (e) { - assertEquals(3, e.stack.split('\n').length); + assertEquals(3, e.stack.split('\n').length); } return 30; } @@ -59,7 +59,7 @@ function setB(val) { try { y.x = 30; } catch(e) { - assertEquals(3, e.stack.split('\n').length); + assertEquals(3, e.stack.split('\n').length); } } @@ -72,7 +72,7 @@ var descriptor = { try { y.x = 40; } catch (e) { - assertEquals(3, e.stack.split('\n').length); + assertEquals(3, e.stack.split('\n').length); } return 40; }, @@ -80,7 +80,7 @@ var descriptor = { try { y.x = 40; } catch(e) { - assertEquals(3, e.stack.split('\n').length); + assertEquals(3, e.stack.split('\n').length); } } } @@ -88,7 +88,7 @@ var descriptor = { Object.defineProperty(x, 'c', descriptor) // Check that the stack for an exception in a getter and setter produce the -// expected stack height. +// expected stack height. x.a; x.b; x.c; diff --git a/deps/v8/test/mjsunit/regress/regress-918.js b/deps/v8/test/mjsunit/regress/regress-918.js index 4b6ddbacf8ae..871e9d9f3d1b 100644 --- a/deps/v8/test/mjsunit/regress/regress-918.js +++ b/deps/v8/test/mjsunit/regress/regress-918.js @@ -28,6 +28,6 @@ // Parser should not accept parentheses around labels. // See http://code.google.com/p/v8/issues/detail?id=918 -// The label was parsed as an expression and then tested for being a +// The label was parsed as an expression and then tested for being a // single identifier. This threw away the parentheses. assertThrows("(label):42;"); diff --git a/deps/v8/test/mjsunit/regress/regress-925537.js b/deps/v8/test/mjsunit/regress/regress-925537.js index 11582eaf9055..d50c5689a5ec 100644 --- a/deps/v8/test/mjsunit/regress/regress-925537.js +++ b/deps/v8/test/mjsunit/regress/regress-925537.js @@ -28,8 +28,8 @@ function assertClose(expected, actual) { var delta = 0.00001; if (Math.abs(expected - actual) > delta) { - print('Failure: Expected <' + actual + '> to be close to <' + - expected + '>'); + print('Failure: Expected <' + actual + '> to be close to <' + + expected + '>'); } } diff --git a/deps/v8/test/mjsunit/regress/regress-937896.js b/deps/v8/test/mjsunit/regress/regress-937896.js index e8e5ef21b7f8..e7831da3c85a 100644 --- a/deps/v8/test/mjsunit/regress/regress-937896.js +++ b/deps/v8/test/mjsunit/regress/regress-937896.js @@ -41,7 +41,7 @@ function f() { } } } catch (e) { - // Empty. + // Empty. } return 42; } diff --git a/deps/v8/test/mjsunit/setter-on-constructor-prototype.js b/deps/v8/test/mjsunit/setter-on-constructor-prototype.js index d5718f9c9be8..a74f7da7b36f 100644 --- a/deps/v8/test/mjsunit/setter-on-constructor-prototype.js +++ b/deps/v8/test/mjsunit/setter-on-constructor-prototype.js @@ -35,14 +35,14 @@ function RunTest(ensure_fast_case) { if (ensure_fast_case) { %ToFastProperties(C1.prototype); } - + for (var i = 0; i < 10; i++) { var c1 = new C1(); assertEquals("undefined", typeof c1.x); assertEquals(23, c1.y); } - - + + function C2() { this.x = 23; }; @@ -51,14 +51,14 @@ function RunTest(ensure_fast_case) { if (ensure_fast_case) { %ToFastProperties(C2.prototype.__proto__) } - + for (var i = 0; i < 10; i++) { var c2 = new C2(); assertEquals("undefined", typeof c2.x); assertEquals(23, c2.y); } - - + + function C3() { this.x = 23; }; @@ -67,14 +67,14 @@ function RunTest(ensure_fast_case) { if (ensure_fast_case) { %ToFastProperties(C3.prototype); } - + for (var i = 0; i < 10; i++) { var c3 = new C3(); assertEquals("undefined", typeof c3.x); assertEquals(23, c3.y); } - - + + function C4() { this.x = 23; }; @@ -84,14 +84,14 @@ function RunTest(ensure_fast_case) { if (ensure_fast_case) { %ToFastProperties(C4.prototype.__proto__); } - + for (var i = 0; i < 10; i++) { var c4 = new C4(); assertEquals("undefined", typeof c4.x); assertEquals(23, c4.y); } - - + + function D() { this.x = 23; }; @@ -99,7 +99,7 @@ function RunTest(ensure_fast_case) { if (ensure_fast_case) { %ToFastProperties(D.prototype); } - + for (var i = 0; i < 10; i++) { var d = new D(); assertEquals(23, d.x); diff --git a/deps/v8/test/mjsunit/string-compare-alignment.js b/deps/v8/test/mjsunit/string-compare-alignment.js index a291417ba5fb..1530e1f292bb 100644 --- a/deps/v8/test/mjsunit/string-compare-alignment.js +++ b/deps/v8/test/mjsunit/string-compare-alignment.js @@ -29,7 +29,7 @@ // This situation can arise with sliced strings. This tests for an ARM bug // that was fixed in r554. -var base = "Now is the time for all good men to come to the aid of the party. " + +var base = "Now is the time for all good men to come to the aid of the party. " + "Now is the time for all good men to come to the aid of the party." var s1 = base.substring(0, 64); var s2 = base.substring(66, 130); diff --git a/deps/v8/test/mjsunit/string-indexof-1.js b/deps/v8/test/mjsunit/string-indexof-1.js index c5ae4b898a8a..db3623f7c029 100644 --- a/deps/v8/test/mjsunit/string-indexof-1.js +++ b/deps/v8/test/mjsunit/string-indexof-1.js @@ -63,7 +63,7 @@ assertEquals(1, twoByteString.indexOf("\u0391"), "Alpha"); assertEquals(2, twoByteString.indexOf("\u03a3"), "First Sigma"); assertEquals(3, twoByteString.indexOf("\u03a3",3), "Second Sigma"); assertEquals(4, twoByteString.indexOf("\u0395"), "Epsilon"); -assertEquals(-1, twoByteString.indexOf("\u0392"), "Not beta"); +assertEquals(-1, twoByteString.indexOf("\u0392"), "Not beta"); // Test multi-char pattern assertEquals(0, twoByteString.indexOf("\u039a\u0391"), "lambda Alpha"); @@ -71,7 +71,7 @@ assertEquals(1, twoByteString.indexOf("\u0391\u03a3"), "Alpha Sigma"); assertEquals(2, twoByteString.indexOf("\u03a3\u03a3"), "Sigma Sigma"); assertEquals(3, twoByteString.indexOf("\u03a3\u0395"), "Sigma Epsilon"); -assertEquals(-1, twoByteString.indexOf("\u0391\u03a3\u0395"), +assertEquals(-1, twoByteString.indexOf("\u0391\u03a3\u0395"), "Not Alpha Sigma Epsilon"); //single char pattern diff --git a/deps/v8/test/mjsunit/string-indexof-2.js b/deps/v8/test/mjsunit/string-indexof-2.js index a7c3f600a1f8..48db84d26e62 100644 --- a/deps/v8/test/mjsunit/string-indexof-2.js +++ b/deps/v8/test/mjsunit/string-indexof-2.js @@ -57,10 +57,10 @@ for(var i = 0; i < lipsum.length; i += 3) { var index = -1; do { index = lipsum.indexOf(substring, index + 1); - assertTrue(index != -1, + assertTrue(index != -1, "Lipsum substring " + i + ".." + (i + len-1) + " not found"); - assertEquals(lipsum.substring(index, index + len), substring, - "Wrong lipsum substring found: " + i + ".." + (i + len - 1) + "/" + + assertEquals(lipsum.substring(index, index + len), substring, + "Wrong lipsum substring found: " + i + ".." + (i + len - 1) + "/" + index + ".." + (index + len - 1)); } while (index >= 0 && index < i); assertEquals(i, index, "Lipsum match at " + i + ".." + (i + len - 1)); diff --git a/deps/v8/test/mjsunit/string-split.js b/deps/v8/test/mjsunit/string-split.js index 6fcf55799e5b..ffa7e0a784a8 100644 --- a/deps/v8/test/mjsunit/string-split.js +++ b/deps/v8/test/mjsunit/string-split.js @@ -68,13 +68,13 @@ assertArrayEquals(["a", "b", "c"], "abc".split(/(?=.)/)); /* "ab".split(/((?=.))/) - * + * * KJS: ,a,,b * SM: a,,b, * IE: a,b * Opera: a,,b * V8: a,,b - * + * * Opera seems to have this right. The others make no sense. */ assertArrayEquals(["a", "", "b"], "ab".split(/((?=.))/)); diff --git a/deps/v8/test/mjsunit/substr.js b/deps/v8/test/mjsunit/substr.js index f69a9c045c9a..f261844732ff 100755 --- a/deps/v8/test/mjsunit/substr.js +++ b/deps/v8/test/mjsunit/substr.js @@ -55,7 +55,7 @@ assertEquals(s, s.substr(-100)); assertEquals('abc', s.substr(-100, 3)); assertEquals(s1, s.substr(-s.length + 1)); -// assertEquals('', s.substr(0, void 0)); // smjs and rhino +// assertEquals('', s.substr(0, void 0)); // smjs and rhino assertEquals('abcdefghijklmn', s.substr(0, void 0)); // kjs and v8 assertEquals('', s.substr(0, null)); assertEquals(s, s.substr(0, String(s.length))); diff --git a/deps/v8/test/mjsunit/third_party/string-trim.js b/deps/v8/test/mjsunit/third_party/string-trim.js index 234dff6dcd76..fa04bb48ee12 100644 --- a/deps/v8/test/mjsunit/third_party/string-trim.js +++ b/deps/v8/test/mjsunit/third_party/string-trim.js @@ -31,7 +31,7 @@ // Based on LayoutTests/fast/js/script-tests/string-trim.js -// References to trim(), trimLeft() and trimRight() functions for +// References to trim(), trimLeft() and trimRight() functions for // testing Function's *.call() and *.apply() methods. var trim = String.prototype.trim; diff --git a/deps/v8/test/mjsunit/this-property-assignment.js b/deps/v8/test/mjsunit/this-property-assignment.js index c6819996c089..54c6537256c0 100644 --- a/deps/v8/test/mjsunit/this-property-assignment.js +++ b/deps/v8/test/mjsunit/this-property-assignment.js @@ -25,7 +25,7 @@ // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. -// Tests the handling of multiple assignments to the same property in a +// Tests the handling of multiple assignments to the same property in a // constructor that only has simple this property assignments. function Node() { diff --git a/deps/v8/test/mjsunit/try.js b/deps/v8/test/mjsunit/try.js index 794860a7c648..86afdf7f0841 100644 --- a/deps/v8/test/mjsunit/try.js +++ b/deps/v8/test/mjsunit/try.js @@ -250,7 +250,7 @@ function break_from_nested_catch(x) { } catch (o) { x--; } - } + } return x; } @@ -274,7 +274,7 @@ function break_from_nested_finally(x) { x--; } x--; // should not happen - } + } return x; } diff --git a/deps/v8/test/mjsunit/unicode-test.js b/deps/v8/test/mjsunit/unicode-test.js index 59a684e05393..66a029a7ef0b 100644 --- a/deps/v8/test/mjsunit/unicode-test.js +++ b/deps/v8/test/mjsunit/unicode-test.js @@ -807,7 +807,7 @@ var cyrillic = " * Васильев Л.С. Древний Китай: в 3 т. Т. 3. Период Чжаньго (V–III вв. до н.э.). М.: Восточная литература, 2006. ISBN 502018103X\n" + " * Непомнин О.Е. История Китая: Эпоха Цин. XVII – начало XX века. М.: Восточная литература, 2005. ISBN 5020184004\n"; -var devanagari = +var devanagari = "भारत\n" + "विकिपीडिया, एक मुक्त ज्ञानकोष से\n" + "Jump to: navigation, search\n" + @@ -1417,7 +1417,7 @@ var english = "There are many words of French origin in English, such as competition, art, table, publicity, police, role, routine, machine, force, and many others that have been and are being anglicised; they are now pronounced according to English rules of phonology, rather than French. A large portion of English vocabulary is of French or Oïl language origin, most derived from, or transmitted via, the Anglo-Norman spoken by the upper classes in England for several hundred years after the Norman Conquest.\n"; -var greek = +var greek = "Ελλάδα\n" + "Από τη Βικιπαίδεια, την ελεύθερη εγκυκλοπαίδεια\n" + "Ελληνική Δημοκρατία\n" + diff --git a/deps/v8/test/mjsunit/value-wrapper.js b/deps/v8/test/mjsunit/value-wrapper.js index 88330b449703..76e200f36e5b 100644 --- a/deps/v8/test/mjsunit/value-wrapper.js +++ b/deps/v8/test/mjsunit/value-wrapper.js @@ -39,7 +39,7 @@ function RunTests() { assertEquals('object', (42).TypeOfThis()); assertEquals('object', (3.14).TypeOfThis()); } - + for (var i = 0; i < 10; i++) { assertEquals('object', 'xxx'['TypeOfThis']()); assertEquals('object', true['TypeOfThis']()); @@ -47,11 +47,11 @@ function RunTests() { assertEquals('object', (42)['TypeOfThis']()); assertEquals('object', (3.14)['TypeOfThis']()); } - + function CallTypeOfThis(obj) { assertEquals('object', obj.TypeOfThis()); } - + for (var i = 0; i < 10; i++) { CallTypeOfThis('xxx'); CallTypeOfThis(true); @@ -59,7 +59,7 @@ function RunTests() { CallTypeOfThis(42); CallTypeOfThis(3.14); } - + function TestWithWith(obj) { with (obj) { for (var i = 0; i < 10; i++) { @@ -67,13 +67,13 @@ function RunTests() { } } } - + TestWithWith('xxx'); TestWithWith(true); TestWithWith(false); TestWithWith(42); TestWithWith(3.14); - + for (var i = 0; i < 10; i++) { assertEquals('object', true[7]()); assertEquals('object', false[7]()); @@ -100,7 +100,7 @@ function RunTests() { function TypeOfThis() { return typeof this; } -// Test with normal setup of prototype. +// Test with normal setup of prototype. String.prototype.TypeOfThis = TypeOfThis; Boolean.prototype.TypeOfThis = TypeOfThis; Number.prototype.TypeOfThis = TypeOfThis; diff --git a/deps/v8/test/mozilla/mozilla.status b/deps/v8/test/mozilla/mozilla.status index 3b6a524c2689..e0ce70e80d7c 100644 --- a/deps/v8/test/mozilla/mozilla.status +++ b/deps/v8/test/mozilla/mozilla.status @@ -241,9 +241,9 @@ ecma_3/Number/15.7.4.7-1: FAIL_OK # toExponential argument restricted to range 0..20 in JSC/V8 ecma_3/Number/15.7.4.6-1: FAIL_OK -#:=== RegExp:=== +#:=== RegExp:=== # To be compatible with JSC we silently ignore flags that do not make -# sense. These tests expects us to throw exceptions. +# sense. These tests expects us to throw exceptions. ecma_3/RegExp/regress-57631: FAIL_OK ecma_3/RegExp/15.10.4.1-6: FAIL_OK @@ -570,7 +570,7 @@ js1_5/Regress/regress-352604: FAIL_OK js1_5/Regress/regress-417893: FAIL_OK -# Unsupported use of "[]" as function parameter. We match JSC. +# Unsupported use of "[]" as function parameter. We match JSC. js1_5/Regress/regress-416737-01: FAIL_OK js1_5/Regress/regress-416737-02: FAIL_OK diff --git a/deps/v8/tools/generate-ten-powers.scm b/deps/v8/tools/generate-ten-powers.scm index eaeb7f4bfdcc..14d45e30514b 100644 --- a/deps/v8/tools/generate-ten-powers.scm +++ b/deps/v8/tools/generate-ten-powers.scm @@ -28,7 +28,7 @@ ;; This is a Scheme script for the Bigloo compiler. Bigloo must be compiled with ;; support for bignums. The compilation of the script can be done as follows: ;; bigloo -static-bigloo -o generate-ten-powers generate-ten-powers.scm -;; +;; ;; Generate approximations of 10^k. (module gen-ten-powers diff --git a/doc/api/assert.markdown b/doc/api/assert.markdown index a0607e2d3dc5..cf91d4864981 100644 --- a/doc/api/assert.markdown +++ b/doc/api/assert.markdown @@ -37,7 +37,7 @@ Tests strict non-equality, as determined by the strict not equal operator ( `!== ### assert.throws(block, [error], [message]) -Expects `block` to throw an error. `error` can be constructor, regexp or +Expects `block` to throw an error. `error` can be constructor, regexp or validation function. Validate instanceof using constructor: diff --git a/doc/api/http.markdown b/doc/api/http.markdown index 8de8dcaad5c5..a93bccddde08 100644 --- a/doc/api/http.markdown +++ b/doc/api/http.markdown @@ -485,7 +485,7 @@ A queue of requests waiting to be sent to sockets. ## http.ClientRequest This object is created internally and returned from `http.request()`. It -represents an _in-progress_ request whose header has already been queued. The +represents an _in-progress_ request whose header has already been queued. The header is still mutable using the `setHeader(name, value)`, `getHeader(name)`, `removeHeader(name)` API. The actual header will be sent along with the first data chunk or when closing the connection. diff --git a/doc/api/path.markdown b/doc/api/path.markdown index adef4b39ed6c..c0183f6f5ab5 100644 --- a/doc/api/path.markdown +++ b/doc/api/path.markdown @@ -9,7 +9,7 @@ Normalize a string path, taking care of `'..'` and `'.'` parts. When multiple slashes are found, they're replaces by a single one; when the path contains a trailing slash, it is preserved. -On windows backslashes are used. +On windows backslashes are used. Example: @@ -34,7 +34,7 @@ Resolves `to` to an absolute path. If `to` isn't already absolute `from` arguments are prepended in right to left order, until an absolute path is found. If after using all `from` paths still no absolute path is found, the current working directory is used as well. The -resulting path is normalized, and trailing slashes are removed unless the path +resulting path is normalized, and trailing slashes are removed unless the path gets resolved to the root directory. Another way to think of it is as a sequence of `cd` commands in a shell. diff --git a/doc/api_assets/style.css b/doc/api_assets/style.css index 6dc8718857e1..0566f04880b9 100644 --- a/doc/api_assets/style.css +++ b/doc/api_assets/style.css @@ -18,7 +18,7 @@ a { a:hover, a:focus { text-decoration: none; } - + code a:hover { background: none; color: #b950b7; @@ -142,7 +142,7 @@ h6 { font-family: Monaco, Consolas, "Lucida Console", monospace; margin: 0; padding: 0; } - + .pre { font-family: Monaco, Consolas, "Lucida Console", monospace; line-height: 1.5438em; @@ -157,7 +157,7 @@ h6 { border-width: 1px 1px 1px 6px; margin: -0.5em 0 1.1em; } - + pre + h3 { margin-top: 2.225em; } @@ -191,18 +191,18 @@ hr { } #toc { - + } #toc h2 { font-size: 1em; line-height: 1.4em; } - + #toc h2 a { float: right; } - + #toc hr { margin: 1em 0 2em; } @@ -222,7 +222,7 @@ a.octothorpe { opacity: 0; -webkit-transition: opacity 0.2s linear; } - p:hover > a.octothorpe, + p:hover > a.octothorpe, dt:hover > a.octothorpe, dd:hover > a.octothorpe, h1:hover > a.octothorpe, diff --git a/doc/index.html b/doc/index.html index 34dc236eba3a..7b50f6cf9977 100644 --- a/doc/index.html +++ b/doc/index.html @@ -112,16 +112,16 @@

About

client connections can be handled concurrently. Node tells the operating system (through epoll, kqueue, /dev/poll, or select) - that it should be notified when a new connection is made, and + that it should be notified when a new connection is made, and then it goes to sleep. If someone new connects, then it executes the callback. Each connection is only a small heap allocation.

This is in contrast to today's more common concurrency model where - OS threads are employed. Thread-based networking is relatively + OS threads are employed. Thread-based networking is relatively inefficient and very difficult to use. See: - this and + this and this. Node will show much better memory efficiency under high-loads diff --git a/doc/node.1 b/doc/node.1 index 758cd2ffd85c..72cca28bf9f3 100644 --- a/doc/node.1 +++ b/doc/node.1 @@ -58,7 +58,7 @@ If set to 1 then colors will not be used in the REPL. --crankshaft (use crankshaft) type: bool default: false --hydrogen_filter (hydrogen use/trace filter) - type: string default: + type: string default: --use_hydrogen (use generated hydrogen for compilation) type: bool default: true --build_lithium (use lithium chunk builder) @@ -326,7 +326,7 @@ If set to 1 then colors will not be used in the REPL. --map_counters (Map counters to a file) type: string default: NULL --js_arguments (Pass all remaining arguments to the script. Alias for "--".) - type: arguments default: + type: arguments default: --debug_compile_events (Enable debugger compile events) type: bool default: true --debug_script_collected_events (Enable debugger script collected events) diff --git a/doc/pipe.css b/doc/pipe.css index c86bf2ae36a7..020fd902a5a2 100644 --- a/doc/pipe.css +++ b/doc/pipe.css @@ -3,7 +3,7 @@ body { color: #eee; font-size: 14pt; line-height: 150%; - font-family: times, Times New Roman, times-roman, georgia, serif; + font-family: times, Times New Roman, times-roman, georgia, serif; max-width: 30em; margin: 0 0 5em 9em; } @@ -39,14 +39,14 @@ img { h1, h2, h3, h4 { color: #B0C4DE; - margin: 2em 0; + margin: 2em 0; } -h1 code, h2 code, h3 code, h4 code, -h1 a, h2 a, h3 a, h4 a -{ - color: inherit; - font-size: inherit; +h1 code, h2 code, h3 code, h4 code, +h1 a, h2 a, h3 a, h4 a +{ + color: inherit; + font-size: inherit; } pre, code { diff --git a/src/node_buffer.h b/src/node_buffer.h index 9a0e1d24010b..3dd226e20516 100644 --- a/src/node_buffer.h +++ b/src/node_buffer.h @@ -32,7 +32,7 @@ namespace node { Migrating code C++ Buffer code from v0.2 to v0.3 is difficult. Here are some tips: - buffer->data() calls should become Buffer::Data(buffer) calls. - - buffer->length() calls should become Buffer::Length(buffer) calls. + - buffer->length() calls should become Buffer::Length(buffer) calls. - There should not be any ObjectWrap::Unwrap() calls. You should not be storing pointers to Buffer objects at all - as they are now considered internal structures. Instead consider making a diff --git a/src/node_crypto.cc b/src/node_crypto.cc index 22147806fd82..07c3b6386046 100644 --- a/src/node_crypto.cc +++ b/src/node_crypto.cc @@ -1446,7 +1446,7 @@ class Cipher : public ObjectWrap { static Handle CipherInitIv(const Arguments& args) { Cipher *cipher = ObjectWrap::Unwrap(args.This()); - + HandleScope scope; cipher->incomplete_base64=NULL; @@ -1478,7 +1478,7 @@ class Cipher : public ObjectWrap { assert(iv_written == iv_len); String::Utf8Value cipherType(args[0]->ToString()); - + bool r = cipher->CipherInitIv(*cipherType, key_buf,key_len,iv_buf,iv_len); delete [] key_buf; @@ -1769,7 +1769,7 @@ class Decipher : public ObjectWrap { static Handle DecipherInit(const Arguments& args) { Decipher *cipher = ObjectWrap::Unwrap(args.This()); - + HandleScope scope; cipher->incomplete_utf8=NULL; @@ -1792,7 +1792,7 @@ class Decipher : public ObjectWrap { assert(key_written == key_len); String::Utf8Value cipherType(args[0]->ToString()); - + bool r = cipher->DecipherInit(*cipherType, key_buf,key_len); delete [] key_buf; @@ -1806,7 +1806,7 @@ class Decipher : public ObjectWrap { static Handle DecipherInitIv(const Arguments& args) { Decipher *cipher = ObjectWrap::Unwrap(args.This()); - + HandleScope scope; cipher->incomplete_utf8=NULL; @@ -1840,7 +1840,7 @@ class Decipher : public ObjectWrap { assert(iv_written == iv_len); String::Utf8Value cipherType(args[0]->ToString()); - + bool r = cipher->DecipherInitIv(*cipherType, key_buf,key_len,iv_buf,iv_len); delete [] key_buf; @@ -2197,7 +2197,7 @@ class Hmac : public ObjectWrap { } int r; - + if( Buffer::HasInstance(args[0])) { Local buffer_obj = args[0]->ToObject(); char *buffer_data = Buffer::Data(buffer_obj); diff --git a/src/node_dtrace.cc b/src/node_dtrace.cc index ca7495e2f753..9264672a0284 100644 --- a/src/node_dtrace.cc +++ b/src/node_dtrace.cc @@ -126,7 +126,7 @@ Handle DTRACE_NET_SOCKET_READ(const Arguments& args) { SLURP_CONNECTION(args[0], conn); if (!args[1]->IsNumber()) { - return (ThrowException(Exception::Error(String::New("expected " + return (ThrowException(Exception::Error(String::New("expected " "argument 1 to be number of bytes")))); } @@ -147,7 +147,7 @@ Handle DTRACE_NET_SOCKET_WRITE(const Arguments& args) { SLURP_CONNECTION(args[0], conn); if (!args[1]->IsNumber()) { - return (ThrowException(Exception::Error(String::New("expected " + return (ThrowException(Exception::Error(String::New("expected " "argument 1 to be number of bytes")))); } diff --git a/src/node_extensions.cc b/src/node_extensions.cc index 776bb40af891..c657bcb60576 100644 --- a/src/node_extensions.cc +++ b/src/node_extensions.cc @@ -31,7 +31,7 @@ node_module_struct* get_builtin_module(const char *name) char buf[128]; node_module_struct *cur = NULL; snprintf(buf, sizeof(buf), "node_%s", name); - /* TODO: you could look these up in a hash, but there are only + /* TODO: you could look these up in a hash, but there are only * a few, and once loaded they are cached. */ for (int i = 0; node_module_list[i] != NULL; i++) { cur = node_module_list[i]; diff --git a/test/disabled/test-https-loop-to-google.js b/test/disabled/test-https-loop-to-google.js index dd3bae8c62c8..5b24a18a9e64 100644 --- a/test/disabled/test-https-loop-to-google.js +++ b/test/disabled/test-https-loop-to-google.js @@ -15,17 +15,17 @@ for(var i = 0; i < 10; ++i) port: 443, }, function(res) { - var data = ''; + var data = ''; res.on('data', function(chunk) - { + { data += chunk; - }); + }); res.on('end', function() - { + { console.log(res.statusCode); - }); + }); }).on('error', function(error) { console.log(error); - }); + }); } diff --git a/test/fixtures/fixture.ini b/test/fixtures/fixture.ini index dcf1348a45bd..df355d8adfaf 100644 --- a/test/fixtures/fixture.ini +++ b/test/fixtures/fixture.ini @@ -3,16 +3,16 @@ root=something url = http://example.com/?foo=bar - [ the section with whitespace ] + [ the section with whitespace ] this has whitespace = yep ; and a comment; and then another - just a flag, no value. + just a flag, no value. [section] one=two Foo=Bar this=Your Mother! -blank= +blank= [Section Two] something else=blah diff --git a/test/simple/test-http-dns-fail.js b/test/simple/test-http-dns-fail.js index 3b8ebb9b5a4b..b875cfb1ab45 100644 --- a/test/simple/test-http-dns-fail.js +++ b/test/simple/test-http-dns-fail.js @@ -1,4 +1,4 @@ -/* +/* * Repeated requests for a domain that fails to resolve * should trigger the error event after each attempt. */ diff --git a/test/simple/test-timers-linked-list.js b/test/simple/test-timers-linked-list.js index 26bf0525ab93..bfc3b39f83f3 100644 --- a/test/simple/test-timers-linked-list.js +++ b/test/simple/test-timers-linked-list.js @@ -64,7 +64,7 @@ L.remove(B); assert.equal(D, L.peek(list)); L.remove(D); -// list +// list assert.equal(null, L.peek(list)); diff --git a/test/simple/test-tls-client-verify.js b/test/simple/test-tls-client-verify.js index 923153b4410f..975c0dbf5b8a 100644 --- a/test/simple/test-tls-client-verify.js +++ b/test/simple/test-tls-client-verify.js @@ -13,8 +13,8 @@ var testCases = { ok: false, key: 'agent2-key', cert: 'agent2-cert' }, { ok: false, key: 'agent3-key', cert: 'agent3-cert' }, ] - }, - + }, + { ca: [], key: 'agent2-key', cert: 'agent2-cert', @@ -64,15 +64,15 @@ function testServers(index, servers, clientOptions, cb) { var ok = serverOptions.ok; if (serverOptions.key) { - serverOptions.key = loadPEM(serverOptions.key); + serverOptions.key = loadPEM(serverOptions.key); } - if (serverOptions.cert) { - serverOptions.cert = loadPEM(serverOptions.cert); + if (serverOptions.cert) { + serverOptions.cert = loadPEM(serverOptions.cert); } var server = tls.createServer(serverOptions, function(s) { - s.end("hello world\n"); + s.end("hello world\n"); }); server.listen(common.PORT, function() { @@ -83,7 +83,7 @@ function testServers(index, servers, clientOptions, cb) { console.error("expected: " + ok + " authed: " + client.authorized); - assert.equal(ok, client.authorized); + assert.equal(ok, client.authorized); server.close(); }); diff --git a/tools/closure_linter/setup.cfg b/tools/closure_linter/setup.cfg index 861a9f554263..23fcba9926d3 100644 --- a/tools/closure_linter/setup.cfg +++ b/tools/closure_linter/setup.cfg @@ -1,5 +1,5 @@ [egg_info] -tag_build = +tag_build = tag_date = 0 tag_svn_revision = 0 diff --git a/tools/doctool/markdown.js b/tools/doctool/markdown.js index 56387c19154f..c4af0fe81124 100644 --- a/tools/doctool/markdown.js +++ b/tools/doctool/markdown.js @@ -1297,7 +1297,7 @@ function render_tree( jsonml, xhtml ) { for ( var a in attributes ) { tag_attrs += " " + a + '="' + attributes[ a ] + '"'; } - + // if xhtml, self-close empty tags // be careful about adding whitespace here for inline elements var markup = "<"+ tag + tag_attrs; diff --git a/wscript b/wscript index aea3fb7b9bfd..f566878a03b6 100644 --- a/wscript +++ b/wscript @@ -185,7 +185,7 @@ def set_options(opt): , help='Build with DTrace (experimental)' , dest='dtrace' ) - + opt.add_option( '--product-type' , action='store' @@ -272,14 +272,14 @@ def configure(conf): Options.options.use_openssl = conf.env["USE_OPENSSL"] = True conf.env.append_value("CPPFLAGS", "-DHAVE_OPENSSL=1") else: - if o.openssl_libpath: + if o.openssl_libpath: openssl_libpath = [o.openssl_libpath] elif not sys.platform.startswith('win32'): openssl_libpath = ['/usr/lib', '/usr/local/lib', '/opt/local/lib', '/usr/sfw/lib'] else: openssl_libpath = [normpath(join(cwd, '../openssl'))] - if o.openssl_includes: + if o.openssl_includes: openssl_includes = [o.openssl_includes] elif not sys.platform.startswith('win32'): openssl_includes = []; @@ -361,7 +361,7 @@ def configure(conf): conf.fatal("Cannot find v8_g") if sys.platform.startswith("win32"): - # On win32 CARES is always static, so we can call internal functions like ares_inet_pton et al. + # On win32 CARES is always static, so we can call internal functions like ares_inet_pton et al. # CARES_STATICLIB must be defined or gcc will try to make DLL stub calls conf.env.append_value('CPPFLAGS', '-DCARES_STATICLIB=1') conf.sub_config('deps/c-ares') @@ -706,7 +706,7 @@ def build(bld): native_cc_debug.rule = javascript_in_c_debug native_cc.rule = javascript_in_c - + if bld.env["USE_DTRACE"]: dtrace = bld.new_task_gen( name = "dtrace",