From 8beff648518aa8e846221d03e31bea5f78f62010 Mon Sep 17 00:00:00 2001 From: Vse Mozhet Byt Date: Thu, 8 Jun 2017 18:30:57 +0300 Subject: [PATCH] benchmark: fix some RegExp nits MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * Take RegExp creation out of cycle. * use test(), not match() in boolean context. PR-URL: https://github.com/nodejs/node/pull/13551 Reviewed-By: Colin Ihrig Reviewed-By: Refael Ackermann Reviewed-By: Tobias Nießen Reviewed-By: Luigi Pinca --- benchmark/buffers/buffer-write.js | 2 +- benchmark/common.js | 3 ++- benchmark/crypto/cipher-stream.js | 2 +- benchmark/crypto/hash-stream-creation.js | 2 +- benchmark/crypto/hash-stream-throughput.js | 2 +- 5 files changed, 6 insertions(+), 5 deletions(-) diff --git a/benchmark/buffers/buffer-write.js b/benchmark/buffers/buffer-write.js index 758c8b8b51..2f1eb08763 100644 --- a/benchmark/buffers/buffer-write.js +++ b/benchmark/buffers/buffer-write.js @@ -52,7 +52,7 @@ function main(conf) { var buff = new clazz(8); var fn = `write${conf.type}`; - if (fn.match(/Int/)) + if (/Int/.test(fn)) benchInt(buff, fn, len, noAssert); else benchFloat(buff, fn, len, noAssert); diff --git a/benchmark/common.js b/benchmark/common.js index bc9c21b390..622d053e5f 100644 --- a/benchmark/common.js +++ b/benchmark/common.js @@ -40,9 +40,10 @@ function Benchmark(fn, configs, options) { Benchmark.prototype._parseArgs = function(argv, configs) { const cliOptions = {}; const extraOptions = {}; + const validArgRE = /^(.+?)=([\s\S]*)$/; // Parse configuration arguments for (const arg of argv) { - const match = arg.match(/^(.+?)=([\s\S]*)$/); + const match = arg.match(validArgRE); if (!match) { console.error(`bad argument: ${arg}`); process.exit(1); diff --git a/benchmark/crypto/cipher-stream.js b/benchmark/crypto/cipher-stream.js index 90bf548c76..9fd88f1d86 100644 --- a/benchmark/crypto/cipher-stream.js +++ b/benchmark/crypto/cipher-stream.js @@ -11,7 +11,7 @@ var bench = common.createBenchmark(main, { function main(conf) { var api = conf.api; - if (api === 'stream' && process.version.match(/^v0\.[0-8]\./)) { + if (api === 'stream' && /^v0\.[0-8]\./.test(process.version)) { console.error('Crypto streams not available until v0.10'); // use the legacy, just so that we can compare them. api = 'legacy'; diff --git a/benchmark/crypto/hash-stream-creation.js b/benchmark/crypto/hash-stream-creation.js index 296127ab38..dfab32c8af 100644 --- a/benchmark/crypto/hash-stream-creation.js +++ b/benchmark/crypto/hash-stream-creation.js @@ -15,7 +15,7 @@ var bench = common.createBenchmark(main, { function main(conf) { var api = conf.api; - if (api === 'stream' && process.version.match(/^v0\.[0-8]\./)) { + if (api === 'stream' && /^v0\.[0-8]\./.test(process.version)) { console.error('Crypto streams not available until v0.10'); // use the legacy, just so that we can compare them. api = 'legacy'; diff --git a/benchmark/crypto/hash-stream-throughput.js b/benchmark/crypto/hash-stream-throughput.js index dbb2e5c999..cedaeb872f 100644 --- a/benchmark/crypto/hash-stream-throughput.js +++ b/benchmark/crypto/hash-stream-throughput.js @@ -14,7 +14,7 @@ var bench = common.createBenchmark(main, { function main(conf) { var api = conf.api; - if (api === 'stream' && process.version.match(/^v0\.[0-8]\./)) { + if (api === 'stream' && /^v0\.[0-8]\./.test(process.version)) { console.error('Crypto streams not available until v0.10'); // use the legacy, just so that we can compare them. api = 'legacy';