Skip to content

Commit 9e3b2b9

Browse files
tonyfettesbobzhang
authored andcommitted
refactor: use for in
1 parent 5fddbf3 commit 9e3b2b9

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

56 files changed

+210
-210
lines changed

array/deprecated.mbt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@ pub fn FixedArray::new[T](length : Int, value : () -> T) -> FixedArray[T] {
4646
[]
4747
} else {
4848
let array = FixedArray::make(length, value())
49-
for i = 1; i < length; i = i + 1 {
49+
for i in 1..<length {
5050
array[i] = value()
5151
}
5252
array

array/fixedarray.mbt

Lines changed: 15 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -244,7 +244,7 @@ pub fn FixedArray::map[T, U](
244244
return []
245245
}
246246
let res = FixedArray::make(self.length(), f(self[0]))
247-
for i = 1; i < self.length(); i = i + 1 {
247+
for i in 1..<self.length() {
248248
res[i] = f(self[i])
249249
}
250250
res
@@ -279,7 +279,7 @@ pub fn FixedArray::mapi[T, U](
279279
return []
280280
}
281281
let res = FixedArray::make(self.length(), f(0, self[0]))
282-
for i = 1; i < self.length(); i = i + 1 {
282+
for i in 1..<self.length() {
283283
res[i] = f(i, self[i])
284284
}
285285
res
@@ -338,7 +338,7 @@ pub fn FixedArray::makei[T](length : Int, value : (Int) -> T) -> FixedArray[T] {
338338
[]
339339
} else {
340340
let array = FixedArray::make(length, value(0))
341-
for i = 1; i < length; i = i + 1 {
341+
for i in 1..<length {
342342
array[i] = value(i)
343343
}
344344
array
@@ -544,7 +544,7 @@ test "rev_foldi" {
544544
/// ```
545545
pub fn FixedArray::rev_inplace[T](self : FixedArray[T]) -> Unit {
546546
let mid_len = self.length() / 2
547-
for i = 0; i < mid_len; i = i + 1 {
547+
for i in 0..<mid_len {
548548
let j = self.length() - i - 1
549549
let temp = self[i]
550550
self[i] = self[j]
@@ -578,7 +578,7 @@ pub fn FixedArray::rev[T](self : FixedArray[T]) -> FixedArray[T] {
578578
[.., first] => {
579579
let res = FixedArray::make(self.length(), first)
580580
let len = self.length()
581-
for i = 1; i < len; i = i + 1 {
581+
for i in 1..<len {
582582
res[i] = self[len - 1 - i]
583583
}
584584
res
@@ -683,7 +683,7 @@ test "swap" {
683683
/// assert_false!(arr.all(fn(ele) { ele < 5 }))
684684
/// ```
685685
pub fn FixedArray::all[T](self : FixedArray[T], f : (T) -> Bool) -> Bool {
686-
for i = 0; i < self.length(); i = i + 1 {
686+
for i in 0..<self.length() {
687687
if not(f(self[i])) {
688688
return false
689689
}
@@ -719,7 +719,7 @@ test "all" {
719719
/// assert_true!(arr.any(fn(ele) { ele < 5 }))
720720
/// ```
721721
pub fn FixedArray::any[T](self : FixedArray[T], f : (T) -> Bool) -> Bool {
722-
for i = 0; i < self.length(); i = i + 1 {
722+
for i in 0..<self.length() {
723723
if f(self[i]) {
724724
return true
725725
}
@@ -770,7 +770,7 @@ test "fill" {
770770
/// assert_eq!(arr.search(3), Some(0))
771771
/// ```
772772
pub fn FixedArray::search[T : Eq](self : FixedArray[T], value : T) -> Int? {
773-
for i = 0; i < self.length(); i = i + 1 {
773+
for i in 0..<self.length() {
774774
if self[i] == value {
775775
return Some(i)
776776
}
@@ -806,7 +806,7 @@ test "search" {
806806
/// assert_true!(arr.contains(3))
807807
/// ```
808808
pub fn FixedArray::contains[T : Eq](self : FixedArray[T], value : T) -> Bool {
809-
for i = 0; i < self.length(); i = i + 1 {
809+
for i in 0..<self.length() {
810810
if self[i] == value {
811811
return true
812812
}
@@ -848,7 +848,7 @@ pub fn FixedArray::starts_with[T : Eq](
848848
if prefix.length() > self.length() {
849849
return false
850850
}
851-
for i = 0; i < prefix.length(); i = i + 1 {
851+
for i in 0..<prefix.length() {
852852
if self[i] != prefix[i] {
853853
return false
854854
}
@@ -898,7 +898,7 @@ pub fn FixedArray::ends_with[T : Eq](
898898
if suf_len > self_len {
899899
return false
900900
}
901-
for i = 0; i < suf_len; i = i + 1 {
901+
for i in 0..<suf_len {
902902
if self[self_len - suf_len + i] != suffix[i] {
903903
return false
904904
}
@@ -967,7 +967,7 @@ pub impl[T : Eq] Eq for FixedArray[T] with op_equal(
967967
if self.length() != that.length() {
968968
return false
969969
}
970-
for i = 0; i < self.length(); i = i + 1 {
970+
for i in 0..<self.length() {
971971
if self[i] != that[i] {
972972
return false
973973
}
@@ -1012,7 +1012,7 @@ fn deep_clone[T](arr : FixedArray[T]) -> FixedArray[T] {
10121012
[]
10131013
} else {
10141014
let result = FixedArray::make(len, arr[0])
1015-
for i = 0; i < len; i = i + 1 {
1015+
for i in 0..<len {
10161016
result[i] = arr[i]
10171017
}
10181018
result
@@ -1073,10 +1073,10 @@ pub fn FixedArray::op_add[T](
10731073
deep_clone(self)
10741074
} else {
10751075
let result = FixedArray::make(slen + nlen, self[0])
1076-
for i = 1; i < slen; i = i + 1 {
1076+
for i in 1..<slen {
10771077
result[i] = self[i]
10781078
}
1079-
for i = 0; i < nlen; i = i + 1 {
1079+
for i in 0..<nlen {
10801080
result[i + slen] = other[i]
10811081
}
10821082
result

array/fixedarray_sort.mbt

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -306,7 +306,7 @@ fn fixed_get_limit(len : Int) -> Int {
306306
fn fixed_try_bubble_sort[T : Compare](arr : FixedArraySlice[T]) -> Bool {
307307
let max_tries = 8
308308
let mut tries = 0
309-
for i = 1; i < arr.length(); i = i + 1 {
309+
for i in 1..<arr.length() {
310310
let mut sorted = true
311311
for j = i; j > 0 && arr[j - 1] > arr[j]; j = j - 1 {
312312
sorted = false
@@ -329,7 +329,7 @@ fn fixed_try_bubble_sort[T : Compare](arr : FixedArraySlice[T]) -> Bool {
329329
///
330330
/// Returns whether the array is sorted.
331331
fn fixed_bubble_sort[T : Compare](arr : FixedArraySlice[T]) -> Unit {
332-
for i = 1; i < arr.length(); i = i + 1 {
332+
for i in 1..<arr.length() {
333333
for j = i; j > 0 && arr[j - 1] > arr[j]; j = j - 1 {
334334
arr.swap(j, j - 1)
335335
}
@@ -353,7 +353,7 @@ fn fixed_partition[T : Compare](
353353
let pivot = arr[arr.length() - 1]
354354
let mut i = 0
355355
let mut partitioned = true
356-
for j = 0; j < arr.length() - 1; j = j + 1 {
356+
for j in 0..<(arr.length() - 1) {
357357
if arr[j] < pivot {
358358
if i != j {
359359
arr.swap(i, j)
@@ -543,7 +543,7 @@ test "stable_sort_complex" {
543543
let arr = FixedArray::make(total_len, 0)
544544
let mut index = 0
545545
for i = 0, len = run_lens.length(); i < len; i = i + 1 {
546-
for j = 0; j < run_lens[i]; j = j + 1 {
546+
for j in 0..<run_lens[i] {
547547
arr[index] = j
548548
index += 1
549549
}

array/fixedarray_sort_by.mbt

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -200,7 +200,7 @@ fn fixed_try_bubble_sort_by[T](
200200
) -> Bool {
201201
let max_tries = 8
202202
let mut tries = 0
203-
for i = 1; i < arr.length(); i = i + 1 {
203+
for i in 1..<arr.length() {
204204
let mut sorted = true
205205
for j = i; j > 0 && cmp(arr[j - 1], arr[j]) > 0; j = j - 1 {
206206
sorted = false
@@ -226,7 +226,7 @@ fn fixed_bubble_sort_by[T](
226226
arr : FixedArraySlice[T],
227227
cmp : (T, T) -> Int
228228
) -> Unit {
229-
for i = 1; i < arr.length(); i = i + 1 {
229+
for i in 1..<arr.length() {
230230
for j = i; j > 0 && cmp(arr[j - 1], arr[j]) > 0; j = j - 1 {
231231
arr.swap(j, j - 1)
232232
}
@@ -256,7 +256,7 @@ fn fixed_partition_by[T](
256256
let pivot = arr[arr.length() - 1]
257257
let mut i = 0
258258
let mut partitioned = true
259-
for j = 0; j < arr.length() - 1; j = j + 1 {
259+
for j in 0..<(arr.length() - 1) {
260260
if cmp(arr[j], pivot) < 0 {
261261
if i != j {
262262
arr.swap(i, j)

array/sort.mbt

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -110,7 +110,7 @@ fn get_limit(len : Int) -> Int {
110110
fn try_bubble_sort[T : Compare](arr : ArrayView[T]) -> Bool {
111111
let max_tries = 8
112112
let mut tries = 0
113-
for i = 1; i < arr.length(); i = i + 1 {
113+
for i in 1..<arr.length() {
114114
let mut sorted = true
115115
for j = i; j > 0 && arr[j - 1] > arr[j]; j = j - 1 {
116116
sorted = false
@@ -129,7 +129,7 @@ fn try_bubble_sort[T : Compare](arr : ArrayView[T]) -> Bool {
129129
///|
130130
/// Used when the array is small enough (<=16) to avoid recursion overhead.
131131
fn ArrayView::insertion_sort[T : Compare](arr : ArrayView[T]) -> Unit {
132-
for i = 1; i < arr.length(); i = i + 1 {
132+
for i in 1..<arr.length() {
133133
for j = i; j > 0 && arr[j - 1] > arr[j]; j = j - 1 {
134134
arr.swap(j, j - 1)
135135
}
@@ -142,7 +142,7 @@ fn partition[T : Compare](arr : ArrayView[T], pivot_index : Int) -> (Int, Bool)
142142
let pivot = arr[arr.length() - 1]
143143
let mut i = 0
144144
let mut partitioned = true
145-
for j = 0; j < arr.length() - 1; j = j + 1 {
145+
for j in 0..<(arr.length() - 1) {
146146
if arr[j] < pivot {
147147
if i != j {
148148
arr.swap(i, j)

array/sort_by.mbt

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -124,7 +124,7 @@ fn quick_sort_by[T](
124124
fn try_bubble_sort_by[T](arr : ArrayView[T], cmp : (T, T) -> Int) -> Bool {
125125
let max_tries = 8
126126
let mut tries = 0
127-
for i = 1; i < arr.length(); i = i + 1 {
127+
for i in 1..<arr.length() {
128128
let mut sorted = true
129129
for j = i; j > 0 && cmp(arr[j - 1], arr[j]) > 0; j = j - 1 {
130130
sorted = false
@@ -147,7 +147,7 @@ fn try_bubble_sort_by[T](arr : ArrayView[T], cmp : (T, T) -> Int) -> Bool {
147147
///
148148
/// Returns whether the array is sorted.
149149
fn bubble_sort_by[T](arr : ArrayView[T], cmp : (T, T) -> Int) -> Unit {
150-
for i = 1; i < arr.length(); i = i + 1 {
150+
for i in 1..<arr.length() {
151151
for j = i; j > 0 && cmp(arr[j - 1], arr[j]) > 0; j = j - 1 {
152152
arr.swap(j, j - 1)
153153
}
@@ -164,7 +164,7 @@ fn partition_by[T](
164164
let pivot = arr[arr.length() - 1]
165165
let mut i = 0
166166
let mut partitioned = true
167-
for j = 0; j < arr.length() - 1; j = j + 1 {
167+
for j in 0..<(arr.length() - 1) {
168168
if cmp(arr[j], pivot) < 0 {
169169
if i != j {
170170
arr.swap(i, j)

array/view.mbt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ pub typealias View[T] = ArrayView[T]
4444
/// ```
4545
pub fn View::rev_inplace[T](self : View[T]) -> Unit {
4646
let mid_len = self.length() / 2
47-
for i = 0; i < mid_len; i = i + 1 {
47+
for i in 0..<mid_len {
4848
let j = self.length() - i - 1
4949
self.swap(i, j)
5050
}

builtin/array.mbt

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -658,7 +658,7 @@ pub fn Array::is_sorted[T : Compare](self : Array[T]) -> Bool {
658658
/// }
659659
/// ```
660660
pub fn Array::rev_inplace[T](self : Array[T]) -> Unit {
661-
for i = 0; i < self.length() / 2; i = i + 1 {
661+
for i in 0..<(self.length() / 2) {
662662
let temp = self.unsafe_get(i)
663663
self.unsafe_set(i, self.unsafe_get(self.length() - i - 1))
664664
self.unsafe_set(self.length() - i - 1, temp)
@@ -686,7 +686,7 @@ pub fn Array::rev_inplace[T](self : Array[T]) -> Unit {
686686
/// ```
687687
pub fn Array::rev[T](self : Array[T]) -> Array[T] {
688688
let arr = Array::make_uninit(self.length())
689-
for i = 0; i < self.length(); i = i + 1 {
689+
for i in 0..<self.length() {
690690
arr.unsafe_set(i, self.unsafe_get(self.length() - i - 1))
691691
}
692692
arr
@@ -790,7 +790,7 @@ pub fn Array::starts_with[T : Eq](self : Array[T], prefix : Array[T]) -> Bool {
790790
if prefix.length() > self.length() {
791791
return false
792792
}
793-
for i = 0; i < prefix.length(); i = i + 1 {
793+
for i in 0..<prefix.length() {
794794
if self.unsafe_get(i) != prefix.unsafe_get(i) {
795795
break false
796796
}
@@ -829,7 +829,7 @@ pub fn Array::ends_with[T : Eq](self : Array[T], suffix : Array[T]) -> Bool {
829829
if suffix.length() > self.length() {
830830
return false
831831
}
832-
for i = 0; i < suffix.length(); i = i + 1 {
832+
for i in 0..<suffix.length() {
833833
if self.unsafe_get(self.length() - suffix.length() + i) !=
834834
suffix.unsafe_get(i) {
835835
break false
@@ -1278,7 +1278,7 @@ pub fn Array::flatten[T](self : Array[Array[T]]) -> Array[T] {
12781278
/// ```
12791279
pub fn Array::repeat[T](self : Array[T], times : Int) -> Array[T] {
12801280
let v = Array::new(capacity=self.length() * times)
1281-
for i = 0; i < times; i = i + 1 {
1281+
for i in 0..<times {
12821282
v.append(self)
12831283
}
12841284
v
@@ -1473,7 +1473,7 @@ pub fn Array::dedup[T : Eq](self : Array[T]) -> Unit {
14731473
return
14741474
}
14751475
let mut w = 1
1476-
for i = 1; i < self.length(); i = i + 1 {
1476+
for i in 1..<self.length() {
14771477
if self[i] != self[w - 1] {
14781478
self[w] = self[i]
14791479
w = w + 1
@@ -1509,13 +1509,13 @@ pub fn Array::dedup[T : Eq](self : Array[T]) -> Unit {
15091509
pub fn Array::extract_if[T](self : Array[T], f : (T) -> Bool) -> Array[T] {
15101510
let v = []
15111511
let indices = []
1512-
for i = 0; i < self.length(); i = i + 1 {
1512+
for i in 0..<self.length() {
15131513
if f(self[i]) {
15141514
v.push(self[i])
15151515
indices.push(i)
15161516
}
15171517
}
1518-
for i = 0; i < indices.length(); i = i + 1 {
1518+
for i in 0..<indices.length() {
15191519
self.remove(indices[i] - i) |> ignore
15201520
}
15211521
v

builtin/autoloc.mbt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -64,7 +64,7 @@ pub(all) type ArgsLoc Array[SourceLoc?] derive(Show)
6464
pub fn ArgsLoc::to_json(self : ArgsLoc) -> String {
6565
let buf = StringBuilder::new(size_hint=10)
6666
buf.write_char('[')
67-
for i = 0; i < self._.length(); i = i + 1 {
67+
for i in 0..<self._.length() {
6868
if i != 0 {
6969
buf.write_string(", ")
7070
}

0 commit comments

Comments
 (0)