simplify code

functional-data-structure · Sep 8, 2015 · 6df0e18 · 6df0e18
1 parent 07f847a
commit 6df0e18
Show file tree

Hide file tree

Showing 10 changed files with 10 additions and 64 deletions.
diff --git a/js/dist/fingertree.js b/js/dist/fingertree.js
@@ -431,11 +431,6 @@ function _classCallCheck(instance, Constructor) { if (!(instance instanceof Cons
 				value: function splitDigit(p, i, M) {
 					return new Split([], this.a, []);
 				}
-			}, {
-				key: 'length',
-				get: function get() {
-					return 1;
-				}
 			}]);
 
 			return One;
@@ -521,11 +516,6 @@ function _classCallCheck(instance, Constructor) { if (!(instance instanceof Cons
 					if (p(i)) return new Split([], this.a, [this.b]);
 					return new Split([this.a], this.b, []);
 				}
-			}, {
-				key: 'length',
-				get: function get() {
-					return 2;
-				}
 			}]);
 
 			return Two;
@@ -618,11 +608,6 @@ function _classCallCheck(instance, Constructor) { if (!(instance instanceof Cons
 					if (p(i)) return new Split([this.a], this.b, [this.c]);
 					return new Split([this.a, this.b], this.c, []);
 				}
-			}, {
-				key: 'length',
-				get: function get() {
-					return 3;
-				}
 			}]);
 
 			return Three;
@@ -723,11 +708,6 @@ function _classCallCheck(instance, Constructor) { if (!(instance instanceof Cons
 					if (p(i)) return new Split([this.a, this.b], this.c, [this.d]);
 					return new Split([this.a, this.b, this.c], this.d, []);
 				}
-			}, {
-				key: 'length',
-				get: function get() {
-					return 4;
-				}
 			}]);
 
 			return Four;
@@ -801,11 +781,6 @@ function _classCallCheck(instance, Constructor) { if (!(instance instanceof Cons
 				value: function cons(value) {
 					throw new Error("trying to call cons of Node2");
 				}
-			}, {
-				key: 'length',
-				get: function get() {
-					throw new Error("trying to call length of Node2");
-				}
 			}]);
 
 			return Node2;
@@ -891,11 +866,6 @@ function _classCallCheck(instance, Constructor) { if (!(instance instanceof Cons
 				value: function cons(value) {
 					throw new Error("trying to call cons of Node3");
 				}
-			}, {
-				key: 'length',
-				get: function get() {
-					throw new Error("trying to call length of Node3");
-				}
 			}]);
 
 			return Node3;
@@ -1165,7 +1135,7 @@ function _classCallCheck(instance, Constructor) { if (!(instance instanceof Cons
 				value: function tail() {
 					var _this = this;
 
-					if (this.left.length === 1) {
+					if (this.left instanceof One) {
 
 						if (this.middle.empty()) {
 							return from_iterable(this.M, this.right);
@@ -1183,7 +1153,7 @@ function _classCallCheck(instance, Constructor) { if (!(instance instanceof Cons
 				value: function init() {
 					var _this2 = this;
 
-					if (this.right.length === 1) {
+					if (this.right instanceof One) {
 
 						if (this.middle.empty()) {
 							return from_iterable(this.M, this.left);
@@ -1200,7 +1170,7 @@ function _classCallCheck(instance, Constructor) { if (!(instance instanceof Cons
 				key: 'cons',
 				value: function cons(value) {
 
-					if (this.left.length === 4) {
+					if (this.left instanceof Four) {
 
 						return new Deep(this.M, new Two(value, this.left.head()), this.middle.cons(this.left.tail().node(this.M)), this.right);
 					}
@@ -1211,7 +1181,7 @@ function _classCallCheck(instance, Constructor) { if (!(instance instanceof Cons
 				key: 'push',
 				value: function push(value) {
 
-					if (this.right.length === 4) {
+					if (this.right instanceof Four) {
 
 						return new Deep(this.M, this.left, this.middle.push(this.right.init().node(this.M)), new Two(this.right.last(), value));
 					}

diff --git a/js/dist/fingertree.js.map b/js/dist/fingertree.js.map
diff --git a/js/dist/fingertree.min.js b/js/dist/fingertree.min.js
diff --git a/js/src/1-digit/1-One.js b/js/src/1-digit/1-One.js
@@ -12,10 +12,6 @@ class One {
 		return M.measure( this.a ) ;
 	}
 
-	get length ( ) {
-		return 1 ;
-	}
-
 	head ( ) {
 		return this.a ;
 	}

diff --git a/js/src/1-digit/2-Two.js b/js/src/1-digit/2-Two.js
@@ -14,10 +14,6 @@ class Two {
 		return M.plus( M.measure( this.a ) , M.measure( this.b ) ) ;
 	}
 
-	get length ( ) {
-		return 2 ;
-	}
-
 	head ( ) {
 		return this.a ;
 	}

diff --git a/js/src/1-digit/3-Three.js b/js/src/1-digit/3-Three.js
@@ -22,10 +22,6 @@ class Three {
 		) ;
 	}
 
-	get length ( ) {
-		return 3 ;
-	}
-
 	head ( ) {
 		return this.a ;
 	}

diff --git a/js/src/1-digit/4-Four.js b/js/src/1-digit/4-Four.js
@@ -27,10 +27,6 @@ class Four {
 		) ;
 	}
 
-	get length ( ) {
-		return 4 ;
-	}
-
 	head ( ) {
 		return this.a ;
 	}

diff --git a/js/src/2-node/Node2.js b/js/src/2-node/Node2.js
@@ -20,10 +20,6 @@ class Node2 {
 		return new Two( this.a , this.b ) ;
 	}
 
-	get length ( ) {
-		throw new Error( "trying to call length of Node2" ) ;
-	}
-
 	head ( ) {
 		throw new Error( "trying to call head of Node2" ) ;
 	}

diff --git a/js/src/2-node/Node3.js b/js/src/2-node/Node3.js
@@ -22,10 +22,6 @@ class Node3 {
 		return new Three( this.a , this.b , this.c ) ;
 	}
 
-	get length ( ) {
-		throw new Error( "trying to call length of Node3" ) ;
-	}
-
 	head ( ) {
 		throw new Error( "trying to call head of Node3" ) ;
 	}

diff --git a/js/src/3-tree/1-base/2-Deep.js b/js/src/3-tree/1-base/2-Deep.js
@@ -33,7 +33,7 @@ class Deep extends Tree {
 
 	tail ( ) {
 
-		if ( this.left.length === 1 ) {
+		if ( this.left instanceof One ) {
 
 			if ( this.middle.empty( ) ) {
 				return from_iterable( this.M , this.right ) ;
@@ -49,7 +49,7 @@ class Deep extends Tree {
 
 	init ( ) {
 
-		if ( this.right.length === 1 ) {
+		if ( this.right instanceof One ) {
 
 			if ( this.middle.empty( ) ) {
 				return from_iterable( this.M , this.left ) ;
@@ -65,7 +65,7 @@ class Deep extends Tree {
 
 	cons ( value )  {
 
-		if ( this.left.length === 4 ) {
+		if ( this.left instanceof Four ) {
 
 			return new Deep(
 				this.M ,
@@ -82,7 +82,7 @@ class Deep extends Tree {
 
 	push ( value ) {
 
-		if ( this.right.length === 4 ) {
+		if ( this.right instanceof Four ) {
 
 			return new Deep(
 				this.M ,