Change error "?foo" to status "?foo"

This commit is contained in:
Nigel Tao committed 2018-08-12 21:31:56 +10:00
1 parent 203b45e869
commit eec0fce647
18 files changed
+196 -231

No files matched your search

+13 -16
View File
@@ -113,17 +113,15 @@ func Do(args []string) error {
"// !! INSERT base-public.h.\n": insertBasePublicH,
"// !! INSERT wuffs_base__status strings.\n": func(b *buffer) error {
for _, z := range builtin.StatusList {
pre := ""
switch z.Keyword {
case t.IDError:
pre = "error"
case t.IDSuspension:
pre = "suspension"
default:
if z == "" {
continue
}
pre := "error"
if z[0] == '$' {
pre = "suspension"
}
b.printf("const char* wuffs_base__%s__%s = \"%sbase: %s\";\n",
pre, cName(z.Message, ""), z.Message[:1], z.Message[1:])
pre, cName(z, ""), z[:1], z[1:])
}
return nil
},
@@ -186,6 +184,10 @@ type status struct {
public bool
}
func statusMsgIsError(msg string) bool {
return (len(msg) == 0) || (msg[0] != '$')
}
type buffer []byte
func (b *buffer) Write(p []byte) (int, error) {
@@ -245,16 +247,11 @@ func insertBasePublicH(buf *buffer) error {
if err := expandBangBangInsert(buf, baseBasePublicH, map[string]func(*buffer) error{
"// !! INSERT wuffs_base__status names.\n": func(b *buffer) error {
for _, z := range builtin.StatusList {
pre := ""
switch z.Keyword {
case t.IDError:
pre = "error"
case t.IDSuspension:
pre := "error"
if !statusMsgIsError(z) {
pre = "suspension"
default:
continue
}
b.printf("extern const char* wuffs_base__%s__%s;\n", pre, cName(z.Message, ""))
b.printf("extern const char* wuffs_base__%s__%s;\n", pre, cName(z, ""))
}
return nil
},
+6 -7
View File
@@ -208,22 +208,21 @@ func (g *gen) writeExprOther(b *buffer, n *a.Expr, rp replacementPolicy, depth u
b.writes(n.Ident().Str(g.tm))
return nil
case t.IDError, t.IDStatus, t.IDSuspension:
case t.IDStatus:
if z := g.statusMap[n.StatusQID()]; z.cName != "" {
b.writes(z.cName)
} else {
msg, _ := t.Unescape(n.Ident().Str(g.tm))
z := builtin.StatusMap[msg]
if z.Message == "" {
if !builtin.StatusMap[msg] {
return fmt.Errorf("no status code for %q", msg)
}
b.writes("wuffs_base__")
if z.Keyword == t.IDSuspension {
b.writes("suspension__")
} else {
if statusMsgIsError(msg) {
b.writes("error__")
} else {
b.writes("suspension__")
}
b.writes(cName(z.Message, ""))
b.writes(cName(msg, ""))
}
return nil
}
+9 -6
View File
@@ -306,12 +306,16 @@ func (g *gen) writeStatementRet(b *buffer, n *a.Ret, depth uint32) error {
retExpr := n.Value()
if g.currFunk.suspendible {
isError, isOK := false, false
b.writes("status = ")
retKeyword := t.IDStatus
if retExpr == nil {
b.writes("NULL")
isOK = true
} else {
retKeyword = retExpr.Operator()
if retExpr.Operator() == t.IDStatus {
msg, _ := t.Unescape(retExpr.Ident().Str(g.tm))
isError = statusMsgIsError(msg)
}
// TODO: check that retExpr has no call-suspendibles.
if err := g.writeExpr(
b, retExpr, replaceCallSuspendibles, depth); err != nil {
@@ -324,13 +328,12 @@ func (g *gen) writeStatementRet(b *buffer, n *a.Ret, depth uint32) error {
return g.writeCoroSuspPoint(b, true)
}
switch retKeyword {
case t.IDError:
if isError {
b.writes("goto exit;")
case t.IDStatus:
} else if isOK {
g.currFunk.hasGotoOK = true
b.writes("goto ok;")
default:
} else {
g.currFunk.hasGotoOK = true
b.writes("if (!status) { goto ok; }" +
"else if (wuffs_base__status__is_suspension(status)) { " +