♻️ refactor: Use arrow functions where possible.

make-github-pseudonymous-again · make-github-pseudonymous-again · commit 8bd4b37c20e2 · 2021-03-29T14:16:43.000+02:00
diff --git a/src/deletion/delete_case1.js b/src/deletion/delete_case1.js
@@ -8,8 +8,8 @@ import {delete_case2} from './delete_case2.js';
  *
  * @param {Node} n - The input node.
  */
-export function delete_case1(n) {
+export const delete_case1 = (n) => {
 	// If n is the root, there is nothing to do: all paths go through n, and n
 	// is black.
 	if (n.parent !== null) delete_case2(n);
-}
+};
diff --git a/src/deletion/delete_case2.js b/src/deletion/delete_case2.js
@@ -14,7 +14,7 @@ import {delete_case4} from './delete_case4.js';
  *
  * @param {Node} n - The input node.
  */
-export function delete_case2(n) {
+export const delete_case2 = (n) => {
 	const s = sibling(n);
 
 	/**
@@ -38,4 +38,4 @@ export function delete_case2(n) {
 
 	// Otherwise, go to case 3.
 	else delete_case3(n);
-}
+};
diff --git a/src/deletion/delete_case3.js b/src/deletion/delete_case3.js
@@ -14,7 +14,7 @@ import {delete_case4} from './delete_case4.js';
  *
  * @param {Node} n - The input node.
  */
-export function delete_case3(n) {
+export const delete_case3 = (n) => {
 	const s = sibling(n);
 
 	/**
@@ -41,4 +41,4 @@ export function delete_case3(n) {
 
 	// Otherwise, go to case 4.
 	else delete_case4(n);
-}
+};
diff --git a/src/deletion/delete_case4.js b/src/deletion/delete_case4.js
@@ -14,7 +14,7 @@ import {delete_case5} from './delete_case5.js';
  *
  * @param {Node} n - The input node.
  */
-export function delete_case4(n) {
+export const delete_case4 = (n) => {
 	const s = sibling(n);
 
 	/**
@@ -43,4 +43,4 @@ export function delete_case4(n) {
 
 	// Otherwise, go to case 5.
 	else delete_case5(n);
-}
+};
diff --git a/src/deletion/delete_case5.js b/src/deletion/delete_case5.js
@@ -15,7 +15,7 @@ import {delete_case6} from './delete_case6.js';
  *
  * @param {Node} n - The input node.
  */
-export function delete_case5(n) {
+export const delete_case5 = (n) => {
 	const s = sibling(n);
 
 	// The following statements just force the red n's sibling child to be on
@@ -55,4 +55,4 @@ export function delete_case5(n) {
 	}
 
 	delete_case6(n);
-}
+};
diff --git a/src/deletion/delete_case6.js b/src/deletion/delete_case6.js
@@ -14,7 +14,7 @@ import {sibling} from '../family/sibling.js';
  *
  * @param {Node} n - The input node.
  */
-export function delete_case6(n) {
+export const delete_case6 = (n) => {
 	const s = sibling(n);
 
 	/**
@@ -48,4 +48,4 @@ export function delete_case6(n) {
 		s.left.color = BLACK;
 		rotate_right(n.parent);
 	}
-}
+};
diff --git a/src/deletion/delete_one_child.js b/src/deletion/delete_one_child.js
@@ -12,7 +12,7 @@ import {delete_case1} from './delete_case1.js';
  *
  * @param {Node} n - The node to delete.
  */
-export function delete_one_child(n) {
+export const delete_one_child = (n) => {
 	// Precondition: n has at most one non-leaf child.
 	// assert( n.right.isLeaf() || n.left.isLeaf());
 
@@ -39,4 +39,4 @@ export function delete_one_child(n) {
 	//    If n is red then its child can only be black. Replacing n with its
 	//    child suffices.
 	// }
-}
+};
diff --git a/src/deletion/replace_node.js b/src/deletion/replace_node.js
@@ -4,12 +4,12 @@
  * @param {Node} A - The node to replace.
  * @param {Node} B - The replacement node.
  */
-export function replace_node(A, B) {
+export const replace_node = (A, B) => {
 	// Assert( A.parent !== null ) ;
 	// we never apply delete_one_child on the root so we are safe
 
 	if (A === A.parent.left) A.parent.left = B;
 	else A.parent.right = B;
 
 	B.parent = A.parent;
-}
+};
diff --git a/src/family/grandparent.js b/src/family/grandparent.js
@@ -4,8 +4,8 @@
  * @param {Node} node - The input node.
  * @returns {Node}
  */
-export function grandparent(node) {
+export const grandparent = (node) => {
 	// Assert((node !== null) && (node.parent !== null));
 	// We only call this function when node HAS a grandparent
 	return node.parent.parent;
-}
+};
diff --git a/src/family/predecessor.js b/src/family/predecessor.js
@@ -5,11 +5,11 @@
  * @param {Node} node - The input node.
  * @returns {Node}
  */
-export function predecessor(node) {
+export const predecessor = (node) => {
 	// Assert( !node.left.isLeaf() ) ;
 	let pred = node.left;
 
 	while (!pred.right.isLeaf()) pred = pred.right;
 
 	return pred;
-}
+};
diff --git a/src/family/sibling.js b/src/family/sibling.js
@@ -4,10 +4,10 @@
  * @param {Node} node - The input node.
  * @returns {Node}
  */
-export function sibling(node) {
+export const sibling = (node) => {
 	// Assert((node !== null) && (node.parent !== null));
 	// We only use this function when node HAS a sibling so this case can never
 	// happen.
 
 	return node === node.parent.left ? node.parent.right : node.parent.left;
-}
+};
diff --git a/src/family/uncle.js b/src/family/uncle.js
@@ -7,10 +7,10 @@ import {grandparent} from './grandparent.js';
  * @param {Node} node - The input node.
  * @returns {Node}
  */
-export function uncle(node) {
+export const uncle = (node) => {
 	const g = grandparent(node);
 	// Assert( g !== null ) ;
 	// this can never happen
 	if (node.parent === g.left) return g.right.isLeaf() ? null : g.right;
 	return g.left.isLeaf() ? null : g.left;
-}
+};
diff --git a/src/insertion/insert.js b/src/insertion/insert.js
@@ -14,7 +14,7 @@
  * @param {Node} B - The node to insert.
  * @returns {Node} B - The node that has been inserted.
  */
-export function insert(compare, A, B) {
+export const insert = (compare, A, B) => {
 	while (true) {
 		if (compare(B.key, A.key) < 0) {
 			const node = A.left;
@@ -40,4 +40,4 @@ export function insert(compare, A, B) {
 	B.parent = A;
 
 	return B;
-}
+};
diff --git a/src/insertion/insert_case1.js b/src/insertion/insert_case1.js
@@ -7,7 +7,7 @@ import {insert_case2} from './insert_case2.js';
  *
  * @param {Node} n - The input node.
  */
-export function insert_case1(n) {
+export const insert_case1 = (n) => {
 	/**
 	 * If n is the root of the tree, paint it black and we are done.
 	 *
@@ -17,4 +17,4 @@ export function insert_case1(n) {
 	 */
 	if (n.parent === null) n.color = BLACK;
 	else insert_case2(n);
-}
+};
diff --git a/src/insertion/insert_case2.js b/src/insertion/insert_case2.js
@@ -8,7 +8,7 @@ import {insert_case3} from './insert_case3.js';
  *
  * @param {Node} n - The input node.
  */
-export function insert_case2(n) {
+export const insert_case2 = (n) => {
 	/**
 	 * If the parent of n is black then we have nothing to do.
 	 *
@@ -21,4 +21,4 @@ export function insert_case2(n) {
 	if (n.parent.color === BLACK) return;
 
 	insert_case3(n);
-}
+};
diff --git a/src/insertion/insert_case3.js b/src/insertion/insert_case3.js
@@ -11,7 +11,7 @@ import {insert_case4} from './insert_case4.js';
  *
  * @param {Node} n - The input node.
  */
-export function insert_case3(n) {
+export const insert_case3 = (n) => {
 	const u = uncle(n);
 
 	/**
@@ -35,4 +35,4 @@ export function insert_case3(n) {
 		g.color = RED;
 		insert_case1(g);
 	} else insert_case4(n);
-}
+};
diff --git a/src/insertion/insert_case4.js b/src/insertion/insert_case4.js
@@ -13,7 +13,7 @@ import {insert_case5} from './insert_case5.js';
  *
  * @param {Node} n - The input node.
  */
-export function insert_case4(n) {
+export const insert_case4 = (n) => {
 	const g = grandparent(n);
 
 	/**
@@ -75,4 +75,4 @@ export function insert_case4(n) {
 	}
 
 	insert_case5(n);
-}
+};
diff --git a/src/insertion/insert_case5.js b/src/insertion/insert_case5.js
@@ -12,7 +12,7 @@ import {grandparent} from '../family/grandparent.js';
  *
  * @param {Node} n - The input node.
  */
-export function insert_case5(n) {
+export const insert_case5 = (n) => {
 	const g = grandparent(n);
 
 	// Repaint n's parent black, n's grandparent red
@@ -44,4 +44,4 @@ export function insert_case5(n) {
 	 *                  / \       / \
 	 *                 =   =     -   -
 	 */ else rotate_left(g);
-}
+};
diff --git a/src/rotate/rotate_left.js b/src/rotate/rotate_left.js
@@ -13,7 +13,7 @@
  *
  */
 
-export function rotate_left(A) {
+export const rotate_left = (A) => {
 	const B = A.right;
 	const a = A.left;
 	const b = B.left;
@@ -31,4 +31,4 @@ export function rotate_left(A) {
 	a.parent = B;
 	b.parent = B;
 	c.parent = A;
-}
+};
diff --git a/src/rotate/rotate_right.js b/src/rotate/rotate_right.js
@@ -13,7 +13,7 @@
  *
  */
 
-export function rotate_right(B) {
+export const rotate_right = (B) => {
 	const A = B.left;
 	const a = A.left;
 	const b = A.right;
@@ -31,4 +31,4 @@ export function rotate_right(B) {
 	a.parent = B;
 	b.parent = A;
 	c.parent = A;
-}
+};
diff --git a/src/search/search.js b/src/search/search.js
@@ -6,7 +6,7 @@
  * @param {Key} key - The key to search for.
  * @returns {Node}
  */
-export function search(compare, root, key) {
+export const search = (compare, root, key) => {
 	while (true) {
 		const d = compare(key, root.key);
 
@@ -20,4 +20,4 @@ export function search(compare, root, key) {
 			return null;
 		}
 	}
-}
+};

Original file line number	Diff line number	Diff line change
`@@ -15,7 +15,7 @@ import {delete_case6} from './delete_case6.js';`
`15`	`15`	`*`
`16`	`16`	`* @param {Node} n - The input node.`
`17`	`17`	`*/`
`18`		`-export function delete_case5(n) {`
	`18`	`+export const delete_case5 = (n) => {`
`19`	`19`	`const s = sibling(n);`
`20`	`20`
`21`	`21`	`// The following statements just force the red n's sibling child to be on`
`@@ -55,4 +55,4 @@ export function delete_case5(n) {`
`55`	`55`	`}`
`56`	`56`
`57`	`57`	`delete_case6(n);`
`58`		`-}`
	`58`	`+};`
Original file line number	Diff line number	Diff line change
`@@ -14,7 +14,7 @@ import {sibling} from '../family/sibling.js';`
`14`	`14`	`*`
`15`	`15`	`* @param {Node} n - The input node.`
`16`	`16`	`*/`
`17`		`-export function delete_case6(n) {`
	`17`	`+export const delete_case6 = (n) => {`
`18`	`18`	`const s = sibling(n);`
`19`	`19`
`20`	`20`	`/**`
`@@ -48,4 +48,4 @@ export function delete_case6(n) {`
`48`	`48`	`s.left.color = BLACK;`
`49`	`49`	`rotate_right(n.parent);`
`50`	`50`	`}`
`51`		`-}`
	`51`	`+};`