Skip to content

Commit d90dcc7

Browse files
christoph-dfinitychristoph-dfinity
committed
refactor: rename size_ -> size
1 parent 6ffa1f4 commit d90dcc7

File tree

4 files changed

+35
-35
lines changed

4 files changed

+35
-35
lines changed

‎src/Map.mo‎

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -129,7 +129,7 @@ module {
129129
public func clone<K, V>(map : Map<K, V>) : Map<K, V> {
130130
{
131131
var root = cloneNode(map.root);
132-
var size_ = map.size_
132+
var size = map.size
133133
}
134134
};
135135

@@ -155,7 +155,7 @@ module {
155155
var count = 0
156156
}
157157
});
158-
var size_ = 0
158+
var size = 0
159159
}
160160
};
161161

@@ -179,7 +179,7 @@ module {
179179
kvs[0] := ?(key, value);
180180
{
181181
var root = #leaf { data = { kvs; var count = 1 } };
182-
var size_ = 1
182+
var size = 1
183183
}
184184
};
185185

@@ -207,7 +207,7 @@ module {
207207
public func clear<K, V>(map : Map<K, V>) {
208208
let emptyMap = empty<K, V>();
209209
map.root := emptyMap.root;
210-
map.size_ := 0
210+
map.size := 0
211211
};
212212

213213
/// Determines whether a key-value map is empty.
@@ -231,7 +231,7 @@ module {
231231
/// Runtime: `O(1)`.
232232
/// Space: `O(1)`.
233233
public func isEmpty<K, V>(map : Map<K, V>) : Bool {
234-
map.size_ == 0
234+
map.size == 0
235235
};
236236

237237
/// Return the number of entries in a key-value map.
@@ -255,7 +255,7 @@ module {
255255
/// Runtime: `O(1)`.
256256
/// Space: `O(1)`.
257257
public func size<K, V>(map : Map<K, V>) : Nat {
258-
map.size_
258+
map.size
259259
};
260260

261261
/// Test whether two imperative maps have equal entries.
@@ -460,7 +460,7 @@ module {
460460
case (#insert(ov)) {
461461
switch (ov) {
462462
// if inserted a value that was not previously there, increment the tree size counter
463-
case null { map.size_ += 1 };
463+
case null { map.size += 1 };
464464
case _ {}
465465
};
466466
ov
@@ -479,7 +479,7 @@ module {
479479
children
480480
};
481481
// promotion always comes from inserting a new element, so increment the tree size counter
482-
map.size_ += 1;
482+
map.size += 1;
483483

484484
null
485485
}
@@ -619,7 +619,7 @@ module {
619619
case (#keyFound(deleteIndex)) {
620620
leafNode.data.count -= 1;
621621
let (_, deletedValue) = BTreeHelper.deleteAndShift<(K, V)>(leafNode.data.kvs, deleteIndex);
622-
map.size_ -= 1;
622+
map.size -= 1;
623623
?deletedValue
624624
};
625625
case _ { null }
@@ -647,7 +647,7 @@ module {
647647
};
648648
switch (deletedValueResult) {
649649
// if deleted a value from the BTree, decrement the size
650-
case (?deletedValue) { map.size_ -= 1 };
650+
case (?deletedValue) { map.size -= 1 };
651651
case null {}
652652
};
653653
deletedValueResult
@@ -1047,7 +1047,7 @@ module {
10471047
public func map<K, V1, V2>(map : Map<K, V1>, project : (K, V1) -> V2) : Map<K, V2> {
10481048
{
10491049
var root = mapNode(map.root, project);
1050-
var size_ = map.size_
1050+
var size = map.size
10511051
}
10521052
};
10531053

‎src/Queue.mo‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -111,7 +111,7 @@ module {
111111
/// Runtime: `O(1)`.
112112
/// Space: `O(1)`.
113113
public func empty<T>() : Queue<T> {
114-
{ var front = null; var back = null; var size_ = 0 }
114+
{ var front = null; var back = null; var size = 0 }
115115
};
116116

117117
/// Creates a new queue with a single element.
@@ -152,7 +152,7 @@ module {
152152
public func clear<T>(queue : Queue<T>) {
153153
queue.front := null;
154154
queue.back := null;
155-
queue.size_ := 0
155+
queue.size := 0
156156
};
157157

158158
/// Creates a deep copy of the queue.
@@ -196,7 +196,7 @@ module {
196196
/// Runtime: O(1)
197197
/// Space: O(1)
198198
public func size<T>(queue : Queue<T>) : Nat {
199-
queue.size_
199+
queue.size
200200
};
201201

202202
/// Returns `true` if the queue contains no elements.
@@ -214,7 +214,7 @@ module {
214214
/// Runtime: O(1)
215215
/// Space: O(1)
216216
public func isEmpty<T>(queue : Queue<T>) : Bool {
217-
queue.size_ == 0
217+
queue.size == 0
218218
};
219219

220220
/// Checks if an element exists in the queue using the provided equality function.
@@ -316,7 +316,7 @@ module {
316316
case null queue.back := ?node;
317317
case (?_) {}
318318
};
319-
queue.size_ += 1
319+
queue.size += 1
320320
};
321321

322322
/// Adds an element to the back of the queue.
@@ -349,7 +349,7 @@ module {
349349
case null queue.front := ?node;
350350
case (?_) {}
351351
};
352-
queue.size_ += 1
352+
queue.size += 1
353353
};
354354

355355
/// Removes and returns the first element in the queue.
@@ -377,7 +377,7 @@ module {
377377
case null { queue.back := null };
378378
case (?newFirst) { newFirst.previous := null }
379379
};
380-
queue.size_ -= 1;
380+
queue.size -= 1;
381381
?first.value
382382
}
383383
}
@@ -408,7 +408,7 @@ module {
408408
case null { queue.front := null };
409409
case (?newLast) { newLast.next := null }
410410
};
411-
queue.size_ -= 1;
411+
queue.size -= 1;
412412
?last.value
413413
}
414414
}
@@ -487,7 +487,7 @@ module {
487487
public func toArray<T>(queue : Queue<T>) : [T] {
488488
let iter = values(queue);
489489
Array.tabulate<T>(
490-
queue.size_,
490+
queue.size,
491491
func(i) {
492492
switch (iter.next()) {
493493
case null { Prim.trap("Queue.toArray(): unexpected end of iterator") };

‎src/Set.mo‎

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -126,7 +126,7 @@ module {
126126
public func clone<T>(set : Set<T>) : Set<T> {
127127
{
128128
var root = cloneNode(set.root);
129-
var size_ = set.size_
129+
var size = set.size
130130
}
131131
};
132132

@@ -153,7 +153,7 @@ module {
153153
var count = 0
154154
}
155155
});
156-
var size_ = 0
156+
var size = 0
157157
}
158158
};
159159

@@ -177,7 +177,7 @@ module {
177177
{
178178
var root =
179179
#leaf({ data = { elements; var count = 1 } });
180-
var size_ = 1
180+
var size = 1
181181
}
182182
};
183183

@@ -205,7 +205,7 @@ module {
205205
public func clear<T>(set : Set<T>) {
206206
let emptySet = empty<T>();
207207
set.root := emptySet.root;
208-
set.size_ := 0
208+
set.size := 0
209209
};
210210

211211
/// Determines whether a set is empty.
@@ -230,7 +230,7 @@ module {
230230
/// Runtime: `O(1)`.
231231
/// Space: `O(1)`.
232232
public func isEmpty<T>(set : Set<T>) : Bool {
233-
set.size_ == 0
233+
set.size == 0
234234
};
235235

236236
/// Return the number of elements in a set.
@@ -253,7 +253,7 @@ module {
253253
/// Runtime: `O(1)`.
254254
/// Space: `O(1)`.
255255
public func size<T>(set : Set<T>) : Nat {
256-
set.size_
256+
set.size
257257
};
258258

259259
/// Test whether two imperative sets are equal.
@@ -276,7 +276,7 @@ module {
276276
/// Runtime: `O(n)`.
277277
/// Space: `O(1)`.
278278
public func equal<T>(set1 : Set<T>, set2 : Set<T>, compare : (implicit : (T, T) -> Types.Order)) : Bool {
279-
if (set1.size_ != set2.size_) return false;
279+
if (set1.size != set2.size) return false;
280280
// TODO: optimize
281281
let iterator1 = values(set1);
282282
let iterator2 = values(set2);
@@ -389,7 +389,7 @@ module {
389389
switch (insertResult) {
390390
case (#inserted) {
391391
// if inserted an element that was not previously there, increment the tree size counter
392-
set.size_ += 1;
392+
set.size += 1;
393393
true
394394
};
395395
case (#existent) {
@@ -407,7 +407,7 @@ module {
407407
children
408408
});
409409
// promotion always comes from inserting a new element, so increment the tree size counter
410-
set.size_ += 1;
410+
set.size += 1;
411411
true
412412
}
413413
}
@@ -478,7 +478,7 @@ module {
478478
case (#elementFound(deleteIndex)) {
479479
leafNode.data.count -= 1;
480480
ignore BTreeHelper.deleteAndShift<T>(leafNode.data.elements, deleteIndex);
481-
set.size_ -= 1;
481+
set.size -= 1;
482482
true
483483
};
484484
case _ { false }
@@ -507,7 +507,7 @@ module {
507507
};
508508
if (deletedElement) {
509509
// if deleted an element from the BTree, decrement the size
510-
set.size_ -= 1
510+
set.size -= 1
511511
};
512512
deletedElement
513513
}
@@ -745,7 +745,7 @@ module {
745745
/// where `m` and `n` denote the number of elements stored in the sets `set1` and `set2`, respectively,
746746
/// and assuming that the `compare` function implements an `O(1)` comparison.
747747
public func isSubset<T>(set1 : Set<T>, set2 : Set<T>, compare : (implicit : (T, T) -> Order.Order)) : Bool {
748-
if (set1.size_ > set2.size_) { return false };
748+
if (set1.size > set2.size) { return false };
749749
// TODO: optimize
750750
for (element in values(set1)) {
751751
if (not contains(set2, compare, element)) {

‎src/Types.mo‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -65,7 +65,7 @@ module {
6565
public type Queue<T> = {
6666
var front : ?Node<T>;
6767
var back : ?Node<T>;
68-
var size_ : Nat
68+
var size : Nat
6969
};
7070

7171
public type Node<T> = {
@@ -105,7 +105,7 @@ module {
105105

106106
public type Set<T> = {
107107
var root : Node<T>;
108-
var size_ : Nat
108+
var size : Nat
109109
}
110110
};
111111
public type Set<T> = Set.Set<T>;
@@ -132,7 +132,7 @@ module {
132132

133133
public type Map<K, V> = {
134134
var root : Node<K, V>;
135-
var size_ : Nat
135+
var size : Nat
136136
}
137137
};
138138

0 commit comments

Comments
 (0)