From 0436c78142d5cae41aba81969c6416377f05596f Mon Sep 17 00:00:00 2001 From: Koki Takahashi Date: Mon, 19 Oct 2015 14:10:48 +0900 Subject: [PATCH] Replace vars with let and const --- src/kana.es6 | 4 ++-- src/numbers.es6 | 36 ++++++++++++++++++------------------ src/romanize.es6 | 12 ++++++------ 3 files changed, 26 insertions(+), 26 deletions(-) diff --git a/src/kana.es6 b/src/kana.es6 index 0f1a58f..7504003 100644 --- a/src/kana.es6 +++ b/src/kana.es6 @@ -61,8 +61,8 @@ module.exports = function (japanese) { '𛀁': 'エ', }; - var chr = String.fromCharCode; - var ord = function (char) { + const chr = String.fromCharCode; + const ord = function (char) { return char.charCodeAt(0); }; diff --git a/src/numbers.es6 b/src/numbers.es6 index acff38b..14c7358 100644 --- a/src/numbers.es6 +++ b/src/numbers.es6 @@ -1,21 +1,21 @@ 'use strict'; -var extend = require('extend'); -var Big = require('big.js'); +const extend = require('extend'); +const Big = require('big.js'); // Get nth bit from buffer function getBit(buffer, position) { - var byteIndex = Math.floor(position / 8); - var byte = buffer[byteIndex] || 0; + let byteIndex = Math.floor(position / 8); + let byte = buffer[byteIndex] || 0; return !!(byte & (1 << (7 - position % 8))); } // Get bits of buffer from a to b function getBits(buffer, from, length) { - var ret = new Big(0); + let ret = new Big(0); - for (var ptr = from; ptr < from + length; ptr++) { + for (let ptr = from; ptr < from + length; ptr++) { ret = ret.times(2); if (getBit(buffer, ptr)) { ret = ret.plus(1); @@ -406,13 +406,13 @@ module.exports = function (japanese) { number = number.toString(); } else { // Paste number into binary form - var buf = new Buffer(8); + const buf = new Buffer(8); buf.writeDoubleBE(number, 0); - var sign = getBit(buf, 0); - var exponent = getBits(buf, 1, 11); - var mantissa = getBits(buf, 12, 52); - var fraction = null; + let sign = getBit(buf, 0); + let exponent = getBits(buf, 1, 11); + let mantissa = getBits(buf, 12, 52); + let fraction = null; exponent = parseInt(exponent.toString()); @@ -433,12 +433,12 @@ module.exports = function (japanese) { throw new ReferenceError('Type of `number` is unsupported'); } - var length = number.length; + let length = number.length; // Main convertion starts here - var lit = ''; - var restoreZero = false; + let lit = ''; + let restoreZero = false; if (config.unitNames.lit && length > config.unitNames.lit) { lit = number.slice(0, -config.unitNames.lit).split('').map(function (digit) { return config.digits[digit]; @@ -457,14 +457,14 @@ module.exports = function (japanese) { return config.digits[0]; } - var transcription = ''; + let transcription = ''; if (number.slice(-1) !== '0') { transcription += config.digits[number.slice(-1)]; } // Get sanitized unit name keys - var keysOfUnitNames = Object.keys(config.unitNames).map(function (key) { + let keysOfUnitNames = Object.keys(config.unitNames).map(function (key) { // convert to int return parseInt(key); }).filter(function (key, index, self) { @@ -479,9 +479,9 @@ module.exports = function (japanese) { }); keysOfUnitNames.forEach(function (key, index) { - var nextKey = keysOfUnitNames[index + 1] || Infinity; + let nextKey = keysOfUnitNames[index + 1] || Infinity; // slice the digits spaned by the unit name - var token = number.slice(Math.max(length - nextKey, 0), Math.max(length - key, 0)); + let token = number.slice(Math.max(length - nextKey, 0), Math.max(length - key, 0)); if (token.length > 0) { // check if every number in the token is zero diff --git a/src/romanize.es6 b/src/romanize.es6 index 1d05baf..7974703 100644 --- a/src/romanize.es6 +++ b/src/romanize.es6 @@ -1,6 +1,6 @@ 'use strict'; -var extend = require('extend'); +const extend = require('extend'); module.exports = function (japanese) { japanese.romanizationTable = { @@ -325,7 +325,7 @@ module.exports = function (japanese) { throw new Error('You specified unknown config to japanese.romanize'); } - var table = extend({}, japanese.romanizationTable); + const table = extend({}, japanese.romanizationTable); if (config['し'] === 'shi') { extend(table, { @@ -480,11 +480,11 @@ module.exports = function (japanese) { string = japanese.hiraganize(string); - var dest = ''; - var previousToken = ''; + let dest = ''; + let previousToken = ''; while (string.length > 0) { - var token = ''; + let token = ''; // assuming we have only one or two letter token in table if (table[string.slice(0, 2)]) { @@ -501,7 +501,7 @@ module.exports = function (japanese) { continue; } - var tokenDest = table[token] || ''; + let tokenDest = table[token] || ''; // small tsu if (previousToken === 'っ') {