Add a writer1.slice method.

This commit is contained in:
Nigel Tao committed 2017-09-22 11:54:24 +10:00
1 parent 519ec373f2
commit 18e32d61e5
10 files changed
+115 -24

No files matched your search

+10
View File
@@ -134,6 +134,16 @@ func (g *gen) writeExprOther(b *buffer, n *a.Expr, rp replacementPolicy, pp pare
}
return nil
}
if isInDst(g.tm, n, t.KeySlice, 0) {
if pp == parenthesesMandatory {
b.writeb('(')
}
b.writes("(puffs_base_slice_u8){.ptr= a_dst.buf->ptr, .len=b_wptr_dst - a_dst.buf->ptr}")
if pp == parenthesesMandatory {
b.writeb(')')
}
return nil
}
// TODO.
case t.KeyOpenBracket:
+11 -12
View File
@@ -183,27 +183,25 @@ func (g *gen) writeStatement(b *buffer, n *a.Node, depth uint32) error {
name := n.Name().String(g.tm)
b.printf("memset(%s%s, 0, sizeof(%s%s));\n", vPrefix, name, vPrefix, name)
case t.KeyColon:
if n.Value() != nil {
return fmt.Errorf("TODO: slice initializers for non-zero default values")
}
// TODO: don't assume that the slice is a slice of u8.
b.printf("%s%s = ((puffs_base_slice_u8){});", vPrefix, n.Name().String(g.tm))
// TODO: remove this.
b.printf("\n/* Avoid the \"unused variable\" warning. */\n")
b.printf("if (%s%s.ptr) {}\n", vPrefix, n.Name().String(g.tm))
default:
b.printf("%s%s = ", vPrefix, n.Name().String(g.tm))
if v := n.Value(); v != nil {
if err := g.writeExpr(b, v, replaceCallSuspendibles, parenthesesMandatory, 0); err != nil {
return err
}
} else if n.XType().Decorator().Key() == t.KeyColon {
// TODO: don't assume that the slice is a slice of u8.
b.printf("((puffs_base_slice_u8){})")
} else {
b.writeb('0')
}
b.writes(";\n")
// TODO: remove this.
if n.XType().Decorator().Key() == t.KeyColon {
b.printf("\n/* Avoid the \"unused variable\" warning. */\n")
b.printf("if (%s%s.ptr) {}\n", vPrefix, n.Name().String(g.tm))
}
}
return nil
@@ -718,8 +716,9 @@ func isInSrc(tm *t.Map, n *a.Expr, methodName t.Key, nArgs int) bool {
}
func isInDst(tm *t.Map, n *a.Expr, methodName t.Key, nArgs int) bool {
callSuspendible := methodName != t.KeySlice
// TODO: check that n.Args() is "(x:bar)".
if n.ID0().Key() != t.KeyOpenParen || !n.CallSuspendible() || len(n.Args()) != nArgs {
if n.ID0().Key() != t.KeyOpenParen || n.CallSuspendible() != callSuspendible || len(n.Args()) != nArgs {
return false
}
n = n.LHS().Expr()
+14 -4
View File
@@ -148,19 +148,26 @@ func (g *gen) writeSaveDerivedVar(b *buffer, name t.ID, typ *a.TypeExpr) error {
b.printf("if (lim->ptr_to_len) { *lim->ptr_to_len -= n; }")
b.printf("}")
// Not all writer1 methods use the wend variable.
b.printf("\n/* Avoid the \"unused variable\" warning. */\n")
b.printf("(void)(%swend_%s);", bPrefix, nameStr)
b.printf("}\n")
}
return nil
}
func (g *gen) writeLoadExprDerivedVars(b *buffer, n *a.Expr) error {
if g.currFunk.derivedVars == nil || n.ID0().Key() != t.KeyOpenParen {
if g.currFunk.derivedVars == nil {
return nil
}
if k := n.ID0().Key(); k != t.KeyOpenParen && k != t.KeyTry {
return nil
}
for _, o := range n.Args() {
o := o.Arg()
// TODO: don't hard-code these.
if s := o.Value().String(g.tm); s != "in.src" && s != "lzw_src" {
if s := o.Value().String(g.tm); s != "in.dst" && s != "in.src" && s != "lzw_src" {
continue
}
if err := g.writeLoadDerivedVar(b, o.Name(), o.Value().MType(), false); err != nil {
@@ -171,13 +178,16 @@ func (g *gen) writeLoadExprDerivedVars(b *buffer, n *a.Expr) error {
}
func (g *gen) writeSaveExprDerivedVars(b *buffer, n *a.Expr) error {
if g.currFunk.derivedVars == nil || n.ID0().Key() != t.KeyOpenParen {
if g.currFunk.derivedVars == nil {
return nil
}
if k := n.ID0().Key(); k != t.KeyOpenParen && k != t.KeyTry {
return nil
}
for _, o := range n.Args() {
o := o.Arg()
// TODO: don't hard-code these.
if s := o.Value().String(g.tm); s != "in.src" && s != "lzw_src" {
if s := o.Value().String(g.tm); s != "in.dst" && s != "in.src" && s != "lzw_src" {
continue
}
if err := g.writeSaveDerivedVar(b, o.Name(), o.Value().MType()); err != nil {