Add while/break in anticipation of adding try.

This commit is contained in:
Nigel Tao committed 2017-10-26 14:09:31 +11:00
1 parent 51012a0cca
commit 15ded0a6d0
2 files changed
+42 -33

No files matched your search

+32 -28
View File
@@ -1241,39 +1241,43 @@ puffs_gif__status puffs_gif__decoder__decode_id(puffs_gif__decoder* self,
if (v_block_size == 0) {
goto label_0_break;
}
l_lzw_src = v_block_size;
v_lzw_src = (puffs_base__reader1){.buf = a_src.buf,
.limit = (puffs_base__limit1){
.ptr_to_len = &l_lzw_src,
.next = &a_src.limit,
}};
PUFFS_BASE__COROUTINE_SUSPENSION_POINT(4);
if (a_src.buf) {
size_t n = b_rptr_src - (a_src.buf->ptr + a_src.buf->ri);
a_src.buf->ri += n;
puffs_base__limit1* lim;
for (lim = &a_src.limit; lim; lim = lim->next) {
if (lim->ptr_to_len) {
*lim->ptr_to_len -= n;
while (true) {
l_lzw_src = v_block_size;
v_lzw_src = (puffs_base__reader1){.buf = a_src.buf,
.limit = (puffs_base__limit1){
.ptr_to_len = &l_lzw_src,
.next = &a_src.limit,
}};
PUFFS_BASE__COROUTINE_SUSPENSION_POINT(4);
if (a_src.buf) {
size_t n = b_rptr_src - (a_src.buf->ptr + a_src.buf->ri);
a_src.buf->ri += n;
puffs_base__limit1* lim;
for (lim = &a_src.limit; lim; lim = lim->next) {
if (lim->ptr_to_len) {
*lim->ptr_to_len -= n;
}
}
}
}
status = puffs_gif__lzw_decoder__decode(&self->private_impl.f_lzw, a_dst,
v_lzw_src);
if (a_src.buf) {
b_rptr_src = a_src.buf->ptr + a_src.buf->ri;
size_t len = a_src.buf->wi - a_src.buf->ri;
puffs_base__limit1* lim;
for (lim = &a_src.limit; lim; lim = lim->next) {
if (lim->ptr_to_len && (len > *lim->ptr_to_len)) {
len = *lim->ptr_to_len;
status = puffs_gif__lzw_decoder__decode(&self->private_impl.f_lzw,
a_dst, v_lzw_src);
if (a_src.buf) {
b_rptr_src = a_src.buf->ptr + a_src.buf->ri;
size_t len = a_src.buf->wi - a_src.buf->ri;
puffs_base__limit1* lim;
for (lim = &a_src.limit; lim; lim = lim->next) {
if (lim->ptr_to_len && (len > *lim->ptr_to_len)) {
len = *lim->ptr_to_len;
}
}
b_rend_src = b_rptr_src + len;
}
b_rend_src = b_rptr_src + len;
}
if (l_lzw_src && status) {
goto suspend;
if (l_lzw_src && status) {
goto suspend;
}
goto label_1_break;
}
label_1_break:;
}
label_0_break:;
+10 -5
View File
@@ -160,10 +160,15 @@ pri func decoder.decode_id?(dst writer1, src reader1)() {
if block_size == 0 {
break
}
// TODO: how should this reader1-typed variable (which is implemented
// by containing pointers) work across resume/suspend? We don't want to
// have a dangling pointer to an earlier src buffer.
var lzw_src reader1 = limit (block_size) in.src
this.lzw.decode?(dst:in.dst, src:lzw_src)
while true {
// TODO: how should this reader1-typed variable (which is implemented
// by containing pointers) work across resume/suspend? We don't want to
// have a dangling pointer to an earlier src buffer.
var lzw_src reader1 = limit (block_size) in.src
this.lzw.decode?(dst:in.dst, src:lzw_src)
// TODO: add a "try" to the line above, and break *conditionally*.
break
}
}
}