1
1
from ._generic_list import list
2
2
from .._utils import custom_debug_assert
3
3
from .string import rjust
4
+ from ._dynamic_vector_list import List
4
5
5
6
6
7
fn get_mapping_byte_to_value () -> list[String]:
@@ -275,22 +276,22 @@ struct bytes(Stringable, Sized, CollectionElement):
275
276
even some_bytes[7] = some_other_byte (the latter must be only one byte long).
276
277
"""
277
278
278
- var _vector : DynamicVector [UInt8]
279
+ var _vector : List [UInt8]
279
280
280
281
fn __init__ (inout self ):
281
- self ._vector = DynamicVector [UInt8]()
282
+ self ._vector = List [UInt8]()
282
283
283
- fn __init__ (inout self , vector : DynamicVector [UInt8]):
284
- self ._vector = vector
284
+ fn __init__ (inout self , owned vector : List [UInt8]):
285
+ self ._vector = vector ^
285
286
286
287
fn __init__ (inout self , size : Int):
287
- self ._vector = DynamicVector [UInt8](capacity = size)
288
+ self ._vector = List [UInt8](capacity = size)
288
289
for i in range (size):
289
290
self ._vector.push_back(0 )
290
291
291
292
@ staticmethod
292
293
fn from_values (* values : UInt8) -> bytes :
293
- var vector = DynamicVector [UInt8](capacity = len (values))
294
+ var vector = List [UInt8](capacity = len (values))
294
295
for value in values:
295
296
vector.push_back(value)
296
297
return bytes (vector)
@@ -319,7 +320,7 @@ struct bytes(Stringable, Sized, CollectionElement):
319
320
return not self .__eq__ (other)
320
321
321
322
fn __add__ (self , other : bytes ) -> bytes :
322
- var new_vector = DynamicVector [UInt8](capacity = self .__len__ () + other.__len__ ())
323
+ var new_vector = List [UInt8](capacity = self .__len__ () + other.__len__ ())
323
324
for i in range (self .__len__ ()):
324
325
new_vector.push_back(self [i])
325
326
for i in range (other.__len__ ()):
@@ -371,15 +372,15 @@ struct bytes(Stringable, Sized, CollectionElement):
371
372
@ staticmethod
372
373
fn fromhex (string : String) -> bytes :
373
374
# TODO : remove whitespaces on the input string
374
- var vector_of_bytes = DynamicVector [UInt8](capacity = len (string) // 2 )
375
+ var vector_of_bytes = List [UInt8](capacity = len (string) // 2 )
375
376
var string_length = len (string)
376
377
for i in range (0 , string_length, 2 ):
377
378
var first_char = string[i]
378
379
var second_char = string[i + 1 ]
379
380
var first_value = _ascii_char_to_int(first_char)
380
381
var second_value = _ascii_char_to_int(second_char)
381
382
var final_value = (first_value << 4 ) + second_value
382
- vector_of_bytes.push_back (UInt8(final_value))
383
+ vector_of_bytes.append (UInt8(final_value))
383
384
return bytes (vector_of_bytes)
384
385
385
386
@@ -405,7 +406,7 @@ fn to_bytes(n: Int, length: Int = 1, byteorder: String = "big") -> bytes:
405
406
else :
406
407
custom_debug_assert(False , " byteorder must be either 'little' or 'big'" )
407
408
408
- var result_vector = DynamicVector [UInt8](capacity = length)
409
+ var result_vector = List [UInt8](capacity = length)
409
410
410
411
for i in order:
411
412
result_vector.push_back((n >> i * 8 ) & 0x FF )
0 commit comments