Rename the "status" keyword to "suspension".

This commit is contained in:
Nigel Tao committed 2017-07-07 16:54:19 +10:00
1 parent a014c28865
commit 7a41ee4da1
11 files changed
+114 -113

No files matched your search

+4 -4
View File
@@ -822,7 +822,7 @@ func (g *gen) writeCallSuspendibles(n *a.Expr, depth uint32) error {
g.printf("%s%d -= %srend_src - %srptr_src;\n", tPrefix, temp, bPrefix, bPrefix)
g.printf("%ssrc.buf->ri = %ssrc.buf->wi;\n", aPrefix, aPrefix)
g.printf("status = %ssrc.buf->closed ? PUFFS_%s_ERROR_UNEXPECTED_EOF : PUFFS_%s_STATUS_SHORT_READ;",
g.printf("status = %ssrc.buf->closed ? PUFFS_%s_ERROR_UNEXPECTED_EOF : PUFFS_%s_SUSPENSION_SHORT_READ;",
aPrefix, g.PKGNAME, g.PKGNAME)
if g.perFunc.public && g.perFunc.suspendible { // TODO: drop the g.perFunc.public?
g.writes("goto suspend;")
@@ -844,7 +844,7 @@ func (g *gen) writeCallSuspendibles(n *a.Expr, depth uint32) error {
g.writes("}\n")
g.printf("if ((%swend_dst - %swptr_dst) < (sizeof(self->private_impl.f_stack) - v_s)) {",
bPrefix, bPrefix)
g.printf("status = PUFFS_%s_STATUS_SHORT_WRITE;", g.PKGNAME)
g.printf("status = PUFFS_%s_SUSPENSION_SHORT_WRITE;", g.PKGNAME)
if g.perFunc.public && g.perFunc.suspendible {
g.writes("goto suspend;")
} else {
@@ -857,7 +857,7 @@ func (g *gen) writeCallSuspendibles(n *a.Expr, depth uint32) error {
g.printf("b_wptr_dst += sizeof(self->private_impl.f_stack) - v_s;\n")
} else if isInDst(g.tm, n, t.KeyWriteU8, 1) {
g.printf("if (%swptr_dst == %swend_dst) { status = PUFFS_%s_STATUS_SHORT_WRITE;",
g.printf("if (%swptr_dst == %swend_dst) { status = PUFFS_%s_SUSPENSION_SHORT_WRITE;",
bPrefix, bPrefix, g.PKGNAME)
if g.perFunc.public && g.perFunc.suspendible {
g.writes("goto suspend;")
@@ -968,7 +968,7 @@ func (g *gen) writeShortRead(name string) error {
g.printf("\nshort_read_%s:\n", name)
// TODO: ri == wi isn't the right condition.
g.printf("status = ((%s%s.buf->closed) && (%s%s.buf->ri == %s%s.buf->wi)) ?"+
"PUFFS_%s_ERROR_UNEXPECTED_EOF : PUFFS_%s_STATUS_SHORT_READ;",
"PUFFS_%s_ERROR_UNEXPECTED_EOF : PUFFS_%s_SUSPENSION_SHORT_READ;",
aPrefix, name, aPrefix, name, aPrefix, name, g.PKGNAME, g.PKGNAME)
if g.perFunc.public && g.perFunc.suspendible { // TODO: drop the g.perFunc.public?
g.writes("goto suspend;")
+6 -4
View File
@@ -87,9 +87,9 @@ var builtInStatuses = [...]string{
"error bad receiver",
"error bad argument",
"error constructor not called",
"error unexpected EOF", // Used if reading when closed == true.
"status short read", // Used if reading when closed == false.
"status short write",
"error unexpected EOF", // Used if reading when closed == true.
"suspension short read", // Used if reading when closed == false.
"suspension short write",
"error closed for writes",
}
@@ -282,6 +282,8 @@ func (g *gen) genImpl() error {
for _, s := range builtInStatuses {
if strings.HasPrefix(s, "status ") {
s = s[len("status "):]
} else if strings.HasPrefix(s, "suspension ") {
s = s[len("suspension "):]
} else if strings.HasPrefix(s, "error ") {
s = s[len("error "):]
}
@@ -406,7 +408,7 @@ func (g *gen) gatherStatuses(n *a.Status) error {
if !ok {
return fmt.Errorf("bad status message %q", raw)
}
prefix := "status "
prefix := "suspension "
isError := n.Keyword().Key() == t.KeyError
if isError {
prefix = "error "
+6 -7
View File
@@ -18,8 +18,8 @@ top-level concepts:
- `error`
- `func`
- `packageid`
- `status`
- `struct`
- `suspension`
- `use`
2 keywords distinguish between public and private API:
@@ -123,12 +123,11 @@ The function name, such as `max`, may be followed by either an exclamation mark
`!` or a question mark `?` but not both. An exclamation mark means that the
function is impure, and may assign to things other than its local variables. A
question mark means that the function is impure and furthermore a coroutine: it
can be suspended while returning a (recoverable) status, such as needing more
input data, or a (fatal) error, such as being invalid with respect to a file
format. If suspended with a status, calling that function again will resume at
the suspension point, not necessarily at the top of the function body. If
suspended with an error, calling that function again will return the same
error.
can return a (recoverable) suspension code, such as needing more input data, or
return a (fatal) error code, such as being invalid with respect to a file
format. If suspended, calling that function again will resume at the suspension
point, not necessarily at the top of the function body. If an error was
returned, calling that function again will return the same error.
Some functions are methods, with syntax `func foo.bar(etc)(etc)`, where `foo`
names a struct type and `bar` is the method name. Within the function body, an
+4 -4
View File
@@ -96,8 +96,8 @@ typedef int32_t puffs_flate_status;
#define PUFFS_FLATE_ERROR_BAD_ARGUMENT -2147483645 // 0x80000003
#define PUFFS_FLATE_ERROR_CONSTRUCTOR_NOT_CALLED -2147483644 // 0x80000004
#define PUFFS_FLATE_ERROR_UNEXPECTED_EOF -2147483643 // 0x80000005
#define PUFFS_FLATE_STATUS_SHORT_READ 6 // 0x00000006
#define PUFFS_FLATE_STATUS_SHORT_WRITE 7 // 0x00000007
#define PUFFS_FLATE_SUSPENSION_SHORT_READ 6 // 0x00000006
#define PUFFS_FLATE_SUSPENSION_SHORT_WRITE 7 // 0x00000007
#define PUFFS_FLATE_ERROR_CLOSED_FOR_WRITES -2147483640 // 0x80000008
#define PUFFS_FLATE_ERROR_BAD_FLATE_BLOCK -1157040128 // 0xbb08f800
@@ -414,7 +414,7 @@ exit:
short_read_src:
status = ((a_src.buf->closed) && (a_src.buf->ri == a_src.buf->wi))
? PUFFS_FLATE_ERROR_UNEXPECTED_EOF
: PUFFS_FLATE_STATUS_SHORT_READ;
: PUFFS_FLATE_SUSPENSION_SHORT_READ;
goto suspend;
}
@@ -562,6 +562,6 @@ exit:
short_read_src:
status = ((a_src.buf->closed) && (a_src.buf->ri == a_src.buf->wi))
? PUFFS_FLATE_ERROR_UNEXPECTED_EOF
: PUFFS_FLATE_STATUS_SHORT_READ;
: PUFFS_FLATE_SUSPENSION_SHORT_READ;
goto suspend;
}
+11 -11
View File
@@ -96,8 +96,8 @@ typedef int32_t puffs_gif_status;
#define PUFFS_GIF_ERROR_BAD_ARGUMENT -2147483645 // 0x80000003
#define PUFFS_GIF_ERROR_CONSTRUCTOR_NOT_CALLED -2147483644 // 0x80000004
#define PUFFS_GIF_ERROR_UNEXPECTED_EOF -2147483643 // 0x80000005
#define PUFFS_GIF_STATUS_SHORT_READ 6 // 0x00000006
#define PUFFS_GIF_STATUS_SHORT_WRITE 7 // 0x00000007
#define PUFFS_GIF_SUSPENSION_SHORT_READ 6 // 0x00000006
#define PUFFS_GIF_SUSPENSION_SHORT_WRITE 7 // 0x00000007
#define PUFFS_GIF_ERROR_CLOSED_FOR_WRITES -2147483640 // 0x80000008
#define PUFFS_GIF_ERROR_BAD_GIF_BLOCK -1105848320 // 0xbe161800
@@ -584,7 +584,7 @@ exit:
short_read_src:
status = ((a_src.buf->closed) && (a_src.buf->ri == a_src.buf->wi))
? PUFFS_GIF_ERROR_UNEXPECTED_EOF
: PUFFS_GIF_STATUS_SHORT_READ;
: PUFFS_GIF_SUSPENSION_SHORT_READ;
goto suspend;
}
@@ -664,7 +664,7 @@ exit:
short_read_src:
status = ((a_src.buf->closed) && (a_src.buf->ri == a_src.buf->wi))
? PUFFS_GIF_ERROR_UNEXPECTED_EOF
: PUFFS_GIF_STATUS_SHORT_READ;
: PUFFS_GIF_SUSPENSION_SHORT_READ;
return status;
}
@@ -773,7 +773,7 @@ exit:
short_read_src:
status = ((a_src.buf->closed) && (a_src.buf->ri == a_src.buf->wi))
? PUFFS_GIF_ERROR_UNEXPECTED_EOF
: PUFFS_GIF_STATUS_SHORT_READ;
: PUFFS_GIF_SUSPENSION_SHORT_READ;
return status;
}
@@ -835,7 +835,7 @@ puffs_gif_status puffs_gif_decoder_decode_extension(puffs_gif_decoder* self,
t_2 -= b_rend_src - b_rptr_src;
a_src.buf->ri = a_src.buf->wi;
status = a_src.buf->closed ? PUFFS_GIF_ERROR_UNEXPECTED_EOF
: PUFFS_GIF_STATUS_SHORT_READ;
: PUFFS_GIF_SUSPENSION_SHORT_READ;
return status;
}
b_rptr_src += t_2;
@@ -868,7 +868,7 @@ exit:
short_read_src:
status = ((a_src.buf->closed) && (a_src.buf->ri == a_src.buf->wi))
? PUFFS_GIF_ERROR_UNEXPECTED_EOF
: PUFFS_GIF_STATUS_SHORT_READ;
: PUFFS_GIF_SUSPENSION_SHORT_READ;
return status;
}
@@ -1022,7 +1022,7 @@ exit:
short_read_src:
status = ((a_src.buf->closed) && (a_src.buf->ri == a_src.buf->wi))
? PUFFS_GIF_ERROR_UNEXPECTED_EOF
: PUFFS_GIF_STATUS_SHORT_READ;
: PUFFS_GIF_SUSPENSION_SHORT_READ;
return status;
}
@@ -1139,7 +1139,7 @@ puffs_gif_status puffs_gif_lzw_decoder_decode(puffs_gif_lzw_decoder* self,
if (v_code < v_clear_code) {
PUFFS_COROUTINE_STATE(2);
if (b_wptr_dst == b_wend_dst) {
status = PUFFS_GIF_STATUS_SHORT_WRITE;
status = PUFFS_GIF_SUSPENSION_SHORT_WRITE;
goto suspend;
}
*b_wptr_dst++ = ((uint8_t)(v_code));
@@ -1183,7 +1183,7 @@ puffs_gif_status puffs_gif_lzw_decoder_decode(puffs_gif_lzw_decoder* self,
}
if ((b_wend_dst - b_wptr_dst) <
(sizeof(self->private_impl.f_stack) - v_s)) {
status = PUFFS_GIF_STATUS_SHORT_WRITE;
status = PUFFS_GIF_SUSPENSION_SHORT_WRITE;
goto suspend;
}
memmove(b_wptr_dst, self->private_impl.f_stack + v_s,
@@ -1252,6 +1252,6 @@ exit:
short_read_src:
status = ((a_src.buf->closed) && (a_src.buf->ri == a_src.buf->wi))
? PUFFS_GIF_ERROR_UNEXPECTED_EOF
: PUFFS_GIF_STATUS_SHORT_READ;
: PUFFS_GIF_SUSPENSION_SHORT_READ;
goto suspend;
}
+2 -2
View File
@@ -96,8 +96,8 @@ typedef int32_t puffs_flate_status;
#define PUFFS_FLATE_ERROR_BAD_ARGUMENT -2147483645 // 0x80000003
#define PUFFS_FLATE_ERROR_CONSTRUCTOR_NOT_CALLED -2147483644 // 0x80000004
#define PUFFS_FLATE_ERROR_UNEXPECTED_EOF -2147483643 // 0x80000005
#define PUFFS_FLATE_STATUS_SHORT_READ 6 // 0x00000006
#define PUFFS_FLATE_STATUS_SHORT_WRITE 7 // 0x00000007
#define PUFFS_FLATE_SUSPENSION_SHORT_READ 6 // 0x00000006
#define PUFFS_FLATE_SUSPENSION_SHORT_WRITE 7 // 0x00000007
#define PUFFS_FLATE_ERROR_CLOSED_FOR_WRITES -2147483640 // 0x80000008
#define PUFFS_FLATE_ERROR_BAD_FLATE_BLOCK -1157040128 // 0xbb08f800
+2 -2
View File
@@ -96,8 +96,8 @@ typedef int32_t puffs_gif_status;
#define PUFFS_GIF_ERROR_BAD_ARGUMENT -2147483645 // 0x80000003
#define PUFFS_GIF_ERROR_CONSTRUCTOR_NOT_CALLED -2147483644 // 0x80000004
#define PUFFS_GIF_ERROR_UNEXPECTED_EOF -2147483643 // 0x80000005
#define PUFFS_GIF_STATUS_SHORT_READ 6 // 0x00000006
#define PUFFS_GIF_STATUS_SHORT_WRITE 7 // 0x00000007
#define PUFFS_GIF_SUSPENSION_SHORT_READ 6 // 0x00000006
#define PUFFS_GIF_SUSPENSION_SHORT_WRITE 7 // 0x00000007
#define PUFFS_GIF_ERROR_CLOSED_FOR_WRITES -2147483640 // 0x80000008
#define PUFFS_GIF_ERROR_BAD_GIF_BLOCK -1105848320 // 0xbe161800
+4 -4
View File
@@ -403,8 +403,8 @@ func NewIf(condition *Expr, elseIf *If, bodyIfTrue []*Node, bodyIfFalse []*Node)
}
}
// Return is "return LHS", "return error ID1" or "return status ID1":
// - ID0: <0|IDError|IDStatus>
// Return is "return LHS", "return error ID1" or "return suspension ID1":
// - ID0: <0|IDError|IDSuspension>
// - ID1: message
// - LHS: <nil|Expr>
type Return Node
@@ -577,9 +577,9 @@ func NewFunc(flags Flags, filename string, line uint32, receiver t.ID, name t.ID
}
}
// Status is "error ID1" or "status ID1":
// Status is "error ID1" or "suspension ID1":
// - FlagsPublic is "pub" vs "pri"
// - ID0: <IDError|IDStatus>
// - ID0: <IDError|IDSuspension>
// - ID1: message
type Status Node
+2 -2
View File
@@ -162,7 +162,7 @@ func (p *parser) parseTopLevelDecl() (*a.Node, error) {
out := a.NewStruct(0, p.filename, line, t.IDOut, outFields)
return a.NewFunc(flags, p.filename, line, id0, id1, in, out, asserts, body).Node(), nil
case t.KeyError, t.KeyStatus:
case t.KeyError, t.KeySuspension:
keyword := p.src[0].ID
p.src = p.src[1:]
message := p.peek1()
@@ -549,7 +549,7 @@ func (p *parser) parseStatement1() (*a.Node, error) {
switch x := p.peek1(); x.Key() {
case t.KeySemicolon:
// No-op.
case t.KeyError, t.KeyStatus:
case t.KeyError, t.KeySuspension:
keyword = x
p.src = p.src[1:]
message = p.peek1()
+69 -69
View File
@@ -188,29 +188,29 @@ const (
KeyAs = Key(IDAs >> KeyShift)
// TODO: sort these by name, when the list has stabilized.
KeyFunc = Key(IDFunc >> KeyShift)
KeyPtr = Key(IDPtr >> KeyShift)
KeyAssert = Key(IDAssert >> KeyShift)
KeyWhile = Key(IDWhile >> KeyShift)
KeyIf = Key(IDIf >> KeyShift)
KeyElse = Key(IDElse >> KeyShift)
KeyReturn = Key(IDReturn >> KeyShift)
KeyBreak = Key(IDBreak >> KeyShift)
KeyContinue = Key(IDContinue >> KeyShift)
KeyStruct = Key(IDStruct >> KeyShift)
KeyUse = Key(IDUse >> KeyShift)
KeyVar = Key(IDVar >> KeyShift)
KeyNptr = Key(IDNptr >> KeyShift)
KeyPre = Key(IDPre >> KeyShift)
KeyInv = Key(IDInv >> KeyShift)
KeyPost = Key(IDPost >> KeyShift)
KeyVia = Key(IDVia >> KeyShift)
KeyPub = Key(IDPub >> KeyShift)
KeyPri = Key(IDPri >> KeyShift)
KeyError = Key(IDError >> KeyShift)
KeyStatus = Key(IDStatus >> KeyShift)
KeyLimit = Key(IDLimit >> KeyShift)
KeyPackageID = Key(IDPackageID >> KeyShift)
KeyFunc = Key(IDFunc >> KeyShift)
KeyPtr = Key(IDPtr >> KeyShift)
KeyAssert = Key(IDAssert >> KeyShift)
KeyWhile = Key(IDWhile >> KeyShift)
KeyIf = Key(IDIf >> KeyShift)
KeyElse = Key(IDElse >> KeyShift)
KeyReturn = Key(IDReturn >> KeyShift)
KeyBreak = Key(IDBreak >> KeyShift)
KeyContinue = Key(IDContinue >> KeyShift)
KeyStruct = Key(IDStruct >> KeyShift)
KeyUse = Key(IDUse >> KeyShift)
KeyVar = Key(IDVar >> KeyShift)
KeyNptr = Key(IDNptr >> KeyShift)
KeyPre = Key(IDPre >> KeyShift)
KeyInv = Key(IDInv >> KeyShift)
KeyPost = Key(IDPost >> KeyShift)
KeyVia = Key(IDVia >> KeyShift)
KeyPub = Key(IDPub >> KeyShift)
KeyPri = Key(IDPri >> KeyShift)
KeyError = Key(IDError >> KeyShift)
KeySuspension = Key(IDSuspension >> KeyShift)
KeyLimit = Key(IDLimit >> KeyShift)
KeyPackageID = Key(IDPackageID >> KeyShift)
KeyFalse = Key(IDFalse >> KeyShift)
KeyTrue = Key(IDTrue >> KeyShift)
@@ -349,29 +349,29 @@ const (
IDAs = ID(0x5B<<KeyShift | FlagsBinaryOp)
// TODO: sort these by name, when the list has stabilized.
IDFunc = ID(0x60<<KeyShift | FlagsOther)
IDPtr = ID(0x61<<KeyShift | FlagsOther)
IDAssert = ID(0x62<<KeyShift | FlagsOther)
IDWhile = ID(0x63<<KeyShift | FlagsOther)
IDIf = ID(0x64<<KeyShift | FlagsOther)
IDElse = ID(0x65<<KeyShift | FlagsOther)
IDReturn = ID(0x66<<KeyShift | FlagsOther | FlagsImplicitSemicolon)
IDBreak = ID(0x67<<KeyShift | FlagsOther | FlagsImplicitSemicolon)
IDContinue = ID(0x68<<KeyShift | FlagsOther | FlagsImplicitSemicolon)
IDStruct = ID(0x69<<KeyShift | FlagsOther)
IDUse = ID(0x6A<<KeyShift | FlagsOther)
IDVar = ID(0x6B<<KeyShift | FlagsOther)
IDNptr = ID(0x6C<<KeyShift | FlagsOther)
IDPre = ID(0x6D<<KeyShift | FlagsOther)
IDInv = ID(0x6E<<KeyShift | FlagsOther)
IDPost = ID(0x6F<<KeyShift | FlagsOther)
IDVia = ID(0x70<<KeyShift | FlagsOther)
IDPub = ID(0x71<<KeyShift | FlagsOther)
IDPri = ID(0x72<<KeyShift | FlagsOther)
IDError = ID(0x73<<KeyShift | FlagsOther)
IDStatus = ID(0x74<<KeyShift | FlagsOther)
IDLimit = ID(0x75<<KeyShift | FlagsOther)
IDPackageID = ID(0x76<<KeyShift | FlagsOther)
IDFunc = ID(0x60<<KeyShift | FlagsOther)
IDPtr = ID(0x61<<KeyShift | FlagsOther)
IDAssert = ID(0x62<<KeyShift | FlagsOther)
IDWhile = ID(0x63<<KeyShift | FlagsOther)
IDIf = ID(0x64<<KeyShift | FlagsOther)
IDElse = ID(0x65<<KeyShift | FlagsOther)
IDReturn = ID(0x66<<KeyShift | FlagsOther | FlagsImplicitSemicolon)
IDBreak = ID(0x67<<KeyShift | FlagsOther | FlagsImplicitSemicolon)
IDContinue = ID(0x68<<KeyShift | FlagsOther | FlagsImplicitSemicolon)
IDStruct = ID(0x69<<KeyShift | FlagsOther)
IDUse = ID(0x6A<<KeyShift | FlagsOther)
IDVar = ID(0x6B<<KeyShift | FlagsOther)
IDNptr = ID(0x6C<<KeyShift | FlagsOther)
IDPre = ID(0x6D<<KeyShift | FlagsOther)
IDInv = ID(0x6E<<KeyShift | FlagsOther)
IDPost = ID(0x6F<<KeyShift | FlagsOther)
IDVia = ID(0x70<<KeyShift | FlagsOther)
IDPub = ID(0x71<<KeyShift | FlagsOther)
IDPri = ID(0x72<<KeyShift | FlagsOther)
IDError = ID(0x73<<KeyShift | FlagsOther)
IDSuspension = ID(0x74<<KeyShift | FlagsOther)
IDLimit = ID(0x75<<KeyShift | FlagsOther)
IDPackageID = ID(0x76<<KeyShift | FlagsOther)
IDFalse = ID(0x80<<KeyShift | FlagsLiteral | FlagsImplicitSemicolon)
IDTrue = ID(0x81<<KeyShift | FlagsLiteral | FlagsImplicitSemicolon)
@@ -530,29 +530,29 @@ var builtInsByKey = [nBuiltInKeys]struct {
KeyAs: {"as", IDAs},
// TODO: do we need a "~as" form of the as operator, similar to "~+".
KeyFunc: {"func", IDFunc},
KeyPtr: {"ptr", IDPtr},
KeyAssert: {"assert", IDAssert},
KeyWhile: {"while", IDWhile},
KeyIf: {"if", IDIf},
KeyElse: {"else", IDElse},
KeyReturn: {"return", IDReturn},
KeyBreak: {"break", IDBreak},
KeyContinue: {"continue", IDContinue},
KeyStruct: {"struct", IDStruct},
KeyUse: {"use", IDUse},
KeyVar: {"var", IDVar},
KeyNptr: {"nptr", IDNptr},
KeyPre: {"pre", IDPre},
KeyInv: {"inv", IDInv},
KeyPost: {"post", IDPost},
KeyVia: {"via", IDVia},
KeyPub: {"pub", IDPub},
KeyPri: {"pri", IDPri},
KeyError: {"error", IDError},
KeyStatus: {"status", IDStatus},
KeyLimit: {"limit", IDLimit},
KeyPackageID: {"packageid", IDPackageID},
KeyFunc: {"func", IDFunc},
KeyPtr: {"ptr", IDPtr},
KeyAssert: {"assert", IDAssert},
KeyWhile: {"while", IDWhile},
KeyIf: {"if", IDIf},
KeyElse: {"else", IDElse},
KeyReturn: {"return", IDReturn},
KeyBreak: {"break", IDBreak},
KeyContinue: {"continue", IDContinue},
KeyStruct: {"struct", IDStruct},
KeyUse: {"use", IDUse},
KeyVar: {"var", IDVar},
KeyNptr: {"nptr", IDNptr},
KeyPre: {"pre", IDPre},
KeyInv: {"inv", IDInv},
KeyPost: {"post", IDPost},
KeyVia: {"via", IDVia},
KeyPub: {"pub", IDPub},
KeyPri: {"pri", IDPri},
KeyError: {"error", IDError},
KeySuspension: {"suspension", IDSuspension},
KeyLimit: {"limit", IDLimit},
KeyPackageID: {"packageid", IDPackageID},
KeyFalse: {"false", IDFalse},
KeyTrue: {"true", IDTrue},
+4 -4
View File
@@ -122,7 +122,7 @@ void test_basic_status_is_error() {
FAIL("is_error(BAD_VERSION) returned false");
return;
}
if (puffs_gif_status_is_error(PUFFS_GIF_STATUS_SHORT_WRITE)) {
if (puffs_gif_status_is_error(PUFFS_GIF_SUSPENSION_SHORT_WRITE)) {
FAIL("is_error(SHORT_WRITE) returned true");
return;
}
@@ -146,7 +146,7 @@ void test_basic_status_strings() {
FAIL("got \"%s\", want \"%s\"", s1, t1);
return;
}
const char* s2 = puffs_gif_status_string(PUFFS_GIF_STATUS_SHORT_WRITE);
const char* s2 = puffs_gif_status_string(PUFFS_GIF_SUSPENSION_SHORT_WRITE);
const char* t2 = "gif: short write";
if (strcmp(s2, t2)) {
FAIL("got \"%s\", want \"%s\"", s2, t2);
@@ -238,8 +238,8 @@ void test_puffs_gif_lzw_decode(const char* src_filename,
}
break;
}
if (status != PUFFS_GIF_STATUS_SHORT_READ) {
FAIL("status: got %d, want %d", status, PUFFS_GIF_STATUS_SHORT_READ);
if (status != PUFFS_GIF_SUSPENSION_SHORT_READ) {
FAIL("status: got %d, want %d", status, PUFFS_GIF_SUSPENSION_SHORT_READ);
goto cleanup1;
}
if (src.ri < old_ri) {