@@ -16,9 +16,12 @@ export class Array<T> {
1616 }
1717
1818 constructor ( capacity : i32 = 0 ) {
19- if ( capacity < 0 )
19+ if ( capacity < 0 ) {
2020 throw new RangeError ( "Invalid array length" ) ;
21- this . __memory = capacity ? allocate_memory ( < usize > capacity * sizeof < T > ( ) ) : 0 ;
21+ }
22+ this . __memory = capacity
23+ ? allocate_memory ( < usize > capacity * sizeof < T > ( ) )
24+ : 0 ;
2225 this . __capacity = this . __length = capacity ;
2326 }
2427
@@ -27,72 +30,92 @@ export class Array<T> {
2730 }
2831
2932 set length ( length : i32 ) {
30- if ( length < 0 )
33+ if ( length < 0 ) {
3134 throw new RangeError ( "Invalid array length" ) ;
32- if ( length > this . __capacity )
35+ }
36+ if ( length > this . __capacity ) {
3337 this . __grow ( max ( length , this . __capacity << 1 ) ) ;
38+ }
3439 this . __length = length ;
3540 }
3641
3742 @operator ( "[]" )
3843 private __get ( index : i32 ) : T {
39- if ( < u32 > index >= this . __capacity )
44+ if ( < u32 > index >= this . __capacity ) {
4045 throw new Error ( "Index out of bounds" ) ; // return changetype<T>(0) ?
46+ }
4147 return load < T > ( this . __memory + < usize > index * sizeof < T > ( ) ) ;
4248 }
4349
4450 @operator ( "[]=" )
4551 private __set ( index : i32 , value : T ) : void {
46- if ( index < 0 )
52+ if ( index < 0 ) {
4753 throw new Error ( "Index out of bounds" ) ;
48- if ( index >= this . __capacity )
54+ }
55+ if ( index >= this . __capacity ) {
4956 this . __grow ( max ( index + 1 , this . __capacity << 1 ) ) ;
57+ }
5058 store < T > ( this . __memory + < usize > index * sizeof < T > ( ) , value ) ;
5159 }
5260
5361 indexOf ( searchElement : T , fromIndex : i32 = 0 ) : i32 {
54- if ( fromIndex < 0 )
62+ if ( fromIndex < 0 ) {
5563 fromIndex = this . __length + fromIndex ;
64+ }
5665 while ( < u32 > fromIndex < this . __length ) {
57- if ( load < T > ( this . __memory + fromIndex * sizeof < T > ( ) ) == searchElement )
66+ if ( load < T > ( this . __memory + fromIndex * sizeof < T > ( ) ) == searchElement ) {
5867 return fromIndex ;
68+ }
5969 ++ fromIndex ;
6070 }
6171 return - 1 ;
6272 }
6373
6474 lastIndexOf ( searchElement : T , fromIndex : i32 = 0 ) : i32 {
65- if ( fromIndex < 0 )
75+ if ( fromIndex < 0 ) {
6676 fromIndex = this . __length + fromIndex ;
67- else if ( fromIndex >= this . __length )
77+ } else if ( fromIndex >= this . __length ) {
6878 fromIndex = this . __length - 1 ;
79+ }
6980 while ( fromIndex >= 0 ) {
70- if ( load < T > ( this . __memory + fromIndex * sizeof < T > ( ) ) == searchElement )
81+ if ( load < T > ( this . __memory + fromIndex * sizeof < T > ( ) ) == searchElement ) {
7182 return fromIndex ;
83+ }
7284 -- fromIndex ;
7385 }
7486 return - 1 ;
7587 }
7688
7789 push ( element : T ) : i32 {
78- if ( this . __length == this . __capacity )
90+ if ( this . __length == this . __capacity ) {
7991 this . __grow ( this . __capacity ? this . __capacity << 1 : 1 ) ;
92+ }
8093 store < T > ( this . __memory + this . __length * sizeof < T > ( ) , element ) ;
8194 return ++ this . __length ;
8295 }
8396
8497 pop ( ) : T {
85- if ( this . __length < 1 )
98+ if ( this . __length < 1 ) {
8699 throw new RangeError ( "Array is empty" ) ; // return changetype<T>(0) ?
100+ }
87101 return load < T > ( this . __memory + -- this . __length * sizeof < T > ( ) ) ;
88102 }
89103
90104 shift ( ) : T {
91- if ( this . __length < 1 )
105+ if ( this . __length < 1 ) {
92106 throw new RangeError ( "Array is empty" ) ; // return changetype<T>(0) ?
107+ }
93108 var element = load < T > ( this . __memory ) ;
94- move_memory ( this . __memory , this . __memory + sizeof < T > ( ) , ( this . __capacity - 1 ) * sizeof < T > ( ) ) ;
95- set_memory ( this . __memory + ( this . __capacity - 1 ) * sizeof < T > ( ) , 0 , sizeof < T > ( ) ) ;
109+ move_memory (
110+ this . __memory ,
111+ this . __memory + sizeof < T > ( ) ,
112+ ( this . __capacity - 1 ) * sizeof < T > ( )
113+ ) ;
114+ set_memory (
115+ this . __memory + ( this . __capacity - 1 ) * sizeof < T > ( ) ,
116+ 0 ,
117+ sizeof < T > ( )
118+ ) ;
96119 -- this . __length ;
97120 return element ;
98121 }
@@ -105,51 +128,76 @@ export class Array<T> {
105128 assert ( newCapacity > this . __capacity ) ;
106129 var newMemory = allocate_memory ( < usize > newCapacity * sizeof < T > ( ) ) ;
107130 if ( this . __memory ) {
108- move_memory ( newMemory + sizeof < T > ( ) , this . __memory , oldCapacity * sizeof < T > ( ) ) ;
131+ move_memory (
132+ newMemory + sizeof < T > ( ) ,
133+ this . __memory ,
134+ oldCapacity * sizeof < T > ( )
135+ ) ;
109136 free_memory ( this . __memory ) ;
110137 }
111138 this . __memory = newMemory ;
112139 this . __capacity = newCapacity ;
113- } else
114- move_memory ( this . __memory + sizeof < T > ( ) , this . __memory , oldCapacity * sizeof < T > ( ) ) ;
140+ } else {
141+ move_memory (
142+ this . __memory + sizeof < T > ( ) ,
143+ this . __memory ,
144+ oldCapacity * sizeof < T > ( )
145+ ) ;
146+ }
115147 store < T > ( this . __memory , element ) ;
116148 return ++ this . __length ;
117149 }
118150
119151 slice ( begin : i32 = 0 , end : i32 = i32 . MAX_VALUE ) : Array < T > {
120152 if ( begin < 0 ) {
121153 begin = this . __length + begin ;
122- if ( begin < 0 )
154+ if ( begin < 0 ) {
123155 begin = 0 ;
124- } else if ( begin > this . __length )
156+ }
157+ } else if ( begin > this . __length ) {
125158 begin = this . __length ;
126- if ( end < 0 )
159+ }
160+ if ( end < 0 ) {
127161 end = this . __length + end ;
128- else if ( end > this . __length )
162+ } else if ( end > this . __length ) {
129163 end = this . __length ;
130- if ( end < begin )
164+ }
165+ if ( end < begin ) {
131166 end = begin ;
167+ }
132168 var capacity = end - begin ;
133169 assert ( capacity >= 0 ) ;
134170 var sliced = new Array < T > ( capacity ) ;
135- if ( capacity )
136- move_memory ( sliced . __memory , this . __memory + < usize > begin * sizeof < T > ( ) , < usize > capacity * sizeof < T > ( ) ) ;
171+ if ( capacity ) {
172+ move_memory (
173+ sliced . __memory ,
174+ this . __memory + < usize > begin * sizeof < T > ( ) ,
175+ < usize > capacity * sizeof < T > ( )
176+ ) ;
177+ }
137178 return sliced ;
138179 }
139180
140181 splice ( start : i32 , deleteCount : i32 = i32 . MAX_VALUE ) : void {
141- if ( deleteCount < 1 )
182+ if ( deleteCount < 1 ) {
142183 return ;
184+ }
143185 if ( start < 0 ) {
144186 start = this . __length + start ;
145- if ( start < 0 )
187+ if ( start < 0 ) {
146188 start = 0 ;
147- else if ( start >= this . __length )
189+ } else if ( start >= this . __length ) {
148190 return ;
149- } else if ( start >= this . __length )
191+ }
192+ } else if ( start >= this . __length ) {
150193 return ;
194+ }
151195 deleteCount = min ( deleteCount , this . __length - start ) ;
152- move_memory ( this . __memory + < usize > start * sizeof < T > ( ) , this . __memory + < usize > ( start + deleteCount ) * sizeof < T > ( ) , deleteCount * sizeof < T > ( ) ) ;
196+ move_memory (
197+ this . __memory + < usize > start * sizeof < T > ( ) ,
198+ this . __memory + < usize > ( start + deleteCount ) * sizeof < T > ( ) ,
199+ deleteCount * sizeof < T > ( )
200+ ) ;
153201 this . __length -= deleteCount ;
154202 }
155203
@@ -170,15 +218,17 @@ export class CArray<T> {
170218
171219 @operator ( "[]" )
172220 private __get ( index : i32 ) : T {
173- if ( index < 0 )
221+ if ( index < 0 ) {
174222 throw new RangeError ( "Index out of range" ) ;
223+ }
175224 return load < T > ( changetype < usize > ( this ) + < usize > index * sizeof < T > ( ) ) ;
176225 }
177226
178227 @operator ( "[]=" )
179228 private __set ( index : i32 , value : T ) : void {
180- if ( index < 0 )
229+ if ( index < 0 ) {
181230 throw new RangeError ( "Index out of range" ) ;
231+ }
182232 store < T > ( changetype < usize > ( this ) + < usize > index * sizeof < T > ( ) , value ) ;
183233 }
184234}
0 commit comments