From 8b4a82ab838505aa10663725f403ea1f48f4eaa8 Mon Sep 17 00:00:00 2001 From: Nigel Tao Date: Wed, 16 May 2018 11:41:48 +1000 Subject: [PATCH] Remove hard-coded output in writeCallSuspendibles Updates #8 --- cmd/wuffs-c/internal/cgen/builtin.go | 2 +- cmd/wuffs-c/internal/cgen/expr.go | 40 +++++--- cmd/wuffs-c/internal/cgen/statement.go | 129 ++++--------------------- 3 files changed, 42 insertions(+), 129 deletions(-) diff --git a/cmd/wuffs-c/internal/cgen/builtin.go b/cmd/wuffs-c/internal/cgen/builtin.go index 21e863d3..94330790 100644 --- a/cmd/wuffs-c/internal/cgen/builtin.go +++ b/cmd/wuffs-c/internal/cgen/builtin.go @@ -24,7 +24,7 @@ import ( var errNoSuchBuiltin = errors.New("cgen: internal error: no such built-in") -func (g *gen) writeBuiltin(b *buffer, n *a.Expr, rp replacementPolicy, depth uint32) error { +func (g *gen) writeBuiltinCall(b *buffer, n *a.Expr, rp replacementPolicy, depth uint32) error { if n.Operator() != t.IDOpenParen { return errNoSuchBuiltin } diff --git a/cmd/wuffs-c/internal/cgen/expr.go b/cmd/wuffs-c/internal/cgen/expr.go index 8c6bb5de..39dd9dcf 100644 --- a/cmd/wuffs-c/internal/cgen/expr.go +++ b/cmd/wuffs-c/internal/cgen/expr.go @@ -85,7 +85,7 @@ func (g *gen) writeExprOther(b *buffer, n *a.Expr, rp replacementPolicy, depth u case t.IDOpenParen: // n is a function call. - if err := g.writeBuiltin(b, n, rp, depth); err != errNoSuchBuiltin { + if err := g.writeBuiltinCall(b, n, rp, depth); err != errNoSuchBuiltin { return err } if isThatMethod(g.tm, n, t.IDReset, 0) { @@ -94,21 +94,7 @@ func (g *gen) writeExprOther(b *buffer, n *a.Expr, rp replacementPolicy, depth u "&self->private_impl.f_lzw, WUFFS_VERSION, 0)") return nil } - method := n.LHS().Expr() - receiver := method.LHS().Expr() - qid := receiver.MType().QID() - b.printf("%s%s__%s(&", g.packagePrefix(qid), qid[1].Str(g.tm), method.Ident().Str(g.tm)) - if err := g.writeExpr(b, receiver, rp, depth); err != nil { - return err - } - for _, o := range n.Args() { - b.writeb(',') - if err := g.writeExpr(b, o.Arg().Value(), rp, depth); err != nil { - return err - } - } - b.writeb(')') - return nil + return g.writeExprUserDefinedCall(b, n, rp, depth) case t.IDOpenBracket: // n is an index. @@ -290,6 +276,28 @@ func (g *gen) writeExprAssociativeOp(b *buffer, n *a.Expr, rp replacementPolicy, return nil } +func (g *gen) writeExprUserDefinedCall(b *buffer, n *a.Expr, rp replacementPolicy, depth uint32) error { + method := n.LHS().Expr() + recv := method.LHS().Expr() + recvTyp, addr := recv.MType(), "&" + if recvTyp.Decorator() == t.IDPtr { + recvTyp, addr = recvTyp.Inner(), "" + } + if recvTyp.Decorator() != 0 { + return fmt.Errorf("cannot generate user-defined method call %q for receiver type %q", + n.Str(g.tm), recv.MType().Str(g.tm)) + } + qid := recvTyp.QID() + b.printf("%s%s__%s(%s", g.packagePrefix(qid), qid[1].Str(g.tm), method.Ident().Str(g.tm), addr) + if err := g.writeExpr(b, recv, rp, depth); err != nil { + return err + } + if len(n.Args()) > 0 { + b.writeb(',') + } + return g.writeArgs(b, n.Args(), rp, depth) +} + func (g *gen) writeCTypeName(b *buffer, n *a.TypeExpr, varNamePrefix string, varName string) error { // It may help to refer to http://unixwiz.net/techtips/reading-cdecl.html diff --git a/cmd/wuffs-c/internal/cgen/statement.go b/cmd/wuffs-c/internal/cgen/statement.go index 0707f809..695e09e5 100644 --- a/cmd/wuffs-c/internal/cgen/statement.go +++ b/cmd/wuffs-c/internal/cgen/statement.go @@ -586,6 +586,7 @@ func (g *gen) writeCallSuspendibles(b *buffer, n *a.Expr, depth uint32) error { return err } b.printf(" = *%srptr_src++;\n", bPrefix) + return nil } else if isInSrc(g.tm, n, t.IDUnreadU8, 0) { b.printf("if (%srptr_src == %srstart_src) { status = %sERROR_INVALID_I_O_OPERATION;", @@ -593,6 +594,7 @@ func (g *gen) writeCallSuspendibles(b *buffer, n *a.Expr, depth uint32) error { b.writes("goto exit;") b.writes("}\n") b.printf("%srptr_src--;\n", bPrefix) + return nil } else if isInSrc(g.tm, n, t.IDReadU16BE, 0) { return g.writeReadUXX(b, n, "src", 16, "be") @@ -631,6 +633,7 @@ func (g *gen) writeCallSuspendibles(b *buffer, n *a.Expr, depth uint32) error { b.writes("goto short_read_src; }\n") g.currFunk.shortReads = append(g.currFunk.shortReads, "src") b.printf("%srptr_src += %s;\n", bPrefix, scratchName) + return nil } else if isInDst(g.tm, n, t.IDWriteU8, 1) { if !n.ProvenNotToSuspend() { @@ -646,56 +649,7 @@ func (g *gen) writeCallSuspendibles(b *buffer, n *a.Expr, depth uint32) error { return err } b.writes(";\n") - - } else if isThisMethod(g.tm, n, "decode_header", 1) { - b.printf("status = %s%s__decode_header(self, %ssrc);\n", - g.pkgPrefix, g.currFunk.astFunc.Receiver().Str(g.tm), aPrefix) - if err := g.writeLoadExprDerivedVars(b, n); err != nil { - return err - } - // TODO: should we goto exit/suspend depending on if status < or > 0? - // Ditto below. - b.writes("if (status) { goto suspend; }\n") - - } else if isThisMethod(g.tm, n, "decode_lsd", 1) { - b.printf("status = %s%s__decode_lsd(self, %ssrc);\n", - g.pkgPrefix, g.currFunk.astFunc.Receiver().Str(g.tm), aPrefix) - if err := g.writeLoadExprDerivedVars(b, n); err != nil { - return err - } - b.writes("if (status) { goto suspend; }\n") - - } else if isThisMethod(g.tm, n, "decode_extension", 1) { - b.printf("status = %s%s__decode_extension(self, %ssrc);\n", - g.pkgPrefix, g.currFunk.astFunc.Receiver().Str(g.tm), aPrefix) - if err := g.writeLoadExprDerivedVars(b, n); err != nil { - return err - } - b.writes("if (status) { goto suspend; }\n") - - } else if isThisMethod(g.tm, n, "decode_ae", 1) { - b.printf("status = %s%s__decode_ae(self, %ssrc);\n", - g.pkgPrefix, g.currFunk.astFunc.Receiver().Str(g.tm), aPrefix) - if err := g.writeLoadExprDerivedVars(b, n); err != nil { - return err - } - b.writes("if (status) { goto suspend; }\n") - - } else if isThisMethod(g.tm, n, "decode_id", 2) { - b.printf("status = %s%s__decode_id(self, %sdst, %ssrc);\n", - g.pkgPrefix, g.currFunk.astFunc.Receiver().Str(g.tm), aPrefix, aPrefix) - if err := g.writeLoadExprDerivedVars(b, n); err != nil { - return err - } - b.writes("if (status) { goto suspend; }\n") - - } else if isThisMethod(g.tm, n, "skip_blocks", 1) { - b.printf("status = %s%s__skip_blocks(self, %ssrc);\n", - g.pkgPrefix, g.currFunk.astFunc.Receiver().Str(g.tm), aPrefix) - if err := g.writeLoadExprDerivedVars(b, n); err != nil { - return err - } - b.writes("if (status) { goto suspend; }\n") + return nil } else if isThisMethod(g.tm, n, "decode_blocks", 2) { // TODO: don't hard code being inside a try call. @@ -712,63 +666,7 @@ func (g *gen) writeCallSuspendibles(b *buffer, n *a.Expr, depth uint32) error { return err } // TODO: check if tPrefix_temp is an error, and return? - - } else if isThisMethod(g.tm, n, "decode_uncompressed", 2) { - b.printf("status = %s%s__decode_uncompressed(self, %sdst, %ssrc);\n", - g.pkgPrefix, g.currFunk.astFunc.Receiver().Str(g.tm), aPrefix, aPrefix) - if err := g.writeLoadExprDerivedVars(b, n); err != nil { - return err - } - b.writes("if (status) { goto suspend; }\n") - - } else if isThisMethod(g.tm, n, "decode_huffman_fast", 2) { - b.printf("status = %s%s__decode_huffman_fast(self, %sdst, %ssrc);\n", - g.pkgPrefix, g.currFunk.astFunc.Receiver().Str(g.tm), aPrefix, aPrefix) - if err := g.writeLoadExprDerivedVars(b, n); err != nil { - return err - } - b.writes("if (status) { goto suspend; }\n") - - } else if isThisMethod(g.tm, n, "decode_huffman_slow", 2) { - b.printf("status = %s%s__decode_huffman_slow(self, %sdst, %ssrc);\n", - g.pkgPrefix, g.currFunk.astFunc.Receiver().Str(g.tm), aPrefix, aPrefix) - if err := g.writeLoadExprDerivedVars(b, n); err != nil { - return err - } - b.writes("if (status) { goto suspend; }\n") - - } else if isThisMethod(g.tm, n, "init_fixed_huffman", 0) { - b.printf("status = %s%s__init_fixed_huffman(self);\n", - g.pkgPrefix, g.currFunk.astFunc.Receiver().Str(g.tm)) - if err := g.writeLoadExprDerivedVars(b, n); err != nil { - return err - } - b.writes("if (status) { goto suspend; }\n") - - } else if isThisMethod(g.tm, n, "init_dynamic_huffman", 1) { - b.printf("status = %s%s__init_dynamic_huffman(self, %ssrc);\n", - g.pkgPrefix, g.currFunk.astFunc.Receiver().Str(g.tm), aPrefix) - if err := g.writeLoadExprDerivedVars(b, n); err != nil { - return err - } - b.writes("if (status) { goto suspend; }\n") - - } else if isThisMethod(g.tm, n, "init_huff", 4) { - b.printf("status = %s%s__init_huff(self,", - g.pkgPrefix, g.currFunk.astFunc.Receiver().Str(g.tm)) - for i, o := range n.Args() { - if i != 0 { - b.writes(",") - } - if err := g.writeExpr(b, o.Arg().Value(), replaceNothing, depth); err != nil { - return err - } - } - b.writes(");\n") - if err := g.writeLoadExprDerivedVars(b, n); err != nil { - return err - } - b.writes("if (status) { goto suspend; }\n") + return nil } else if isThatMethod(g.tm, n, g.tm.ByName("decode"), 2) || isThatMethod(g.tm, n, g.tm.ByName("decode"), 3) { @@ -794,6 +692,7 @@ func (g *gen) writeCallSuspendibles(b *buffer, n *a.Expr, depth uint32) error { return err } // TODO: check if tPrefix_temp is an error, and return? + return nil case "gif": // TODO: don't hard code being inside a try call. @@ -811,17 +710,23 @@ func (g *gen) writeCallSuspendibles(b *buffer, n *a.Expr, depth uint32) error { return err } // TODO: check if tPrefix_temp is an error, and return? + return nil default: return fmt.Errorf("cannot convert Wuffs call %q to C", n.Str(g.tm)) } - } else { - // TODO: fix this. - // - // This might involve calling g.writeExpr with replaceNothing?? - return fmt.Errorf("cannot convert Wuffs call %q to C", n.Str(g.tm)) } + + b.writes("status = ") + if err := g.writeExprUserDefinedCall(b, n, replaceNothing, depth); err != nil { + return err + } + b.writes(";\n") + if err := g.writeLoadExprDerivedVars(b, n); err != nil { + return err + } + b.writes("if (status) { goto suspend; }\n") return nil }