Remove the wuffs_foo__status types

This commit is contained in:
Nigel Tao committed 2018-06-10 21:40:43 +10:00
1 parent 699bae15d2
commit d770e879ab
28 files changed
+221 -361

No files matched your search

+3 -6
View File
@@ -325,7 +325,6 @@ func (g *gen) genHeader(b *buffer) error {
b.writes("// ---------------- Status Codes\n\n")
b.printf("typedef int32_t %sstatus;\n\n", g.pkgPrefix)
pkgID := g.checker.PackageID()
b.printf("#define %spackageid %d // 0x%08X\n\n", g.pkgPrefix, pkgID, pkgID)
@@ -350,8 +349,7 @@ func (g *gen) genHeader(b *buffer) error {
}
b.writes("\n")
b.printf("bool %sstatus__is_error(%sstatus s);\n\n", g.pkgPrefix, g.pkgPrefix)
b.printf("const char* %sstatus__string(%sstatus s);\n\n", g.pkgPrefix, g.pkgPrefix)
b.printf("const char* %sstatus__string(wuffs_base__status s);\n\n", g.pkgPrefix)
b.writes("// ---------------- Public Consts\n\n")
if err := g.forEachConst(b, pubOnly, (*gen).writeConst); err != nil {
@@ -389,7 +387,6 @@ func (g *gen) genImpl(b *buffer) error {
b.writeb('\n')
b.writes("// ---------------- Status Codes Implementations\n\n")
b.printf("bool %sstatus__is_error(%sstatus s) { return s < 0; }\n\n", g.pkgPrefix, g.pkgPrefix)
{
messages := [256]string{}
@@ -401,7 +398,7 @@ func (g *gen) genImpl(b *buffer) error {
}
}
b.printf("const char* %sstatus__string(%sstatus s) {\n", g.pkgPrefix, g.pkgPrefix)
b.printf("const char* %sstatus__string(wuffs_base__status s) {\n", g.pkgPrefix)
b.printf("uint16_t o;")
b.printf("switch (s & 0x%X) {\n", (1<<base38.MaxBits)-1)
b.printf("case 0: return wuffs_base__status__string(s);\n")
@@ -641,7 +638,7 @@ func (g *gen) writeStruct(b *buffer, n *a.Struct) error {
b.writes("// It is a struct, not a struct*, so that it can be stack allocated.\n")
b.writes("struct {\n")
if n.Suspendible() {
b.printf("%sstatus status;\n", g.pkgPrefix)
b.printf("wuffs_base__status status;\n")
b.writes("uint32_t magic;\n")
b.writes("\n")
}
+1 -6
View File
@@ -411,12 +411,7 @@ func (g *gen) writeCTypeName(b *buffer, n *a.TypeExpr, varNamePrefix string, var
}
func (g *gen) packagePrefix(qid t.QID) string {
if qid == (t.QID{t.IDBase, t.IDStatus}) {
// No-op: special case "base.status" as being inside this package.
//
// TODO: change "base.status" in Wuffs code to just "status"? Or
// change the C code's "wuffs_foo__status" to "wuffs_base__status"?
} else if qid[0] != 0 {
if qid[0] != 0 {
otherPkg := g.tm.ByID(qid[0])
// TODO: map the "deflate" in "deflate.decoder" to the "deflate" in
// `use "std/deflate"`, and use the latter "deflate".
+2 -2
View File
@@ -76,7 +76,7 @@ func (g *gen) writeFuncSignature(b *buffer, n *a.Func) error {
// TODO: write n's return values.
if n.Suspendible() {
b.printf("%sstatus ", g.pkgPrefix)
b.writes("wuffs_base__status ")
} else if outFields := n.Out().Fields(); len(outFields) == 0 {
b.writes("void ")
} else if len(outFields) == 1 {
@@ -217,7 +217,7 @@ func (g *gen) writeFuncImplHeader(b *buffer) error {
}
if g.currFunk.suspendible {
b.printf("%sstatus status = %sSTATUS_OK;\n", g.pkgPrefix, g.PKGPREFIX)
b.printf("wuffs_base__status status = WUFFS_BASE__STATUS_OK;\n")
}
b.writes("\n")
+1 -1
View File
@@ -579,7 +579,7 @@ func (g *gen) writeCallSuspendibles(b *buffer, n *a.Expr, depth uint32) error {
temp := g.currFunk.tempW
g.currFunk.tempW++
b.printf("%sstatus %s%d = ", g.pkgPrefix, tPrefix, temp)
b.printf("wuffs_base__status %s%d = ", tPrefix, temp)
} else {
b.writes("status = ")
}