Add base.token_decoder interface

This commit is contained in:
Nigel Tao committed 2020-02-26 10:19:49 +11:00
1 parent b319639bad
commit 014b935d95
5 files changed
+145 -34

No files matched your search

+11 -26
View File
@@ -227,33 +227,18 @@ test_wuffs_json_decode_tokens() {
&dec, sizeof dec, WUFFS_VERSION,
WUFFS_INITIALIZE__LEAVE_INTERNAL_BUFFERS_UNINITIALIZED));
wuffs_base__token_buffer have = ((wuffs_base__token_buffer){
.data = global_have_token_slice,
});
wuffs_base__io_buffer src = ((wuffs_base__io_buffer){
.data = global_src_slice,
});
CHECK_STRING(read_file(&src, "test/data/github-tags.json"));
const uint64_t vbc = WUFFS_BASE__TOKEN__VBC__STRUCTURE;
const uint64_t vbd = WUFFS_BASE__TOKEN__VBD__STRUCTURE__POP |
WUFFS_BASE__TOKEN__VBD__STRUCTURE__FROM_LIST |
WUFFS_BASE__TOKEN__VBD__STRUCTURE__TO_NONE;
const uint64_t len = 1;
wuffs_base__status status =
wuffs_json__decoder__decode_tokens(&dec, &have, &src);
if (0) {
uint64_t pos = 0;
size_t i;
for (i = have.meta.ri; i < have.meta.wi; i++) {
wuffs_base__token* t = &have.data.ptr[i];
uint64_t len = wuffs_base__token__length(t);
uint64_t bc = wuffs_base__token__value_base_category(t);
uint64_t bd = wuffs_base__token__value_base_detail(t);
printf("i=%3zu\tp=%4" PRIu64 " (0x%03" PRIX64 ")\tl=%3" PRIu64
"\tbc=%3" PRIu64 "\tbd=0x%06" PRIX64 "\n",
i, pos, pos, len, bc, bd);
pos = wuffs_base__u64__sat_add(pos, len);
}
CHECK_STATUS("decode_tokens", status);
}
return NULL;
return do_test__wuffs_base__token_decoder(
wuffs_json__decoder__upcast_as__wuffs_base__token_decoder(&dec),
"test/data/github-tags.json", 0, SIZE_MAX,
(vbc << WUFFS_BASE__TOKEN__VALUE_BASE_CATEGORY__SHIFT) |
(vbd << WUFFS_BASE__TOKEN__VALUE_BASE_DETAIL__SHIFT) |
(len << WUFFS_BASE__TOKEN__LENGTH__SHIFT));
}
const char* //
+29 -5
View File
@@ -1011,10 +1011,10 @@ do_test__wuffs_base__image_decoder(
}
}
if ((want_width > 0) && (want_height > 0)) {
if ((have_width > 0) && (have_height > 0)) {
wuffs_base__color_u32_argb_premul have_final_pixel =
wuffs_base__pixel_buffer__color_u32_at(&pb, want_width - 1,
want_height - 1);
wuffs_base__pixel_buffer__color_u32_at(&pb, have_width - 1,
have_height - 1);
if (have_final_pixel != want_final_pixel) {
RETURN_FAIL("final pixel: have 0x%08" PRIX32 ", want 0x%08" PRIX32,
have_final_pixel, want_final_pixel);
@@ -1054,9 +1054,33 @@ do_test__wuffs_base__io_transformer(wuffs_base__io_transformer* b,
if (have.meta.wi != want_wi) {
RETURN_FAIL("dst wi: have %zu, want %zu", have.meta.wi, want_wi);
}
if ((want_wi > 0) && (have.data.ptr[want_wi - 1] != want_final_byte)) {
if ((have.meta.wi > 0) &&
(have.data.ptr[have.meta.wi - 1] != want_final_byte)) {
RETURN_FAIL("final byte: have 0x%02X, want 0x%02X",
have.data.ptr[want_wi - 1], want_final_byte);
have.data.ptr[have.meta.wi - 1], want_final_byte);
}
return NULL;
}
const char* //
do_test__wuffs_base__token_decoder(wuffs_base__token_decoder* b,
const char* src_filename,
size_t src_ri,
size_t src_wi,
uint64_t want_final_token_repr) {
wuffs_base__token_buffer have = ((wuffs_base__token_buffer){
.data = global_have_token_slice,
});
wuffs_base__io_buffer src = ((wuffs_base__io_buffer){
.data = global_src_slice,
});
CHECK_STRING(read_file_fragment(&src, src_filename, src_ri, src_wi));
CHECK_STATUS("decode_tokens",
wuffs_base__token_decoder__decode_tokens(b, &have, &src));
if ((have.meta.wi > 0) &&
(have.data.ptr[have.meta.wi - 1].repr != want_final_token_repr)) {
RETURN_FAIL("final token: have 0x%" PRIX64 ", want 0x%" PRIX64,
have.data.ptr[have.meta.wi - 1].repr, want_final_token_repr);
}
return NULL;
}