Support arrays

This commit is contained in:
Vladimir Grichina
2019-01-06 03:10:20 -08:00
parent a4a11af1a8
commit 1567bb19c7
2 changed files with 36 additions and 13 deletions

View File

@ -20,9 +20,6 @@ export abstract class JSONHandler {
setInteger(name: string, value: i32): void {
}
setUint8Array(name: string, value: Uint8Array): void {
}
pushArray(name: string): bool {
return true;
}
@ -61,10 +58,6 @@ export class ThrowingJSONHandler extends JSONHandler {
assert(false, 'Unexpected integer field ' + name + ' : ' + arr.toString());
}
setUint8Array(name: string, value: Uint8Array): void {
assert(false, 'Unexpected byte array field ' + name);
}
pushArray(name: string): bool {
assert(false, 'Unexpected array field' + name);
return true;
@ -152,8 +145,26 @@ export class JSONDecoder<JSONHandlerT extends JSONHandler> {
}
private parseArray(): bool {
// TODO
return false;
if (this.peekChar() != "[".charCodeAt(0)) {
return false;
}
this.handler.pushArray(this.lastKey);
this.lastKey = null;
this.readChar();
this.skipWhitespace();
let firstItem = true;
while (this.peekChar() != "]".charCodeAt(0)) {
if (!firstItem) {
assert(this.readChar() == ",".charCodeAt(0), "Expected ','");
} else {
firstItem = false;
}
this.parseValue();
}
assert(this.readChar() == "]".charCodeAt(0), "Unexpected end of array");
this.handler.popArray();
return true;;
}
private parseString(): bool {