@@ -533,11 +533,6 @@ private class FlatStringCharReverseIterator
533
533
534
534
var curr_pos : Int
535
535
536
- init with_pos (tgt : FlatString , pos : Int )
537
- do
538
- init (tgt , pos )
539
- end
540
-
541
536
redef fun is_ok do return curr_pos >= 0
542
537
543
538
redef fun item do return target [curr_pos ]
@@ -553,14 +548,11 @@ private class FlatStringCharIterator
553
548
554
549
var target : FlatString
555
550
556
- var max : Int
551
+ var max : Int is noautoinit
557
552
558
553
var curr_pos : Int
559
554
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
564
556
565
557
redef fun is_ok do return curr_pos <= max
566
558
@@ -579,9 +571,9 @@ private class FlatStringCharView
579
571
580
572
redef fun [](index ) do return target [index ]
581
573
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 )
583
575
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 )
585
577
586
578
end
587
579
@@ -590,13 +582,15 @@ private class FlatStringByteReverseIterator
590
582
591
583
var target : FlatString
592
584
593
- var target_items : NativeString
585
+ var target_items : NativeString is noautoinit
594
586
595
587
var curr_pos : Int
596
588
597
- init with_pos ( tgt : FlatString , pos : Int )
589
+ init
598
590
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
600
594
end
601
595
602
596
redef fun is_ok do return curr_pos >= target ._first_byte
@@ -614,13 +608,15 @@ private class FlatStringByteIterator
614
608
615
609
var target : FlatString
616
610
617
- var target_items : NativeString
611
+ var target_items : NativeString is noautoinit
618
612
619
613
var curr_pos : Int
620
614
621
- init with_pos ( tgt : FlatString , pos : Int )
615
+ init
622
616
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
624
620
end
625
621
626
622
redef fun is_ok do return curr_pos <= target ._last_byte
@@ -649,9 +645,9 @@ private class FlatStringByteView
649
645
return target ._items [ind ]
650
646
end
651
647
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 )
653
649
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 )
655
651
656
652
end
657
653
@@ -924,14 +920,11 @@ private class FlatBufferByteReverseIterator
924
920
925
921
var target : FlatBuffer
926
922
927
- var target_items : NativeString
923
+ var target_items : NativeString is noautoinit
928
924
929
925
var curr_pos : Int
930
926
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
935
928
936
929
redef fun index do return curr_pos
937
930
@@ -950,9 +943,9 @@ private class FlatBufferByteView
950
943
951
944
redef fun [](index ) do return target ._items [index ]
952
945
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 )
954
947
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 )
956
949
957
950
end
958
951
@@ -961,14 +954,11 @@ private class FlatBufferByteIterator
961
954
962
955
var target : FlatBuffer
963
956
964
- var target_items : NativeString
957
+ var target_items : NativeString is noautoinit
965
958
966
959
var curr_pos : Int
967
960
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
972
962
973
963
redef fun index do return curr_pos
974
964
@@ -987,11 +977,6 @@ private class FlatBufferCharReverseIterator
987
977
988
978
var curr_pos : Int
989
979
990
- init with_pos (tgt : FlatBuffer , pos : Int )
991
- do
992
- init (tgt , pos )
993
- end
994
-
995
980
redef fun index do return curr_pos
996
981
997
982
redef fun is_ok do return curr_pos >= 0
@@ -1041,9 +1026,9 @@ private class FlatBufferCharView
1041
1026
for i in s do target .add i
1042
1027
end
1043
1028
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 )
1045
1030
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 )
1047
1032
1048
1033
end
1049
1034
@@ -1052,14 +1037,11 @@ private class FlatBufferCharIterator
1052
1037
1053
1038
var target : FlatBuffer
1054
1039
1055
- var max : Int
1040
+ var max : Int is noautoinit
1056
1041
1057
1042
var curr_pos : Int
1058
1043
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
1063
1045
1064
1046
redef fun index do return curr_pos
1065
1047
0 commit comments