Skip to content

Commit 2744e0f

Browse files
Joris-van-der-WelJoris-van-der-Wel
committed
Rename first and last to firstChild and lastChild 
1 parent 11d07cd commit 2744e0f

File tree

3 files changed

+70
-70
lines changed

3 files changed

+70
-70
lines changed

‎lib/SymbolTree.js‎

Lines changed: 31 additions & 31 deletions
Original file line numberDiff line numberDiff line change
@@ -79,27 +79,27 @@ class SymbolTree {
7979
*
8080
* `O(1)`
8181
*
82-
* @method first
82+
* @method firstChild
8383
* @memberOf module:symbol-tree#
8484
* @param {Object} object
8585
* @return {Object}
8686
*/
87-
first(object) {
88-
return this._node(object).first;
87+
firstChild(object) {
88+
return this._node(object).firstChild;
8989
}
9090

9191
/**
9292
* Return the last child of the given object.
9393
*
9494
* `O(1)`
9595
*
96-
* @method last
96+
* @method lastChild
9797
* @memberOf module:symbol-tree#
9898
* @param {Object} object
9999
* @return {Object}
100100
*/
101-
last(object) {
102-
return this._node(object).last;
101+
lastChild(object) {
102+
return this._node(object).lastChild;
103103
}
104104

105105
/**
@@ -155,10 +155,10 @@ class SymbolTree {
155155
* @return {Object}
156156
*/
157157
lastInclusiveDescendant(object) {
158-
let last;
158+
let lastChild;
159159

160-
while ( (last = this._node(object).last) ) {
161-
object = last;
160+
while ( (lastChild = this._node(object).lastChild) ) {
161+
object = lastChild;
162162
}
163163

164164
return object;
@@ -218,10 +218,10 @@ class SymbolTree {
218218
const treeRoot = options && options.root;
219219
const skipChildren = options && options.skipChildren;
220220

221-
const first = !skipChildren && this._node(object).first;
221+
const firstChild = !skipChildren && this._node(object).firstChild;
222222

223-
if (first) {
224-
return first;
223+
if (firstChild) {
224+
return firstChild;
225225
}
226226

227227
do {
@@ -265,7 +265,7 @@ class SymbolTree {
265265
const filter = (options && options.filter ) || returnTrue;
266266
const thisArg = (options && options.thisArg) || undefined;
267267

268-
let object = this._node(parent).first;
268+
let object = this._node(parent).firstChild;
269269
let index = 0;
270270

271271
while (object) {
@@ -368,7 +368,7 @@ class SymbolTree {
368368
return new TreeIterator(
369369
this,
370370
parent,
371-
reverse ? parentNode.last : parentNode.first,
371+
reverse ? parentNode.lastChild : parentNode.firstChild,
372372
reverse ? TreeIterator.PREV : TreeIterator.NEXT
373373
);
374374
}
@@ -483,7 +483,7 @@ class SymbolTree {
483483
}
484484

485485
index = 0;
486-
let object = parentNode.first;
486+
let object = parentNode.firstChild;
487487

488488
if (parentNode.childIndexCachedUpTo) {
489489
const cachedUpToNode = this._node(parentNode.childIndexCachedUpTo);
@@ -522,11 +522,11 @@ class SymbolTree {
522522
childrenCount(parent) {
523523
const parentNode = this._node(parent);
524524

525-
if (!parentNode.last) {
525+
if (!parentNode.lastChild) {
526526
return 0;
527527
}
528528

529-
return this.index(parentNode.last) + 1;
529+
return this.index(parentNode.lastChild) + 1;
530530
}
531531

532532
/**
@@ -639,12 +639,12 @@ class SymbolTree {
639639
const nextNode = this._node(removeNode.next);
640640

641641
if (parentNode) {
642-
if (parentNode.first === removeObject) {
643-
parentNode.first = removeNode.next;
642+
if (parentNode.firstChild === removeObject) {
643+
parentNode.firstChild = removeNode.next;
644644
}
645645

646-
if (parentNode.last === removeObject) {
647-
parentNode.last = removeNode.prev;
646+
if (parentNode.lastChild === removeObject) {
647+
parentNode.lastChild = removeNode.prev;
648648
}
649649
}
650650

@@ -699,8 +699,8 @@ class SymbolTree {
699699
prevNode.next = newObject;
700700
}
701701

702-
if (parentNode && parentNode.first === referenceObject) {
703-
parentNode.first = newObject;
702+
if (parentNode && parentNode.firstChild === referenceObject) {
703+
parentNode.firstChild = newObject;
704704
}
705705

706706
if (parentNode) {
@@ -742,8 +742,8 @@ class SymbolTree {
742742
nextNode.prev = newObject;
743743
}
744744

745-
if (parentNode && parentNode.last === referenceObject) {
746-
parentNode.last = newObject;
745+
if (parentNode && parentNode.lastChild === referenceObject) {
746+
parentNode.lastChild = newObject;
747747
}
748748

749749
if (parentNode) {
@@ -775,12 +775,12 @@ class SymbolTree {
775775
}
776776

777777
if (referenceNode.hasChildren) {
778-
this.insertBefore(newObject, referenceNode.first);
778+
this.insertBefore(newObject, referenceNode.firstChild);
779779
}
780780
else {
781781
newNode.parent = referenceObject;
782-
referenceNode.first = newObject;
783-
referenceNode.last = newObject;
782+
referenceNode.firstChild = newObject;
783+
referenceNode.lastChild = newObject;
784784
referenceNode.childrenChanged();
785785
}
786786

@@ -809,12 +809,12 @@ class SymbolTree {
809809
}
810810

811811
if (referenceNode.hasChildren) {
812-
this.insertAfter(newObject, referenceNode.last);
812+
this.insertAfter(newObject, referenceNode.lastChild);
813813
}
814814
else {
815815
newNode.parent = referenceObject;
816-
referenceNode.first = newObject;
817-
referenceNode.last = newObject;
816+
referenceNode.firstChild = newObject;
817+
referenceNode.lastChild = newObject;
818818
referenceNode.childrenChanged();
819819
}
820820

‎lib/SymbolTreeNode.js‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,8 @@ module.exports = class SymbolTreeNode {
66
this.prev = null;
77
this.next = null;
88

9-
this.first = null;
10-
this.last = null;
9+
this.firstChild = null;
10+
this.lastChild = null;
1111

1212
/** This value is incremented anytime a children is added or removed */
1313
this.childrenVersion = 0;
@@ -25,7 +25,7 @@ module.exports = class SymbolTreeNode {
2525
}
2626

2727
get hasChildren() {
28-
return !!this.first;
28+
return !!this.firstChild;
2929
}
3030

3131
childrenChanged() {

‎test/SymbolTree.js‎

Lines changed: 36 additions & 36 deletions
Original file line numberDiff line numberDiff line change
@@ -19,8 +19,8 @@ test('unassociated object', function(t) {
1919
const a = {};
2020

2121
t.equal(false, tree.hasChildren(a));
22-
t.equal(null , tree.first (a));
23-
t.equal(null , tree.last (a));
22+
t.equal(null , tree.firstChild (a));
23+
t.equal(null , tree.lastChild (a));
2424
t.equal(null , tree.prev (a));
2525
t.equal(null , tree.next (a));
2626
t.equal(null , tree.parent (a));
@@ -36,12 +36,12 @@ test('insertBefore without parent or siblings', function(t) {
3636
t.equal(a, tree.insertBefore(a, b));
3737

3838
t.equal(false, tree.hasChildren(a));
39-
t.equal(null , tree.first (a));
40-
t.equal(null , tree.last (a));
39+
t.equal(null , tree.firstChild (a));
40+
t.equal(null , tree.lastChild (a));
4141
t.equal(null , tree.parent (a));
4242
t.equal(false, tree.hasChildren(b));
43-
t.equal(null , tree.first (b));
44-
t.equal(null , tree.last (b));
43+
t.equal(null , tree.firstChild (b));
44+
t.equal(null , tree.lastChild (b));
4545
t.equal(null , tree.parent (b));
4646

4747
t.equal(null , tree.prev(a));
@@ -59,14 +59,14 @@ test('insertAfter without parent or siblings', function(t) {
5959

6060
t.equal(b, tree.insertAfter(b, a));
6161

62-
t.equal(false, tree.hasChildren(a));
63-
t.equal(null , tree.first (a));
64-
t.equal(null , tree.last (a));
65-
t.equal(null , tree.parent (a));
66-
t.equal(false, tree.hasChildren(b));
67-
t.equal(null , tree.first (b));
68-
t.equal(null , tree.last (b));
69-
t.equal(null , tree.parent (b));
62+
t.equal(false, tree.hasChildren (a));
63+
t.equal(null , tree.firstChild (a));
64+
t.equal(null , tree.lastChild (a));
65+
t.equal(null , tree.parent (a));
66+
t.equal(false, tree.hasChildren (b));
67+
t.equal(null , tree.firstChild (b));
68+
t.equal(null , tree.lastChild (b));
69+
t.equal(null , tree.parent (b));
7070

7171
t.equal(null , tree.prev(a));
7272
t.equal(b , tree.next(a));
@@ -84,15 +84,15 @@ test('insertFirst without children', function(t) {
8484
t.equal(a, tree.insertFirst(a, parent));
8585

8686
t.equal(false , tree.hasChildren(a));
87-
t.equal(null , tree.first (a));
88-
t.equal(null , tree.last (a));
87+
t.equal(null , tree.firstChild (a));
88+
t.equal(null , tree.lastChild (a));
8989
t.equal(null , tree.prev (a));
9090
t.equal(null , tree.next (a));
9191
t.equal(parent, tree.parent (a));
9292

9393
t.equal(true , tree.hasChildren(parent));
94-
t.equal(a , tree.first (parent));
95-
t.equal(a , tree.last (parent));
94+
t.equal(a , tree.firstChild (parent));
95+
t.equal(a , tree.lastChild (parent));
9696
t.equal(null , tree.prev (a));
9797
t.equal(null , tree.next (parent));
9898
t.equal(null , tree.parent (parent));
@@ -108,15 +108,15 @@ test('insertLast without children', function(t) {
108108
t.equal(a, tree.insertLast(a, parent));
109109

110110
t.equal(false , tree.hasChildren(a));
111-
t.equal(null , tree.first (a));
112-
t.equal(null , tree.last (a));
111+
t.equal(null , tree.firstChild (a));
112+
t.equal(null , tree.lastChild (a));
113113
t.equal(null , tree.prev (a));
114114
t.equal(null , tree.next (a));
115115
t.equal(parent, tree.parent (a));
116116

117117
t.equal(true , tree.hasChildren(parent));
118-
t.equal(a , tree.first (parent));
119-
t.equal(a , tree.last (parent));
118+
t.equal(a , tree.firstChild (parent));
119+
t.equal(a , tree.lastChild (parent));
120120
t.equal(null , tree.prev (a));
121121
t.equal(null , tree.next (parent));
122122
t.equal(null , tree.parent (parent));
@@ -134,8 +134,8 @@ test('insertFirst with children', function(t) {
134134
tree.insertFirst(a, parent);
135135

136136
t.equal(true , tree.hasChildren(parent));
137-
t.equal(a , tree.first (parent));
138-
t.equal(b , tree.last (parent));
137+
t.equal(a , tree.firstChild (parent));
138+
t.equal(b , tree.lastChild (parent));
139139

140140
t.equal(parent, tree.parent (a));
141141
t.equal(null , tree.prev (a));
@@ -157,8 +157,8 @@ test('insertLast with children', function(t) {
157157
tree.insertLast(b, parent);
158158

159159
t.equal(true , tree.hasChildren(parent));
160-
t.equal(a , tree.first (parent));
161-
t.equal(b , tree.last (parent));
160+
t.equal(a , tree.firstChild (parent));
161+
t.equal(b , tree.lastChild (parent));
162162

163163
t.equal(parent, tree.parent (a));
164164
t.equal(null , tree.prev (a));
@@ -180,8 +180,8 @@ test('insertBefore with parent', function(t) {
180180
tree.insertBefore(a, b);
181181

182182
t.equal(true , tree.hasChildren(parent));
183-
t.equal(a , tree.first (parent));
184-
t.equal(b , tree.last (parent));
183+
t.equal(a , tree.firstChild (parent));
184+
t.equal(b , tree.lastChild (parent));
185185

186186
t.equal(parent, tree.parent (a));
187187
t.equal(null , tree.prev (a));
@@ -203,8 +203,8 @@ test('insertAfter with parent', function(t) {
203203
tree.insertAfter(b, a);
204204

205205
t.equal(true , tree.hasChildren(parent));
206-
t.equal(a , tree.first (parent));
207-
t.equal(b , tree.last (parent));
206+
t.equal(a , tree.firstChild (parent));
207+
t.equal(b , tree.lastChild (parent));
208208

209209
t.equal(parent, tree.parent (a));
210210
t.equal(null , tree.prev (a));
@@ -330,8 +330,8 @@ test('remove with parent', function(t) {
330330
tree.remove(a);
331331

332332
t.equal(null, tree.parent(a));
333-
t.equal(null, tree.first(parent));
334-
t.equal(null, tree.last (parent));
333+
t.equal(null, tree.firstChild(parent));
334+
t.equal(null, tree.lastChild (parent));
335335

336336
t.end();
337337
});
@@ -345,8 +345,8 @@ test('remove with children', function(t) {
345345
tree.remove(parent);
346346

347347
t.equal(parent, tree.parent(a));
348-
t.equal(a, tree.first(parent));
349-
t.equal(a, tree.last (parent));
348+
t.equal(a, tree.firstChild(parent));
349+
t.equal(a, tree.lastChild (parent));
350350

351351
t.end();
352352
});
@@ -363,8 +363,8 @@ test('remove with parent and siblings', function(t) {
363363
tree.insertAfter(c, b);
364364
tree.remove(b);
365365

366-
t.equal(a, tree.first(parent));
367-
t.equal(c, tree.last (parent));
366+
t.equal(a, tree.firstChild(parent));
367+
t.equal(c, tree.lastChild (parent));
368368

369369
t.equal(null , tree.prev (a));
370370
t.equal(c , tree.next (a));

0 commit comments

Comments
 (0)