Remove the WUFFS_FOO__STATUS_ETC names

This commit is contained in:
Nigel Tao committed 2018-06-10 22:05:06 +10:00
1 parent d770e879ab
commit 50a955317a
30 files changed
+214 -677

No files matched your search

+3 -9
View File
@@ -374,11 +374,8 @@ func (g *gen) writeBuiltinCallSuspendibles(b *buffer, n *a.Expr, depth uint32) e
if recvTyp.QID()[1] == t.IDIOReader {
switch method.Ident() {
case t.IDUnreadU8:
b.printf("if (ioptr_src == iobounds0orig_src) { status = %sERROR_INVALID_I_O_OPERATION;",
g.PKGPREFIX)
b.writes("goto exit;")
b.writes("}\n")
b.printf("ioptr_src--;\n")
b.writes("if (ioptr_src == iobounds0orig_src) {" +
"status = WUFFS_BASE__ERROR_INVALID_I_O_OPERATION; goto exit; } ioptr_src--;\n")
return nil
case t.IDReadU8:
@@ -462,10 +459,7 @@ func (g *gen) writeBuiltinCallSuspendibles(b *buffer, n *a.Expr, depth uint32) e
switch method.Ident() {
case t.IDWriteU8:
if !n.ProvenNotToSuspend() {
b.printf("if (ioptr_dst == iobounds1_dst) { status = %sSUSPENSION_SHORT_WRITE;",
g.PKGPREFIX)
b.writes("goto suspend;")
b.writes("}\n")
b.writes("if (ioptr_dst == iobounds1_dst) { status = WUFFS_BASE__SUSPENSION_SHORT_WRITE; goto suspend; }\n")
}
b.printf("*ioptr_dst++ = ")
+15 -32
View File
@@ -96,7 +96,6 @@ func Do(args []string) error {
} else {
g := &gen{
PKGPREFIX: "WUFFS_" + strings.ToUpper(pkgName) + "__",
pkgPrefix: "wuffs_" + pkgName + "__",
pkgName: pkgName,
tm: tm,
@@ -246,7 +245,6 @@ func genStatusStringData(b *buffer, pkgPrefix string, ss *[256]string) error {
}
type gen struct {
PKGPREFIX string // e.g. "WUFFS_JPEG__"
pkgPrefix string // e.g. "wuffs_jpeg__"
pkgName string // e.g. "jpeg"
@@ -328,21 +326,6 @@ func (g *gen) genHeader(b *buffer) error {
pkgID := g.checker.PackageID()
b.printf("#define %spackageid %d // 0x%08X\n\n", g.pkgPrefix, pkgID, pkgID)
for _, z := range builtin.StatusList {
name := z.Message
if z.Keyword == t.IDError {
name = "error " + name
} else if z.Keyword == t.IDSuspension {
name = "suspension " + name
} else {
name = "status " + name
}
code := int32(z.Value) << 24
b.printf("#define %s %d // 0x%08X\n",
strings.ToUpper(cName(name, g.PKGPREFIX)), code, uint32(code))
}
b.writes("\n")
for _, s := range g.statusList {
code := (int32(s.value) << 24) | int32(pkgID)
b.printf("#define %s %d // 0x%08X\n", s.name, code, uint32(code))
@@ -624,7 +607,7 @@ func (g *gen) writeConstList(b *buffer, n *a.Expr) error {
func (g *gen) writeStruct(b *buffer, n *a.Struct) error {
// For API/ABI compatibility, the very first field in the struct's
// private_impl must be the status code. This lets the initializer callee
// set "self->private_impl.status = WUFFS_ETC__ERROR_BAD_WUFFS_VERSION;"
// set "self->private_impl.status = WUFFS_BASE__ERROR_BAD_WUFFS_VERSION;"
// regardless of the sizeof(*self) struct reserved by the caller and even
// if the caller and callee were built with different versions.
structName := n.QID().Str(g.tm)
@@ -773,22 +756,22 @@ func (g *gen) writeInitializerImpl(b *buffer, n *a.Struct) error {
if err := g.writeInitializerSignature(b, n, false); err != nil {
return err
}
b.printf("{\n")
b.printf("if (!self) { return; }\n")
b.writes("{\n")
b.writes("if (!self) { return; }\n")
b.printf("if (sizeof(*self) != sizeof_star_self) {\n")
b.printf("self->private_impl.status = %sERROR_BAD_SIZEOF_RECEIVER;\n", g.PKGPREFIX)
b.printf("return;\n")
b.printf("}\n")
b.printf("if (((wuffs_version >> 32) != WUFFS_VERSION_MAJOR) || " +
b.writes("if (sizeof(*self) != sizeof_star_self) {\n")
b.writes("self->private_impl.status = WUFFS_BASE__ERROR_BAD_SIZEOF_RECEIVER;\n")
b.writes("return;\n")
b.writes("}\n")
b.writes("if (((wuffs_version >> 32) != WUFFS_VERSION_MAJOR) || " +
"(((wuffs_version >> 16) & 0xFFFF) > WUFFS_VERSION_MINOR)) {\n")
b.printf("self->private_impl.status = %sERROR_BAD_WUFFS_VERSION;\n", g.PKGPREFIX)
b.printf("return;\n")
b.printf("}\n")
b.printf("if (self->private_impl.magic != 0) {\n")
b.printf("self->private_impl.status = %sERROR_CHECK_WUFFS_VERSION_CALLED_TWICE;\n", g.PKGPREFIX)
b.printf("return;\n")
b.printf("}\n")
b.writes("self->private_impl.status = WUFFS_BASE__ERROR_BAD_WUFFS_VERSION;\n")
b.writes("return;\n")
b.writes("}\n")
b.writes("if (self->private_impl.magic != 0) {\n")
b.writes("self->private_impl.status = WUFFS_BASE__ERROR_CHECK_WUFFS_VERSION_CALLED_TWICE;\n")
b.writes("return;\n")
b.writes("}\n")
b.writes("self->private_impl.magic = WUFFS_BASE__MAGIC;\n")
+2 -5
View File
@@ -127,16 +127,13 @@ const baseImplC = "" +
""
type template_args_short_read struct {
PKGPREFIX string
name string
name string
}
func template_short_read(b *buffer, args template_args_short_read) error {
b.printf("short_read_%s:\nif (wuffs_base__io_reader__is_eof(a_%s)) {\nstatus = %sERROR_UNEXPECTED_EOF;\ngoto exit;\n}\nstatus = %sSUSPENSION_SHORT_READ;\ngoto suspend;\n",
b.printf("short_read_%s:\nif (wuffs_base__io_reader__is_eof(a_%s)) {\nstatus = WUFFS_BASE__ERROR_UNEXPECTED_EOF;\ngoto exit;\n}\nstatus = WUFFS_BASE__SUSPENSION_SHORT_READ;\ngoto suspend;\n",
args.name,
args.name,
args.PKGPREFIX,
args.PKGPREFIX,
)
return nil
}
+1 -1
View File
@@ -214,7 +214,7 @@ func (g *gen) writeExprOther(b *buffer, n *a.Expr, rp replacementPolicy, depth u
if z.Message == "" {
return fmt.Errorf("no status code for %q", msg)
}
status.name = strings.ToUpper(g.cName(z.String()))
status.name = strings.ToUpper(cName(z.String(), "WUFFS_BASE__"))
}
b.writes(status.name)
return nil
+9 -10
View File
@@ -180,19 +180,19 @@ func (g *gen) writeFuncImplHeader(b *buffer) error {
b.writes("if (!self) {")
if g.currFunk.suspendible {
b.printf("return %sERROR_BAD_RECEIVER;", g.PKGPREFIX)
b.writes("return WUFFS_BASE__ERROR_BAD_RECEIVER;")
} else if len(outFields) == 0 {
b.printf("return;")
b.writes("return;")
} else if len(outFields) == 1 {
// TODO: don't assume that the return type is an integer.
b.printf("return 0;")
b.writes("return 0;")
} else {
return fmt.Errorf("TODO: handle structured return types")
}
b.writes("}")
b.printf("if (self->private_impl.magic != WUFFS_BASE__MAGIC) {"+
"self->private_impl.status = %sERROR_CHECK_WUFFS_VERSION_NOT_CALLED; }", g.PKGPREFIX)
b.writes("if (self->private_impl.magic != WUFFS_BASE__MAGIC) {" +
"self->private_impl.status = WUFFS_BASE__ERROR_CHECK_WUFFS_VERSION_NOT_CALLED; }")
b.writes("if (self->private_impl.status < 0) {")
if g.currFunk.suspendible {
@@ -318,8 +318,7 @@ func (g *gen) writeFuncImplFooter(b *buffer) error {
}
shortReadsSeen[sr] = struct{}{}
if err := template_short_read(b, template_args_short_read{
PKGPREFIX: g.PKGPREFIX,
name: sr,
name: sr,
}); err != nil {
return err
}
@@ -389,12 +388,12 @@ func (g *gen) writeFuncImplArgChecks(b *buffer, n *a.Func) error {
b.writes(") {")
if g.currFunk.suspendible {
if g.currFunk.public {
b.printf("self->private_impl.status = %sERROR_BAD_ARGUMENT;\n", g.PKGPREFIX)
b.writes("self->private_impl.status = WUFFS_BASE__ERROR_BAD_ARGUMENT;\n")
}
b.printf("return %sERROR_BAD_ARGUMENT;\n\n", g.PKGPREFIX)
b.writes("return WUFFS_BASE__ERROR_BAD_ARGUMENT;\n\n")
} else if !n.Receiver().IsZero() {
// TODO: unused code path??
b.printf("self->private_impl.status = %sERROR_BAD_ARGUMENT; return;", g.PKGPREFIX)
b.writes("self->private_impl.status = WUFFS_BASE__ERROR_BAD_ARGUMENT; return;")
} else {
b.printf("return;")
}
+3 -3
View File
@@ -329,7 +329,7 @@ func (g *gen) writeStatementRet(b *buffer, n *a.Ret, depth uint32) error {
b.writes("status = ")
retKeyword := t.IDStatus
if retExpr == nil {
b.printf("%s%s", g.PKGPREFIX, "STATUS_OK")
b.writes("WUFFS_BASE__STATUS_OK")
} else {
retKeyword = retExpr.Operator()
// TODO: check that retExpr has no call-suspendibles.
@@ -352,8 +352,8 @@ func (g *gen) writeStatementRet(b *buffer, n *a.Ret, depth uint32) error {
b.writes("goto ok;")
default:
g.currFunk.hasGotoOK = true
b.printf("if (status == 0) { goto ok; } else if (status > 0) { "+
"status = %sERROR_CANNOT_RETURN_A_SUSPENSION; } goto exit;", g.PKGPREFIX)
b.writes("if (status == 0) { goto ok; } else if (status > 0) { " +
"status = WUFFS_BASE__ERROR_CANNOT_RETURN_A_SUSPENSION; } goto exit;")
}
return nil
}
+3 -3
View File
@@ -21,12 +21,12 @@
// This file has a .h extension, not a .c extension, so that Go tools such as
// "go generate" don't try to build it as part of the Go package, via cgo.
template short_read(string qPKGPREFIXq, string qnameq) {
template short_read(string qnameq) {
short_read_qnameq:
if (wuffs_base__io_reader__is_eof(a_qnameq)) {
status = qPKGPREFIXqERROR_UNEXPECTED_EOF;
status = WUFFS_BASE__ERROR_UNEXPECTED_EOF;
goto exit;
}
status = qPKGPREFIXqSUSPENSION_SHORT_READ;
status = WUFFS_BASE__SUSPENSION_SHORT_READ;
goto suspend;
}