Make gif's decoder.copy_to_image_buffer ! not !?

This commit is contained in:
Nigel Tao committed 2018-12-28 17:32:48 +11:00
1 parent 19ddd4450f
commit 3ba450ba55
6 files changed
+58 -28

No files matched your search

+2 -4
View File
@@ -365,7 +365,7 @@ func (g *gen) writeStatementRet(b *buffer, n *a.Ret, depth uint32) error {
retExpr := n.Value()
if g.currFunk.astFunc.Effect().Optional() {
isError, isOK := false, false
isOK := false
b.writes("status = ")
if retExpr.Operator() == 0 && retExpr.Ident() == t.IDOk {
b.writes("NULL")
@@ -373,10 +373,8 @@ func (g *gen) writeStatementRet(b *buffer, n *a.Ret, depth uint32) error {
} else {
if retExpr.Ident().IsStrLiteral(g.tm) {
msg, _ := t.Unescape(retExpr.Ident().Str(g.tm))
isError = statusMsgIsError(msg)
isOK = statusMsgIsWarning(msg)
}
// TODO: check that retExpr has no call-suspendibles.
if err := g.writeExpr(
b, retExpr, depth); err != nil {
return err
@@ -388,7 +386,7 @@ func (g *gen) writeStatementRet(b *buffer, n *a.Ret, depth uint32) error {
return g.writeCoroSuspPoint(b, true)
}
if isError {
if n.RetsError() {
b.writes("goto exit;")
} else if isOK {
g.currFunk.hasGotoOK = true
+8 -3
View File
@@ -101,6 +101,7 @@ const (
FlagsGlobalIdent = Flags(0x00000800)
FlagsClassy = Flags(0x00001000)
FlagsSubExprHasEffect = Flags(0x00002000)
FlagsRetsError = Flags(0x00004000)
)
func (f Flags) AsEffect() Effect { return Effect(f) }
@@ -588,13 +589,17 @@ func NewIf(condition *Expr, bodyIfTrue []*Node, bodyIfFalse []*Node, elseIf *If)
}
// Ret is "return LHS" or "yield LHS":
// - FlagsReturnsError LHS is an error status
// - ID0: <IDReturn|IDYield>
// - LHS: <Expr>
type Ret Node
func (n *Ret) AsNode() *Node { return (*Node)(n) }
func (n *Ret) Keyword() t.ID { return n.id0 }
func (n *Ret) Value() *Expr { return n.lhs.AsExpr() }
func (n *Ret) AsNode() *Node { return (*Node)(n) }
func (n *Ret) RetsError() bool { return n.flags&FlagsRetsError != 0 }
func (n *Ret) Keyword() t.ID { return n.id0 }
func (n *Ret) Value() *Expr { return n.lhs.AsExpr() }
func (n *Ret) SetRetsError() { n.flags |= FlagsRetsError }
func NewRet(keyword t.ID, value *Expr) *Ret {
return &Ret{
+1 -5
View File
@@ -78,15 +78,11 @@ func (n *Expr) appendStr(buf []byte, tm *t.Map, parenthesize bool, depth uint32)
} else {
switch n.id0 {
case t.IDStatus:
buf = append(buf, "status "...)
case 0:
if n.id1 != 0 {
buf = append(buf, tm.ByID(n.id1)...)
buf = append(buf, '.')
}
fallthrough
case 0:
buf = append(buf, tm.ByID(n.id2)...)
case t.IDOpenParen:
+31
View File
@@ -70,6 +70,11 @@ func init() {
zeroExpr.SetMType(typeExprIdeal)
}
func isErrorStatus(literal t.ID, tm *t.Map) bool {
s := literal.Str(tm)
return (len(s) >= 2) && (s[0] == '"') && (s[1] == '?')
}
func btoi(b bool) *big.Int {
if b {
return one
@@ -302,6 +307,14 @@ func (q *checker) bcheckStatement(n *a.Node) error {
return err
}
if lTyp.IsStatus() {
if v := n.Value(); v.Operator() == 0 {
if id := v.Ident(); (id != t.IDOk) && (q.hasIsErrorFact(id) || isErrorStatus(id, q.tm)) {
n.SetRetsError()
}
}
}
case a.KVar:
if err := q.bcheckVar(n.AsVar()); err != nil {
return err
@@ -318,6 +331,24 @@ func (q *checker) bcheckStatement(n *a.Node) error {
return nil
}
func (q *checker) hasIsErrorFact(id t.ID) bool {
for _, x := range q.facts {
if (x.Operator() != t.IDOpenParen) || (len(x.Args()) != 0) {
continue
}
x = x.LHS().AsExpr()
if (x.Operator() != t.IDDot) || (x.Ident() != t.IDIsError) {
continue
}
x = x.LHS().AsExpr()
if (x.Operator() != 0) || (x.Ident() != id) {
continue
}
return true
}
return false
}
func (q *checker) bcheckAssert(n *a.Assert) error {
condition := n.Condition()
if _, err := q.bcheckExpr(condition, 0); err != nil {
+9 -14
View File
@@ -9419,6 +9419,7 @@ wuffs_gif__decoder__decode_id_part2(wuffs_gif__decoder* self,
WUFFS_BASE__IGNORE_POTENTIALLY_UNUSED_VARIABLE(iop_v_r);
WUFFS_BASE__IGNORE_POTENTIALLY_UNUSED_VARIABLE(io1_v_r);
wuffs_base__status v_status = NULL;
wuffs_base__status v_copy_status = NULL;
wuffs_base__slice_u8 v_uncompressed = {};
uint8_t* iop_a_src = NULL;
@@ -9554,9 +9555,10 @@ wuffs_gif__decoder__decode_id_part2(wuffs_gif__decoder* self,
}
v_uncompressed = wuffs_lzw__decoder__flush(&self->private_impl.f_lzw);
if (((uint64_t)(v_uncompressed.len)) > 0) {
status = wuffs_gif__decoder__copy_to_image_buffer(self, a_dst,
v_uncompressed);
if (status) {
v_copy_status = wuffs_gif__decoder__copy_to_image_buffer(
self, a_dst, v_uncompressed);
if (wuffs_base__status__is_error(v_copy_status)) {
status = v_copy_status;
goto exit;
}
}
@@ -9638,8 +9640,6 @@ static wuffs_base__status //
wuffs_gif__decoder__copy_to_image_buffer(wuffs_gif__decoder* self,
wuffs_base__pixel_buffer* a_pb,
wuffs_base__slice_u8 a_src) {
wuffs_base__status status = NULL;
wuffs_base__slice_u8 v_dst = {};
wuffs_base__slice_u8 v_src = {};
uint64_t v_n = 0;
@@ -9662,8 +9662,7 @@ label_0_continue:;
while (v_src_ri < ((uint64_t)(a_src.len))) {
v_src = wuffs_base__slice_u8__subslice_i(a_src, v_src_ri);
if (self->private_impl.f_dst_y >= self->private_impl.f_frame_rect_y1) {
status = wuffs_gif__error__too_much_pixel_data;
goto exit;
return wuffs_gif__error__too_much_pixel_data;
}
v_dst = wuffs_base__table_u8__row(v_tab, self->private_impl.f_dst_y);
v_i = (((uint64_t)(self->private_impl.f_dst_x)) *
@@ -9711,8 +9710,7 @@ label_0_continue:;
if (((uint64_t)(a_src.len)) == v_src_ri) {
goto label_0_break;
} else if (((uint64_t)(a_src.len)) < v_src_ri) {
status = wuffs_gif__error__internal_error_inconsistent_ri_wi;
goto exit;
return wuffs_gif__error__internal_error_inconsistent_ri_wi;
}
v_n = ((uint64_t)(
(self->private_impl.f_frame_rect_x1 - self->private_impl.f_dst_x)));
@@ -9737,15 +9735,12 @@ label_0_continue:;
goto label_0_continue;
}
if (v_src_ri != ((uint64_t)(a_src.len))) {
status = wuffs_gif__error__internal_error_inconsistent_ri_wi;
goto exit;
return wuffs_gif__error__internal_error_inconsistent_ri_wi;
}
goto label_0_break;
}
label_0_break:;
goto exit;
exit:
return status;
return NULL;
}
#endif // !defined(WUFFS_CONFIG__MODULES) || defined(WUFFS_CONFIG__MODULE__GIF)
+7 -2
View File
@@ -667,6 +667,7 @@ pri func decoder.decode_id_part2!??(dst ptr base.pixel_buffer, src base.io_reade
var compressed slice base.u8
var r base.io_reader
var status base.status
var copy_status base.status
var uncompressed slice base.u8
need_block_size = true
@@ -723,7 +724,10 @@ pri func decoder.decode_id_part2!??(dst ptr base.pixel_buffer, src base.io_reade
uncompressed = this.lzw.flush!()
if uncompressed.length() > 0 {
this.copy_to_image_buffer!?(pb:args.dst, src:uncompressed)
copy_status = this.copy_to_image_buffer!(pb:args.dst, src:uncompressed)
if copy_status.is_error() {
return copy_status
}
}
if status.is_ok() {
@@ -751,7 +755,7 @@ pri func decoder.decode_id_part2!??(dst ptr base.pixel_buffer, src base.io_reade
// TODO: check for "not enough pixel data".
}
pri func decoder.copy_to_image_buffer!?(pb ptr base.pixel_buffer, src slice base.u8) {
pri func decoder.copy_to_image_buffer!(pb ptr base.pixel_buffer, src slice base.u8) base.status {
// TODO: don't assume a packed pixel format.
var dst slice base.u8
var src slice base.u8
@@ -844,4 +848,5 @@ pri func decoder.copy_to_image_buffer!?(pb ptr base.pixel_buffer, src slice base
}
break
}
return ok
}