@@ -316,8 +316,64 @@ export function bit_array_from_string(string) {
316
316
return toBitArray ( [ stringBits ( string ) ] ) ;
317
317
}
318
318
319
+ const BIT_ARRAY_UNALIGNED_SUPPORTED =
320
+ new BitArray ( new Uint8Array ( ) ) . bitSize !== undefined ;
321
+
322
+ export function bit_array_bit_size ( bit_array ) {
323
+ if ( ! BIT_ARRAY_UNALIGNED_SUPPORTED ) {
324
+ return bit_array . length * 8 ;
325
+ }
326
+
327
+ return bit_array . bitSize ;
328
+ }
329
+
330
+ export function bit_array_byte_size ( bit_array ) {
331
+ if ( ! BIT_ARRAY_UNALIGNED_SUPPORTED ) {
332
+ return bit_array . length ;
333
+ }
334
+
335
+ return bit_array . byteSize ;
336
+ }
337
+
338
+ export function bit_array_pad_to_bytes ( bit_array ) {
339
+ // If the bit array is byte aligned it can be returned unchanged
340
+ if ( bit_array_bit_size ( bit_array ) % 8 === 0 ) {
341
+ return bit_array ;
342
+ }
343
+
344
+ const trailingBitsCount = bit_array_bit_size ( bit_array ) % 8 ;
345
+
346
+ const finalByte = bit_array . byteAt ( bit_array . byteSize - 1 ) ;
347
+
348
+ const unusedBitsCount = 8 - trailingBitsCount ;
349
+ const correctFinalByte = ( finalByte >> unusedBitsCount ) << unusedBitsCount ;
350
+
351
+ // If the unused bits in the final byte are already set to zero then the
352
+ // existing buffer can be re-used, avoiding a copy
353
+ if ( finalByte === correctFinalByte ) {
354
+ return new BitArray (
355
+ bit_array . rawBuffer ,
356
+ bit_array . byteSize * 8 ,
357
+ bit_array . bitOffset ,
358
+ ) ;
359
+ }
360
+
361
+ // Copy the bit array into a new buffer and set the correct final byte
362
+ const buffer = new Uint8Array ( bit_array . byteSize ) ;
363
+ for ( let i = 0 ; i < buffer . length - 1 ; i ++ ) {
364
+ buffer [ i ] = bit_array . byteAt ( i ) ;
365
+ }
366
+ buffer [ buffer . length - 1 ] = correctFinalByte ;
367
+
368
+ return new BitArray ( buffer ) ;
369
+ }
370
+
319
371
export function bit_array_concat ( bit_arrays ) {
320
- return toBitArray ( bit_arrays . toArray ( ) . map ( ( b ) => b . buffer ) ) ;
372
+ if ( BIT_ARRAY_UNALIGNED_SUPPORTED ) {
373
+ return toBitArray ( bit_arrays . toArray ( ) ) ;
374
+ } else {
375
+ return toBitArray ( bit_arrays . toArray ( ) . map ( ( b ) => b . buffer ) ) ;
376
+ }
321
377
}
322
378
323
379
export function console_log ( term ) {
@@ -333,9 +389,25 @@ export function crash(message) {
333
389
}
334
390
335
391
export function bit_array_to_string ( bit_array ) {
392
+ if ( bit_array_bit_size ( bit_array ) % 8 !== 0 ) {
393
+ return new Error ( Nil ) ;
394
+ }
395
+
336
396
try {
337
397
const decoder = new TextDecoder ( "utf-8" , { fatal : true } ) ;
338
- return new Ok ( decoder . decode ( bit_array . buffer ) ) ;
398
+ if ( BIT_ARRAY_UNALIGNED_SUPPORTED ) {
399
+ if ( bit_array . bitOffset === 0 ) {
400
+ return new Ok ( decoder . decode ( bit_array . rawBuffer ) ) ;
401
+ } else {
402
+ const buffer = new Uint8Array ( bit_array . byteSize ) ;
403
+ for ( let i = 0 ; i < buffer . length ; i ++ ) {
404
+ buffer [ i ] = bit_array . byteAt ( i ) ;
405
+ }
406
+ return new Ok ( decoder . decode ( buffer ) ) ;
407
+ }
408
+ } else {
409
+ return new Ok ( decoder . decode ( bit_array . buffer ) ) ;
410
+ }
339
411
} catch {
340
412
return new Error ( Nil ) ;
341
413
}
@@ -415,13 +487,21 @@ export function random_uniform() {
415
487
export function bit_array_slice ( bits , position , length ) {
416
488
const start = Math . min ( position , position + length ) ;
417
489
const end = Math . max ( position , position + length ) ;
418
- if ( start < 0 || end > bits . length ) return new Error ( Nil ) ;
419
- const byteOffset = bits . buffer . byteOffset + start ;
490
+
491
+ if ( start < 0 || end * 8 > bit_array_bit_size ( bits ) ) {
492
+ return new Error ( Nil ) ;
493
+ }
494
+
495
+ if ( BIT_ARRAY_UNALIGNED_SUPPORTED ) {
496
+ return new Ok ( bits . slice ( start * 8 , end * 8 ) ) ;
497
+ }
498
+
420
499
const buffer = new Uint8Array (
421
500
bits . buffer . buffer ,
422
- byteOffset ,
501
+ bits . buffer . byteOffset + start ,
423
502
Math . abs ( length ) ,
424
503
) ;
504
+
425
505
return new Ok ( new BitArray ( buffer ) ) ;
426
506
}
427
507
@@ -522,16 +602,20 @@ let b64TextDecoder;
522
602
export function encode64 ( bit_array , padding ) {
523
603
b64TextDecoder ??= new TextDecoder ( ) ;
524
604
525
- const bytes = bit_array . buffer ;
605
+ bit_array = bit_array_pad_to_bytes ( bit_array ) ;
526
606
527
- const m = bytes . length ;
607
+ const m = bit_array_byte_size ( bit_array ) ;
528
608
const k = m % 3 ;
529
609
const n = Math . floor ( m / 3 ) * 4 + ( k && k + 1 ) ;
530
610
const N = Math . ceil ( m / 3 ) * 4 ;
531
611
const encoded = new Uint8Array ( N ) ;
532
612
533
613
for ( let i = 0 , j = 0 ; j < m ; i += 4 , j += 3 ) {
534
- const y = ( bytes [ j ] << 16 ) + ( bytes [ j + 1 ] << 8 ) + ( bytes [ j + 2 ] | 0 ) ;
614
+ const y =
615
+ ( bit_array . byteAt ( j ) << 16 ) +
616
+ ( bit_array . byteAt ( j + 1 ) << 8 ) +
617
+ ( bit_array . byteAt ( j + 2 ) | 0 ) ;
618
+
535
619
encoded [ i ] = b64EncodeLookup [ y >> 18 ] ;
536
620
encoded [ i + 1 ] = b64EncodeLookup [ ( y >> 12 ) & 0x3f ] ;
537
621
encoded [ i + 2 ] = b64EncodeLookup [ ( y >> 6 ) & 0x3f ] ;
@@ -804,7 +888,7 @@ export function inspect(v) {
804
888
if ( Array . isArray ( v ) ) return `#(${ v . map ( inspect ) . join ( ", " ) } )` ;
805
889
if ( v instanceof List ) return inspectList ( v ) ;
806
890
if ( v instanceof UtfCodepoint ) return inspectUtfCodepoint ( v ) ;
807
- if ( v instanceof BitArray ) return inspectBitArray ( v ) ;
891
+ if ( v instanceof BitArray ) return `<< ${ bit_array_inspect ( v , "" ) } >>` ;
808
892
if ( v instanceof CustomType ) return inspectCustomType ( v ) ;
809
893
if ( v instanceof Dict ) return inspectDict ( v ) ;
810
894
if ( v instanceof Set ) return `//js(Set(${ [ ...v ] . map ( inspect ) . join ( ", " ) } ))` ;
@@ -895,18 +979,16 @@ export function inspectList(list) {
895
979
return `[${ list . toArray ( ) . map ( inspect ) . join ( ", " ) } ]` ;
896
980
}
897
981
898
- export function inspectBitArray ( bits ) {
899
- return `<<${ Array . from ( bits . buffer ) . join ( ", " ) } >>` ;
900
- }
901
-
902
982
export function inspectUtfCodepoint ( codepoint ) {
903
983
return `//utfcodepoint(${ String . fromCodePoint ( codepoint . value ) } )` ;
904
984
}
905
985
906
986
export function base16_encode ( bit_array ) {
987
+ bit_array = bit_array_pad_to_bytes ( bit_array ) ;
988
+
907
989
let result = "" ;
908
- for ( const byte of bit_array . buffer ) {
909
- result += byte . toString ( 16 ) . padStart ( 2 , "0" ) . toUpperCase ( ) ;
990
+ for ( let i = 0 ; i < bit_array . byteSize ; i ++ ) {
991
+ result += bit_array . byteAt ( i ) . toString ( 16 ) . padStart ( 2 , "0" ) . toUpperCase ( ) ;
910
992
}
911
993
return result ;
912
994
}
@@ -923,38 +1005,108 @@ export function base16_decode(string) {
923
1005
}
924
1006
925
1007
export function bit_array_inspect ( bits , acc ) {
926
- return `${ acc } ${ [ ...bits . buffer ] . join ( ", " ) } ` ;
1008
+ const bitSize = bit_array_bit_size ( bits ) ;
1009
+
1010
+ if ( bitSize === 0 ) {
1011
+ return acc ;
1012
+ }
1013
+
1014
+ const byteSize = bit_array_byte_size ( bits ) ;
1015
+
1016
+ for ( let i = 0 ; i < byteSize - 1 ; i ++ ) {
1017
+ acc += bits . byteAt ( i ) . toString ( ) ;
1018
+ acc += ", " ;
1019
+ }
1020
+
1021
+ if ( byteSize * 8 === bitSize ) {
1022
+ acc += bits . byteAt ( byteSize - 1 ) . toString ( ) ;
1023
+ } else {
1024
+ const trailingBitsCount = bitSize % 8 ;
1025
+ acc += bits . byteAt ( byteSize - 1 ) >> ( 8 - trailingBitsCount ) ;
1026
+ acc += `:size(${ trailingBitsCount } )` ;
1027
+ }
1028
+
1029
+ return acc ;
927
1030
}
928
1031
929
1032
export function bit_array_compare ( first , second ) {
930
- for ( let i = 0 ; i < first . length ; i ++ ) {
931
- if ( i >= second . length ) {
932
- return new Gt ( ) ; // first has more items
933
- }
934
- const f = first . buffer [ i ] ;
935
- const s = second . buffer [ i ] ;
1033
+ let i = 0 ;
1034
+
1035
+ let firstSize = bit_array_bit_size ( first ) ;
1036
+ let secondSize = bit_array_bit_size ( second ) ;
1037
+
1038
+ while ( firstSize >= 8 && secondSize >= 8 ) {
1039
+ const f = first . byteAt ( i ) ;
1040
+ const s = second . byteAt ( i ) ;
1041
+
936
1042
if ( f > s ) {
937
1043
return new Gt ( ) ;
938
- }
939
- if ( f < s ) {
1044
+ } else if ( f < s ) {
940
1045
return new Lt ( ) ;
941
1046
}
1047
+
1048
+ i ++ ;
1049
+ firstSize -= 8 ;
1050
+ secondSize -= 8 ;
942
1051
}
943
- // This means that either first did not have any items
944
- // or all items in first were equal to second.
945
- if ( first . length === second . length ) {
1052
+
1053
+ if ( firstSize === 0 && secondSize === 0 ) {
946
1054
return new Eq ( ) ;
947
1055
}
948
- return new Lt ( ) ; // second has more items
1056
+
1057
+ // First has more items, example: "AB" > "A":
1058
+ if ( secondSize === 0 ) {
1059
+ return new Gt ( ) ;
1060
+ }
1061
+
1062
+ // Second has more items, example: "A" < "AB":
1063
+ if ( firstSize === 0 ) {
1064
+ return new Lt ( ) ;
1065
+ }
1066
+
1067
+ // This happens when there are unaligned bit arrays
1068
+
1069
+ const f = first . byteAt ( i ) >> ( 8 - firstSize ) ;
1070
+ const s = second . byteAt ( i ) >> ( 8 - secondSize ) ;
1071
+
1072
+ if ( f > s ) {
1073
+ return new Gt ( ) ;
1074
+ }
1075
+ if ( f < s ) {
1076
+ return new Lt ( ) ;
1077
+ }
1078
+ if ( firstSize > secondSize ) {
1079
+ return new Gt ( ) ;
1080
+ }
1081
+ if ( firstSize < secondSize ) {
1082
+ return new Lt ( ) ;
1083
+ }
1084
+
1085
+ return new Eq ( ) ;
949
1086
}
950
1087
951
1088
export function bit_array_starts_with ( bits , prefix ) {
952
- if ( prefix . length > bits . length ) {
1089
+ const prefixSize = bit_array_bit_size ( prefix ) ;
1090
+
1091
+ if ( prefixSize > bit_array_bit_size ( bits ) ) {
953
1092
return false ;
954
1093
}
955
1094
956
- for ( let i = 0 ; i < prefix . length ; i ++ ) {
957
- if ( bits . buffer [ i ] !== prefix . buffer [ i ] ) {
1095
+ // Check any whole bytes
1096
+ const byteCount = Math . trunc ( prefixSize / 8 ) ;
1097
+ for ( let i = 0 ; i < byteCount ; i ++ ) {
1098
+ if ( bits . byteAt ( i ) !== prefix . byteAt ( i ) ) {
1099
+ return false ;
1100
+ }
1101
+ }
1102
+
1103
+ // Check any trailing bits at the end of the prefix
1104
+ if ( prefixSize % 8 !== 0 ) {
1105
+ const unusedBitsCount = 8 - ( prefixSize % 8 ) ;
1106
+ if (
1107
+ bits . byteAt ( byteCount ) >> unusedBitsCount !==
1108
+ prefix . byteAt ( byteCount ) >> unusedBitsCount
1109
+ ) {
958
1110
return false ;
959
1111
}
960
1112
}
0 commit comments