Code style

tshemsedinov · tshemsedinov · commit 4e27669828d6 · 2018-06-14T20:24:55.000+03:00
diff --git a/JavaScript/1-range.js b/JavaScript/1-range.js
@@ -26,12 +26,12 @@ class Range {
           current >= end && step > 0 ||
           current <= end && step < 0
         ) {
-          let value = current;
+          const value = current;
           current = undefined;
           return { value, done: true };
         }
 
-        let value = current;
+        const value = current;
         current += step;
         return { value, done: false };
       }
diff --git a/JavaScript/2-range-generator.js b/JavaScript/2-range-generator.js
@@ -1,8 +1,7 @@
 'use strict';
 
 function* range(first, second, step = 1) {
-  let current;
-  let end;
+  let current, end;
 
   if (second === undefined) {
     current = 0;
@@ -12,13 +11,18 @@ function* range(first, second, step = 1) {
     end = second;
   }
 
-  while (
-    current < end && step > 0 ||
-    current > end && step < 0
-  ) {
-    yield current;
-    current += step;
+  if (step > 0) {
+    while (current < end) {
+      yield current;
+      current += step;
+    }
+  } else {
+    while (current > end) {
+      yield current;
+      current += step;
+    }
   }
+
 }
 
 console.log([
@@ -27,9 +31,3 @@ console.log([
   [...range(2, 15, 2)],
   [...range(10, 0, -1)],
 ]);
-
-/*
-for (let x of range(10, Infinity, 3000000000000)) {
-  console.dir({ x });
-}
-*/
diff --git a/JavaScript/3-primes.js b/JavaScript/3-primes.js
@@ -7,17 +7,18 @@ function* numbers(start) {
 }
 
 function* sieve(sequence, prime) {
-  for (let number of sequence) {
+  for (const number of sequence) {
     if (number % prime !== 0) {
       yield number;
     }
   }
 }
 
 function* primes() {
-  var sequence = numbers(2);
+  let sequence = numbers(2);
+  let prime;
   while (true) {
-    let prime = sequence.next().value;
+    prime = sequence.next().value;
     yield prime;
     sequence = sieve(sequence, prime);
   }
@@ -29,6 +30,6 @@ function* take(count, sequence) {
   }
 }
 
-for (var prime of take(10, primes())) {
+for (const prime of take(10, primes())) {
   console.log(prime);
 }
diff --git a/JavaScript/4-producer-consumer.js b/JavaScript/4-producer-consumer.js
@@ -1,7 +1,7 @@
 'use strict';
 
 function* sleep(interval) {
-  let start = new Date();
+  const start = new Date();
   while (new Date() - start < interval) {
     yield;
   }
@@ -16,13 +16,15 @@ function* consume() {
   let count = 0;
   let sum = 0;
   while (true) {
-    let data = yield* produce();
+    const data = yield* produce();
     count++;
     sum += data;
-    console.log(`Got data: ${data}\n` +
-                `Count:    ${count}\n` +
-                `Sum:      ${sum}\n` +
-                `Average:  ${sum / count}\n`);
+    console.log(
+      `Got data: ${data}\n` +
+      `Count:    ${count}\n` +
+      `Sum:      ${sum}\n` +
+      `Average:  ${sum / count}\n`
+    );
   }
 }
 
@@ -33,14 +35,13 @@ function* anotherTask() {
   }
 }
 
-let consumer = consume();
-let task = anotherTask();
+const consumer = consume();
+const task = anotherTask();
 
-function step() {
+const step = () => {
   consumer.next();
   task.next();
-
   setImmediate(step);
-}
+};
 
 step();

Original file line number	Diff line number	Diff line change
`@@ -26,12 +26,12 @@ class Range {`
`26`	`26`	`current >= end && step > 0 \|\|`
`27`	`27`	`current <= end && step < 0`
`28`	`28`	`) {`
`29`		`- let value = current;`
	`29`	`+ const value = current;`
`30`	`30`	`current = undefined;`
`31`	`31`	`return { value, done: true };`
`32`	`32`	`}`
`33`	`33`
`34`		`- let value = current;`
	`34`	`+ const value = current;`
`35`	`35`	`current += step;`
`36`	`36`	`return { value, done: false };`
`37`	`37`	`}`
Original file line number	Diff line number	Diff line change
`@@ -7,17 +7,18 @@ function* numbers(start) {`
`7`	`7`	`}`
`8`	`8`
`9`	`9`	`function* sieve(sequence, prime) {`
`10`		`- for (let number of sequence) {`
	`10`	`+ for (const number of sequence) {`
`11`	`11`	`if (number % prime !== 0) {`
`12`	`12`	`yield number;`
`13`	`13`	`}`
`14`	`14`	`}`
`15`	`15`	`}`
`16`	`16`
`17`	`17`	`function* primes() {`
`18`		`- var sequence = numbers(2);`
	`18`	`+ let sequence = numbers(2);`
	`19`	`+ let prime;`
`19`	`20`	`while (true) {`
`20`		`- let prime = sequence.next().value;`
	`21`	`+ prime = sequence.next().value;`
`21`	`22`	`yield prime;`
`22`	`23`	`sequence = sieve(sequence, prime);`
`23`	`24`	`}`
`@@ -29,6 +30,6 @@ function* take(count, sequence) {`
`29`	`30`	`}`
`30`	`31`	`}`
`31`	`32`
`32`		`-for (var prime of take(10, primes())) {`
	`33`	`+for (const prime of take(10, primes())) {`
`33`	`34`	`console.log(prime);`
`34`	`35`	`}`