Skip to content

Commit 7785ce0

Browse files
committed
Merge: Clean up constructors in core/text
Remove useless named init when automatic-constructor are sufficient, and remove old_style_init when named init are sufficient. This lib cleanup is part of an ongoing cleanup of constructors, see #1800 Pull-Request: #1839 Reviewed-by: Alexis Laferrière <alexis.laf@xymus.net> Reviewed-by: Lucas Bajolet <r4pass@hotmail.com>
2 parents afd201e + 79aeb07 commit 7785ce0

File tree

2 files changed

+61
-173
lines changed

2 files changed

+61
-173
lines changed

lib/core/text/flat.nit

Lines changed: 26 additions & 44 deletions
Original file line numberDiff line numberDiff line change
@@ -533,11 +533,6 @@ private class FlatStringCharReverseIterator
533533

534534
var curr_pos: Int
535535

536-
init with_pos(tgt: FlatString, pos: Int)
537-
do
538-
init(tgt, pos)
539-
end
540-
541536
redef fun is_ok do return curr_pos >= 0
542537

543538
redef fun item do return target[curr_pos]
@@ -553,14 +548,11 @@ private class FlatStringCharIterator
553548

554549
var target: FlatString
555550

556-
var max: Int
551+
var max: Int is noautoinit
557552

558553
var curr_pos: Int
559554

560-
init with_pos(tgt: FlatString, pos: Int)
561-
do
562-
init(tgt, tgt.length - 1, pos)
563-
end
555+
init do max = target.length - 1
564556

565557
redef fun is_ok do return curr_pos <= max
566558

@@ -579,9 +571,9 @@ private class FlatStringCharView
579571

580572
redef fun [](index) do return target[index]
581573

582-
redef fun iterator_from(start) do return new FlatStringCharIterator.with_pos(target, start)
574+
redef fun iterator_from(start) do return new FlatStringCharIterator(target, start)
583575

584-
redef fun reverse_iterator_from(start) do return new FlatStringCharReverseIterator.with_pos(target, start)
576+
redef fun reverse_iterator_from(start) do return new FlatStringCharReverseIterator(target, start)
585577

586578
end
587579

@@ -590,13 +582,15 @@ private class FlatStringByteReverseIterator
590582

591583
var target: FlatString
592584

593-
var target_items: NativeString
585+
var target_items: NativeString is noautoinit
594586

595587
var curr_pos: Int
596588

597-
init with_pos(tgt: FlatString, pos: Int)
589+
init
598590
do
599-
init(tgt, tgt._items, pos + tgt._first_byte)
591+
var tgt = target
592+
target_items = tgt._items
593+
curr_pos += tgt._first_byte
600594
end
601595

602596
redef fun is_ok do return curr_pos >= target._first_byte
@@ -614,13 +608,15 @@ private class FlatStringByteIterator
614608

615609
var target: FlatString
616610

617-
var target_items: NativeString
611+
var target_items: NativeString is noautoinit
618612

619613
var curr_pos: Int
620614

621-
init with_pos(tgt: FlatString, pos: Int)
615+
init
622616
do
623-
init(tgt, tgt._items, pos + tgt._first_byte)
617+
var tgt = target
618+
target_items = tgt._items
619+
curr_pos += tgt._first_byte
624620
end
625621

626622
redef fun is_ok do return curr_pos <= target._last_byte
@@ -649,9 +645,9 @@ private class FlatStringByteView
649645
return target._items[ind]
650646
end
651647

652-
redef fun iterator_from(start) do return new FlatStringByteIterator.with_pos(target, start)
648+
redef fun iterator_from(start) do return new FlatStringByteIterator(target, start)
653649

654-
redef fun reverse_iterator_from(start) do return new FlatStringByteReverseIterator.with_pos(target, start)
650+
redef fun reverse_iterator_from(start) do return new FlatStringByteReverseIterator(target, start)
655651

656652
end
657653

@@ -924,14 +920,11 @@ private class FlatBufferByteReverseIterator
924920

925921
var target: FlatBuffer
926922

927-
var target_items: NativeString
923+
var target_items: NativeString is noautoinit
928924

929925
var curr_pos: Int
930926

931-
init with_pos(tgt: FlatBuffer, pos: Int)
932-
do
933-
init(tgt, tgt._items, pos)
934-
end
927+
init do target_items = target._items
935928

936929
redef fun index do return curr_pos
937930

@@ -950,9 +943,9 @@ private class FlatBufferByteView
950943

951944
redef fun [](index) do return target._items[index]
952945

953-
redef fun iterator_from(pos) do return new FlatBufferByteIterator.with_pos(target, pos)
946+
redef fun iterator_from(pos) do return new FlatBufferByteIterator(target, pos)
954947

955-
redef fun reverse_iterator_from(pos) do return new FlatBufferByteReverseIterator.with_pos(target, pos)
948+
redef fun reverse_iterator_from(pos) do return new FlatBufferByteReverseIterator(target, pos)
956949

957950
end
958951

@@ -961,14 +954,11 @@ private class FlatBufferByteIterator
961954

962955
var target: FlatBuffer
963956

964-
var target_items: NativeString
957+
var target_items: NativeString is noautoinit
965958

966959
var curr_pos: Int
967960

968-
init with_pos(tgt: FlatBuffer, pos: Int)
969-
do
970-
init(tgt, tgt._items, pos)
971-
end
961+
init do target_items = target._items
972962

973963
redef fun index do return curr_pos
974964

@@ -987,11 +977,6 @@ private class FlatBufferCharReverseIterator
987977

988978
var curr_pos: Int
989979

990-
init with_pos(tgt: FlatBuffer, pos: Int)
991-
do
992-
init(tgt, pos)
993-
end
994-
995980
redef fun index do return curr_pos
996981

997982
redef fun is_ok do return curr_pos >= 0
@@ -1041,9 +1026,9 @@ private class FlatBufferCharView
10411026
for i in s do target.add i
10421027
end
10431028

1044-
redef fun iterator_from(pos) do return new FlatBufferCharIterator.with_pos(target, pos)
1029+
redef fun iterator_from(pos) do return new FlatBufferCharIterator(target, pos)
10451030

1046-
redef fun reverse_iterator_from(pos) do return new FlatBufferCharReverseIterator.with_pos(target, pos)
1031+
redef fun reverse_iterator_from(pos) do return new FlatBufferCharReverseIterator(target, pos)
10471032

10481033
end
10491034

@@ -1052,14 +1037,11 @@ private class FlatBufferCharIterator
10521037

10531038
var target: FlatBuffer
10541039

1055-
var max: Int
1040+
var max: Int is noautoinit
10561041

10571042
var curr_pos: Int
10581043

1059-
init with_pos(tgt: FlatBuffer, pos: Int)
1060-
do
1061-
init(tgt, tgt.length - 1, pos)
1062-
end
1044+
init do max = target.length - 1
10631045

10641046
redef fun index do return curr_pos
10651047

0 commit comments

Comments
 (0)