ehmry
/
preserves
forked from syndicate-lang/preserves
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Repair javascript integer codec

This commit is contained in:
Tony Garnock-Jones 2021-03-02 16:38:40 +01:00
parent 75790f237b
commit c8c027f762
4 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
implementations/javascript/package.json
View File

@ -1,6 +1,6 @@
{ {
"name": "preserves", "name": "preserves",
"version": "0.6.0", "version": "0.6.1",
"description": "Experimental data serialization format", "description": "Experimental data serialization format",
"homepage": "https://gitlab.com/preserves/preserves", "homepage": "https://gitlab.com/preserves/preserves",
"license": "Apache-2.0", "license": "Apache-2.0",

6
implementations/javascript/src/codec.ts
View File

@ -128,7 +128,7 @@ export class Decoder<T extends object> {
if (n === 0) return 0; if (n === 0) return 0;
let acc = this.nextbyte(); let acc = this.nextbyte();
if (acc & 0x80) acc -= 256; if (acc & 0x80) acc -= 256;
for (let i = 1; i < n; i++) acc = (acc << 8) | this.nextbyte(); for (let i = 1; i < n; i++) acc = (acc * 256) + this.nextbyte();
return acc; return acc;
} }
@ -311,7 +311,7 @@ export class Encoder<T extends object> {
encodeint(v: number) { encodeint(v: number) {
// TODO: Bignums :-/ // TODO: Bignums :-/
const plain_bitcount = Math.floor(Math.log2(v > 0 ? v : ~v)) + 1; const plain_bitcount = Math.floor(Math.log2(v > 0 ? v : -(1 + v))) + 1;
const signed_bitcount = plain_bitcount + 1; const signed_bitcount = plain_bitcount + 1;
const bytecount = (signed_bitcount + 7) >> 3; const bytecount = (signed_bitcount + 7) >> 3;
if (bytecount <= 16) { if (bytecount <= 16) {
@ -322,7 +322,7 @@ export class Encoder<T extends object> {
} }
const enc = (n: number, x: number) => { const enc = (n: number, x: number) => {
if (n > 0) { if (n > 0) {
enc(n - 1, x >> 8); enc(n - 1, Math.floor(x / 256));
this.emitbyte(x & 255); this.emitbyte(x & 255);
} }
}; };

BIN
tests/samples.bin
View File

Binary file not shown.

1
tests/samples.txt
View File

@ -101,6 +101,7 @@
int65535: <Test #x"a200ffff" 65535> int65535: <Test #x"a200ffff" 65535>
int65536: <Test #x"a2010000" 65536> int65536: <Test #x"a2010000" 65536>
int131072: <Test #x"a2020000" 131072> int131072: <Test #x"a2020000" 131072>
int2500000000: <Test #x"a4009502f900" 2500000000>
list0: <Test #x"b584" []> list0: <Test #x"b584" []>
list4: <Test #x"b59192939484" [1 2 3 4]> list4: <Test #x"b59192939484" [1 2 3 4]>
list4a: <Test #x"b59192939484" [1, 2, 3, 4]> list4a: <Test #x"b59192939484" [1, 2, 3, 4]>