mirror of
https://github.com/ddidderr/wuffs.git
synced 2026-11-21 00:47:28 +01:00
Rename ast.Node methods from Foo to AsFoo
This commit is contained in:
1 parent
12773ce74a
commit
ccb78f5db7
21 files changed
+461
-458
No files matched your search
@@ -28,8 +28,8 @@ func (g *gen) writeBuiltinCall(b *buffer, n *a.Expr, rp replacementPolicy, depth
|
||||
if n.Operator() != t.IDOpenParen {
|
||||
return errNoSuchBuiltin
|
||||
}
|
||||
method := n.LHS().Expr()
|
||||
recv := method.LHS().Expr()
|
||||
method := n.LHS().AsExpr()
|
||||
recv := method.LHS().AsExpr()
|
||||
recvTyp := recv.MType()
|
||||
|
||||
switch recvTyp.Decorator() {
|
||||
@@ -44,7 +44,7 @@ func (g *gen) writeBuiltinCall(b *buffer, n *a.Expr, rp replacementPolicy, depth
|
||||
b.printf("wuffs_base__image_config__initialize(a_dst")
|
||||
for _, o := range n.Args() {
|
||||
b.writeb(',')
|
||||
if err := g.writeExpr(b, o.Arg().Value(), rp, depth); err != nil {
|
||||
if err := g.writeExpr(b, o.AsArg().Value(), rp, depth); err != nil {
|
||||
return err
|
||||
}
|
||||
}
|
||||
@@ -142,7 +142,7 @@ func (g *gen) writeBuiltinIOReader(b *buffer, recv *a.Expr, method t.ID, args []
|
||||
// call (to a static inline function) instead of a struct literal, to
|
||||
// avoid a "expression result unused" compiler error.
|
||||
b.writes("(ioptr_src += ")
|
||||
if err := g.writeExpr(b, args[1].Arg().Value(), rp, depth); err != nil {
|
||||
if err := g.writeExpr(b, args[1].AsArg().Value(), rp, depth); err != nil {
|
||||
return err
|
||||
}
|
||||
b.writes(", wuffs_base__return_empty_struct())")
|
||||
@@ -175,7 +175,7 @@ func (g *gen) writeBuiltinIOWriter(b *buffer, recv *a.Expr, method t.ID, args []
|
||||
bco, aPrefix)
|
||||
for _, o := range args {
|
||||
b.writeb(',')
|
||||
if err := g.writeExpr(b, o.Arg().Value(), rp, depth); err != nil {
|
||||
if err := g.writeExpr(b, o.AsArg().Value(), rp, depth); err != nil {
|
||||
return err
|
||||
}
|
||||
}
|
||||
@@ -224,7 +224,7 @@ func (g *gen) writeBuiltinNumType(b *buffer, recv *a.Expr, method t.ID, args []*
|
||||
return err
|
||||
}
|
||||
b.writes(") & ((1 << (")
|
||||
if err := g.writeExpr(b, args[0].Arg().Value(), rp, depth); err != nil {
|
||||
if err := g.writeExpr(b, args[0].AsArg().Value(), rp, depth); err != nil {
|
||||
return err
|
||||
}
|
||||
b.writes(")) - 1))")
|
||||
@@ -243,7 +243,7 @@ func (g *gen) writeBuiltinNumType(b *buffer, recv *a.Expr, method t.ID, args []*
|
||||
b.printf("%d", 8*sz)
|
||||
}
|
||||
b.writes(" - (")
|
||||
if err := g.writeExpr(b, args[0].Arg().Value(), rp, depth); err != nil {
|
||||
if err := g.writeExpr(b, args[0].AsArg().Value(), rp, depth); err != nil {
|
||||
return err
|
||||
}
|
||||
b.writes(")))")
|
||||
@@ -261,7 +261,7 @@ func (g *gen) writeBuiltinNumType(b *buffer, recv *a.Expr, method t.ID, args []*
|
||||
return err
|
||||
}
|
||||
b.writes(",")
|
||||
if err := g.writeExpr(b, args[0].Arg().Value(), rp, depth); err != nil {
|
||||
if err := g.writeExpr(b, args[0].AsArg().Value(), rp, depth); err != nil {
|
||||
return err
|
||||
}
|
||||
b.writes(")")
|
||||
@@ -279,7 +279,7 @@ func (g *gen) writeBuiltinNumType(b *buffer, recv *a.Expr, method t.ID, args []*
|
||||
return err
|
||||
}
|
||||
b.writes(",")
|
||||
if err := g.writeExpr(b, args[0].Arg().Value(), rp, depth); err != nil {
|
||||
if err := g.writeExpr(b, args[0].AsArg().Value(), rp, depth); err != nil {
|
||||
return err
|
||||
}
|
||||
b.writes(")")
|
||||
@@ -376,7 +376,7 @@ func (g *gen) writeArgs(b *buffer, args []*a.Node, rp replacementPolicy, depth u
|
||||
if i > 0 {
|
||||
b.writeb(',')
|
||||
}
|
||||
if err := g.writeExpr(b, o.Arg().Value(), rp, depth); err != nil {
|
||||
if err := g.writeExpr(b, o.AsArg().Value(), rp, depth); err != nil {
|
||||
return err
|
||||
}
|
||||
}
|
||||
@@ -389,8 +389,8 @@ func (g *gen) writeBuiltinCallSuspendibles(b *buffer, n *a.Expr, depth uint32) e
|
||||
if n.Operator() != t.IDOpenParen {
|
||||
return errNoSuchBuiltin
|
||||
}
|
||||
method := n.LHS().Expr()
|
||||
recv := method.LHS().Expr()
|
||||
method := n.LHS().AsExpr()
|
||||
recv := method.LHS().AsExpr()
|
||||
recvTyp := recv.MType()
|
||||
if !recvTyp.IsIOType() {
|
||||
return errNoSuchBuiltin
|
||||
@@ -459,7 +459,7 @@ func (g *gen) writeBuiltinCallSuspendibles(b *buffer, n *a.Expr, depth uint32) e
|
||||
cPrefix, g.currFunk.astFunc.FuncName().Str(g.tm))
|
||||
|
||||
b.printf("%s = ", scratchName)
|
||||
x := n.Args()[0].Arg().Value()
|
||||
x := n.Args()[0].AsArg().Value()
|
||||
if err := g.writeExpr(b, x, replaceCallSuspendibles, depth); err != nil {
|
||||
return err
|
||||
}
|
||||
@@ -488,7 +488,7 @@ func (g *gen) writeBuiltinCallSuspendibles(b *buffer, n *a.Expr, depth uint32) e
|
||||
}
|
||||
|
||||
b.printf("*ioptr_dst++ = ")
|
||||
x := n.Args()[0].Arg().Value()
|
||||
x := n.Args()[0].AsArg().Value()
|
||||
if err := g.writeExpr(b, x, replaceCallSuspendibles, depth); err != nil {
|
||||
return err
|
||||
}
|
||||
|
||||
@@ -283,7 +283,7 @@ func (g *gen) generate() ([]byte, error) {
|
||||
for _, file := range g.files {
|
||||
for _, tld := range file.TopLevelDecls() {
|
||||
if tld.Kind() == a.KStruct {
|
||||
unsortedStructs = append(unsortedStructs, tld.Struct())
|
||||
unsortedStructs = append(unsortedStructs, tld.AsStruct())
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -453,11 +453,11 @@ func (g *gen) forEachConst(b *buffer, v visibility, f func(*gen, *buffer, *a.Con
|
||||
for _, file := range g.files {
|
||||
for _, tld := range file.TopLevelDecls() {
|
||||
if tld.Kind() != a.KConst ||
|
||||
(v == pubOnly && tld.Raw().Flags()&a.FlagsPublic == 0) ||
|
||||
(v == priOnly && tld.Raw().Flags()&a.FlagsPublic != 0) {
|
||||
(v == pubOnly && tld.AsRaw().Flags()&a.FlagsPublic == 0) ||
|
||||
(v == priOnly && tld.AsRaw().Flags()&a.FlagsPublic != 0) {
|
||||
continue
|
||||
}
|
||||
if err := f(g, b, tld.Const()); err != nil {
|
||||
if err := f(g, b, tld.AsConst()); err != nil {
|
||||
return err
|
||||
}
|
||||
}
|
||||
@@ -469,11 +469,11 @@ func (g *gen) forEachFunc(b *buffer, v visibility, f func(*gen, *buffer, *a.Func
|
||||
for _, file := range g.files {
|
||||
for _, tld := range file.TopLevelDecls() {
|
||||
if tld.Kind() != a.KFunc ||
|
||||
(v == pubOnly && tld.Raw().Flags()&a.FlagsPublic == 0) ||
|
||||
(v == priOnly && tld.Raw().Flags()&a.FlagsPublic != 0) {
|
||||
(v == pubOnly && tld.AsRaw().Flags()&a.FlagsPublic == 0) ||
|
||||
(v == priOnly && tld.AsRaw().Flags()&a.FlagsPublic != 0) {
|
||||
continue
|
||||
}
|
||||
if err := f(g, b, tld.Func()); err != nil {
|
||||
if err := f(g, b, tld.AsFunc()); err != nil {
|
||||
return err
|
||||
}
|
||||
}
|
||||
@@ -485,11 +485,11 @@ func (g *gen) forEachStatus(b *buffer, v visibility, f func(*gen, *buffer, *a.St
|
||||
for _, file := range g.files {
|
||||
for _, tld := range file.TopLevelDecls() {
|
||||
if tld.Kind() != a.KStatus ||
|
||||
(v == pubOnly && tld.Raw().Flags()&a.FlagsPublic == 0) ||
|
||||
(v == priOnly && tld.Raw().Flags()&a.FlagsPublic != 0) {
|
||||
(v == pubOnly && tld.AsRaw().Flags()&a.FlagsPublic == 0) ||
|
||||
(v == priOnly && tld.AsRaw().Flags()&a.FlagsPublic != 0) {
|
||||
continue
|
||||
}
|
||||
if err := f(g, b, tld.Status()); err != nil {
|
||||
if err := f(g, b, tld.AsStatus()); err != nil {
|
||||
return err
|
||||
}
|
||||
}
|
||||
@@ -503,7 +503,7 @@ func (g *gen) forEachUse(b *buffer, f func(*gen, *buffer, *a.Use) error) error {
|
||||
if tld.Kind() != a.KUse {
|
||||
continue
|
||||
}
|
||||
if err := f(g, b, tld.Use()); err != nil {
|
||||
if err := f(g, b, tld.AsUse()); err != nil {
|
||||
return err
|
||||
}
|
||||
}
|
||||
@@ -606,7 +606,7 @@ func (g *gen) writeConstList(b *buffer, n *a.Expr) error {
|
||||
if n.Operator() == t.IDDollar {
|
||||
b.writeb('{')
|
||||
for _, o := range n.Args() {
|
||||
if err := g.writeConstList(b, o.Expr()); err != nil {
|
||||
if err := g.writeConstList(b, o.AsExpr()); err != nil {
|
||||
return err
|
||||
}
|
||||
b.writeb(',')
|
||||
@@ -643,7 +643,7 @@ func (g *gen) writeStruct(b *buffer, n *a.Struct) error {
|
||||
}
|
||||
|
||||
for _, o := range n.Fields() {
|
||||
o := o.Field()
|
||||
o := o.AsField()
|
||||
if err := g.writeCTypeName(b, o.XType(), fPrefix, o.Name().Str(g.tm)); err != nil {
|
||||
return err
|
||||
}
|
||||
@@ -657,7 +657,7 @@ func (g *gen) writeStruct(b *buffer, n *a.Struct) error {
|
||||
if tld.Kind() != a.KFunc {
|
||||
continue
|
||||
}
|
||||
o := tld.Func()
|
||||
o := tld.AsFunc()
|
||||
if o.Receiver() != n.QID() || !o.Suspendible() {
|
||||
continue
|
||||
}
|
||||
@@ -683,7 +683,7 @@ func (g *gen) writeStruct(b *buffer, n *a.Struct) error {
|
||||
}
|
||||
b.writes("} private_impl;\n\n")
|
||||
|
||||
if n.Node().Raw().Flags()&a.FlagsPublic != 0 {
|
||||
if n.AsNode().AsRaw().Flags()&a.FlagsPublic != 0 {
|
||||
if err := g.writeCppPrototypes(b, n); err != nil {
|
||||
return err
|
||||
}
|
||||
@@ -700,10 +700,10 @@ func (g *gen) writeCppPrototypes(b *buffer, n *a.Struct) error {
|
||||
structID := n.QID()[1]
|
||||
for _, file := range g.files {
|
||||
for _, tld := range file.TopLevelDecls() {
|
||||
if (tld.Kind() != a.KFunc) || (tld.Raw().Flags()&a.FlagsPublic == 0) {
|
||||
if (tld.Kind() != a.KFunc) || (tld.AsRaw().Flags()&a.FlagsPublic == 0) {
|
||||
continue
|
||||
}
|
||||
f := tld.Func()
|
||||
f := tld.AsFunc()
|
||||
qqid := f.QQID()
|
||||
if qqid[1] != structID {
|
||||
continue
|
||||
@@ -727,10 +727,10 @@ func (g *gen) writeCppImpls(b *buffer) error {
|
||||
|
||||
for _, file := range g.files {
|
||||
for _, tld := range file.TopLevelDecls() {
|
||||
if (tld.Kind() != a.KStruct) || (tld.Raw().Flags()&a.FlagsPublic == 0) {
|
||||
if (tld.Kind() != a.KStruct) || (tld.AsRaw().Flags()&a.FlagsPublic == 0) {
|
||||
continue
|
||||
}
|
||||
n := tld.Struct()
|
||||
n := tld.AsStruct()
|
||||
|
||||
structID := n.QID()[1]
|
||||
structName := structID.Str(g.tm)
|
||||
@@ -746,10 +746,10 @@ func (g *gen) writeCppImpls(b *buffer) error {
|
||||
|
||||
for _, file := range g.files {
|
||||
for _, tld := range file.TopLevelDecls() {
|
||||
if (tld.Kind() != a.KFunc) || (tld.Raw().Flags()&a.FlagsPublic == 0) {
|
||||
if (tld.Kind() != a.KFunc) || (tld.AsRaw().Flags()&a.FlagsPublic == 0) {
|
||||
continue
|
||||
}
|
||||
n := tld.Func()
|
||||
n := tld.AsFunc()
|
||||
if !publicStructs[n.QQID()[1]] {
|
||||
continue
|
||||
}
|
||||
@@ -763,7 +763,7 @@ func (g *gen) writeCppImpls(b *buffer) error {
|
||||
for _, o := range n.In().Fields() {
|
||||
b.writeb(',')
|
||||
b.writes(aPrefix)
|
||||
b.writes(o.Field().Name().Str(g.tm))
|
||||
b.writes(o.AsField().Name().Str(g.tm))
|
||||
}
|
||||
b.writes(");}\n\n")
|
||||
}
|
||||
@@ -880,7 +880,7 @@ func (g *gen) writeInitializerImpl(b *buffer, n *a.Struct) error {
|
||||
|
||||
// Call any ctors on sub-structs.
|
||||
for _, f := range n.Fields() {
|
||||
f := f.Field()
|
||||
f := f.AsField()
|
||||
x := f.XType()
|
||||
if x != x.Innermost() {
|
||||
// TODO: arrays of sub-structs.
|
||||
|
||||
@@ -89,9 +89,9 @@ func (g *gen) writeExprOther(b *buffer, n *a.Expr, rp replacementPolicy, depth u
|
||||
return err
|
||||
}
|
||||
|
||||
if n.LHS().Expr().Ident() == t.IDReset {
|
||||
method := n.LHS().Expr()
|
||||
recv := method.LHS().Expr()
|
||||
if n.LHS().AsExpr().Ident() == t.IDReset {
|
||||
method := n.LHS().AsExpr()
|
||||
recv := method.LHS().AsExpr()
|
||||
recvTyp, addr := recv.MType(), "&"
|
||||
if recvTyp.Decorator() == t.IDPtr {
|
||||
recvTyp, addr = recvTyp.Inner(), ""
|
||||
@@ -129,15 +129,15 @@ func (g *gen) writeExprOther(b *buffer, n *a.Expr, rp replacementPolicy, depth u
|
||||
|
||||
case t.IDOpenBracket:
|
||||
// n is an index.
|
||||
if err := g.writeExpr(b, n.LHS().Expr(), rp, depth); err != nil {
|
||||
if err := g.writeExpr(b, n.LHS().AsExpr(), rp, depth); err != nil {
|
||||
return err
|
||||
}
|
||||
if lTyp := n.LHS().Expr().MType(); lTyp.IsSliceType() {
|
||||
if lTyp := n.LHS().AsExpr().MType(); lTyp.IsSliceType() {
|
||||
// TODO: don't assume that the slice is a slice of base.u8.
|
||||
b.writes(".ptr")
|
||||
}
|
||||
b.writeb('[')
|
||||
if err := g.writeExpr(b, n.RHS().Expr(), rp, depth); err != nil {
|
||||
if err := g.writeExpr(b, n.RHS().AsExpr(), rp, depth); err != nil {
|
||||
return err
|
||||
}
|
||||
b.writeb(']')
|
||||
@@ -145,9 +145,9 @@ func (g *gen) writeExprOther(b *buffer, n *a.Expr, rp replacementPolicy, depth u
|
||||
|
||||
case t.IDColon:
|
||||
// n is a slice.
|
||||
lhs := n.LHS().Expr()
|
||||
mhs := n.MHS().Expr()
|
||||
rhs := n.RHS().Expr()
|
||||
lhs := n.LHS().AsExpr()
|
||||
mhs := n.MHS().AsExpr()
|
||||
rhs := n.RHS().AsExpr()
|
||||
switch {
|
||||
case mhs != nil && rhs == nil:
|
||||
b.writes("wuffs_base__slice_u8__subslice_i(")
|
||||
@@ -187,7 +187,7 @@ func (g *gen) writeExprOther(b *buffer, n *a.Expr, rp replacementPolicy, depth u
|
||||
return nil
|
||||
|
||||
case t.IDDot:
|
||||
lhs := n.LHS().Expr()
|
||||
lhs := n.LHS().AsExpr()
|
||||
if lhs.Ident() == t.IDIn {
|
||||
b.writes(aPrefix)
|
||||
b.writes(n.Ident().Str(g.tm))
|
||||
@@ -230,7 +230,7 @@ func (g *gen) writeExprUnaryOp(b *buffer, n *a.Expr, rp replacementPolicy, depth
|
||||
}
|
||||
|
||||
b.writes(opName)
|
||||
return g.writeExpr(b, n.RHS().Expr(), rp, depth)
|
||||
return g.writeExpr(b, n.RHS().AsExpr(), rp, depth)
|
||||
}
|
||||
|
||||
func (g *gen) writeExprBinaryOp(b *buffer, n *a.Expr, rp replacementPolicy, depth uint32) error {
|
||||
@@ -251,7 +251,7 @@ func (g *gen) writeExprBinaryOp(b *buffer, n *a.Expr, rp replacementPolicy, dept
|
||||
opName = ","
|
||||
|
||||
case t.IDXBinaryAs:
|
||||
return g.writeExprAs(b, n.LHS().Expr(), n.RHS().TypeExpr(), rp, depth)
|
||||
return g.writeExprAs(b, n.LHS().AsExpr(), n.RHS().AsTypeExpr(), rp, depth)
|
||||
|
||||
default:
|
||||
opName = cOpName(op)
|
||||
@@ -261,11 +261,11 @@ func (g *gen) writeExprBinaryOp(b *buffer, n *a.Expr, rp replacementPolicy, dept
|
||||
}
|
||||
|
||||
b.writeb('(')
|
||||
if err := g.writeExpr(b, n.LHS().Expr(), rp, depth); err != nil {
|
||||
if err := g.writeExpr(b, n.LHS().AsExpr(), rp, depth); err != nil {
|
||||
return err
|
||||
}
|
||||
b.writes(opName)
|
||||
if err := g.writeExpr(b, n.RHS().Expr(), rp, depth); err != nil {
|
||||
if err := g.writeExpr(b, n.RHS().AsExpr(), rp, depth); err != nil {
|
||||
return err
|
||||
}
|
||||
b.writeb(')')
|
||||
@@ -299,7 +299,7 @@ func (g *gen) writeExprAssociativeOp(b *buffer, n *a.Expr, rp replacementPolicy,
|
||||
if i != 0 {
|
||||
b.writes(opName)
|
||||
}
|
||||
if err := g.writeExpr(b, o.Expr(), rp, depth); err != nil {
|
||||
if err := g.writeExpr(b, o.AsExpr(), rp, depth); err != nil {
|
||||
return err
|
||||
}
|
||||
}
|
||||
@@ -308,8 +308,8 @@ func (g *gen) writeExprAssociativeOp(b *buffer, n *a.Expr, rp replacementPolicy,
|
||||
}
|
||||
|
||||
func (g *gen) writeExprUserDefinedCall(b *buffer, n *a.Expr, rp replacementPolicy, depth uint32) error {
|
||||
method := n.LHS().Expr()
|
||||
recv := method.LHS().Expr()
|
||||
method := n.LHS().AsExpr()
|
||||
recv := method.LHS().AsExpr()
|
||||
recvTyp, addr := recv.MType(), "&"
|
||||
if recvTyp.Decorator() == t.IDPtr {
|
||||
recvTyp, addr = recvTyp.Inner(), ""
|
||||
|
||||
@@ -90,7 +90,7 @@ func (g *gen) writeFuncSignature(b *buffer, n *a.Func, cpp uint32) error {
|
||||
b.writes("void ")
|
||||
} else if len(outFields) == 1 {
|
||||
// TODO: does this generate the right C if the XType is an array?
|
||||
if err := g.writeCTypeName(b, outFields[0].Field().XType(), "", ""); err != nil {
|
||||
if err := g.writeCTypeName(b, outFields[0].AsField().XType(), "", ""); err != nil {
|
||||
return err
|
||||
}
|
||||
} else {
|
||||
@@ -123,7 +123,7 @@ func (g *gen) writeFuncSignature(b *buffer, n *a.Func, cpp uint32) error {
|
||||
b.writeb(',')
|
||||
}
|
||||
comma = true
|
||||
o := o.Field()
|
||||
o := o.AsField()
|
||||
if err := g.writeCTypeName(b, o.XType(), aPrefix, o.Name().Str(g.tm)); err != nil {
|
||||
return err
|
||||
}
|
||||
@@ -200,7 +200,7 @@ func (g *gen) writeOutFieldsZeroValue(b *buffer, outFields []*a.Node) error {
|
||||
case 0:
|
||||
// No-op.
|
||||
case 1:
|
||||
if typ := outFields[0].Field().XType(); typ.IsNumType() {
|
||||
if typ := outFields[0].AsField().XType(); typ.IsNumType() {
|
||||
b.writes("0")
|
||||
} else {
|
||||
b.writes("((")
|
||||
@@ -262,7 +262,7 @@ func (g *gen) writeFuncImplHeader(b *buffer) error {
|
||||
if g.currFunk.suspendible {
|
||||
g.findDerivedVars()
|
||||
for _, o := range g.currFunk.astFunc.In().Fields() {
|
||||
o := o.Field()
|
||||
o := o.AsField()
|
||||
if err := g.writeLoadDerivedVar(b, "", o.Name(), o.XType(), true); err != nil {
|
||||
return err
|
||||
}
|
||||
@@ -331,7 +331,7 @@ func (g *gen) writeFuncImplFooter(b *buffer) error {
|
||||
b.writes("goto exit;exit:") // The goto avoids the "unused label" warning.
|
||||
|
||||
for _, o := range g.currFunk.astFunc.In().Fields() {
|
||||
o := o.Field()
|
||||
o := o.AsField()
|
||||
if err := g.writeSaveDerivedVar(b, "", o.Name(), o.XType()); err != nil {
|
||||
return err
|
||||
}
|
||||
@@ -363,7 +363,7 @@ func (g *gen) writeFuncImplArgChecks(b *buffer, n *a.Func) error {
|
||||
checks := []string(nil)
|
||||
|
||||
for _, o := range n.In().Fields() {
|
||||
o := o.Field()
|
||||
o := o.AsField()
|
||||
oTyp := o.XType()
|
||||
if oTyp.Decorator() != t.IDPtr && !oTyp.IsRefined() {
|
||||
// TODO: Also check elements, for array-typed arguments.
|
||||
|
||||
@@ -43,10 +43,10 @@ func (g *gen) writeStatement(b *buffer, n *a.Node, depth uint32) error {
|
||||
mightIntroduceTemporaries := false
|
||||
switch n.Kind() {
|
||||
case a.KAssign:
|
||||
n := n.Assign()
|
||||
n := n.AsAssign()
|
||||
mightIntroduceTemporaries = n.LHS().Suspendible() || n.RHS().Suspendible()
|
||||
case a.KVar:
|
||||
v := n.Var().Value()
|
||||
v := n.AsVar().Value()
|
||||
mightIntroduceTemporaries = v != nil && v.Suspendible()
|
||||
}
|
||||
if mightIntroduceTemporaries {
|
||||
@@ -59,7 +59,7 @@ func (g *gen) writeStatement(b *buffer, n *a.Node, depth uint32) error {
|
||||
}
|
||||
|
||||
if genFilenameLineComments {
|
||||
filename, line := n.Raw().FilenameLine()
|
||||
filename, line := n.AsRaw().FilenameLine()
|
||||
if i := strings.LastIndexByte(filename, '/'); i >= 0 {
|
||||
filename = filename[i+1:]
|
||||
}
|
||||
@@ -71,23 +71,23 @@ func (g *gen) writeStatement(b *buffer, n *a.Node, depth uint32) error {
|
||||
|
||||
switch n.Kind() {
|
||||
case a.KAssign:
|
||||
return g.writeStatementAssign(b, n.Assign(), depth)
|
||||
return g.writeStatementAssign(b, n.AsAssign(), depth)
|
||||
case a.KExpr:
|
||||
return g.writeStatementExpr(b, n.Expr(), depth)
|
||||
return g.writeStatementExpr(b, n.AsExpr(), depth)
|
||||
case a.KIOBind:
|
||||
return g.writeStatementIOBind(b, n.IOBind(), depth)
|
||||
return g.writeStatementIOBind(b, n.AsIOBind(), depth)
|
||||
case a.KIf:
|
||||
return g.writeStatementIf(b, n.If(), depth)
|
||||
return g.writeStatementIf(b, n.AsIf(), depth)
|
||||
case a.KIterate:
|
||||
return g.writeStatementIterate(b, n.Iterate(), depth)
|
||||
return g.writeStatementIterate(b, n.AsIterate(), depth)
|
||||
case a.KJump:
|
||||
return g.writeStatementJump(b, n.Jump(), depth)
|
||||
return g.writeStatementJump(b, n.AsJump(), depth)
|
||||
case a.KRet:
|
||||
return g.writeStatementRet(b, n.Ret(), depth)
|
||||
return g.writeStatementRet(b, n.AsRet(), depth)
|
||||
case a.KVar:
|
||||
return g.writeStatementVar(b, n.Var(), depth)
|
||||
return g.writeStatementVar(b, n.AsVar(), depth)
|
||||
case a.KWhile:
|
||||
return g.writeStatementWhile(b, n.While(), depth)
|
||||
return g.writeStatementWhile(b, n.AsWhile(), depth)
|
||||
}
|
||||
return fmt.Errorf("unrecognized ast.Kind (%s) for writeStatement", n.Kind())
|
||||
}
|
||||
@@ -164,7 +164,7 @@ func (g *gen) writeStatementIOBind(b *buffer, n *a.IOBind, depth uint32) error {
|
||||
// switch can jump past this initialization??
|
||||
b.writes("{\n")
|
||||
for i := 0; i < len(inFields); i++ {
|
||||
e := inFields[i].Expr()
|
||||
e := inFields[i].AsExpr()
|
||||
prefix := vPrefix
|
||||
if e.Operator() != 0 {
|
||||
prefix = aPrefix
|
||||
@@ -195,7 +195,7 @@ func (g *gen) writeStatementIOBind(b *buffer, n *a.IOBind, depth uint32) error {
|
||||
}
|
||||
|
||||
for i := len(inFields) - 1; i >= 0; i-- {
|
||||
e := inFields[i].Expr()
|
||||
e := inFields[i].AsExpr()
|
||||
prefix := vPrefix
|
||||
if e.Operator() != 0 {
|
||||
prefix = aPrefix
|
||||
@@ -273,7 +273,7 @@ func (g *gen) writeStatementIterate(b *buffer, n *a.Iterate, depth uint32) error
|
||||
if len(vars) != 1 {
|
||||
return fmt.Errorf("TODO: iterate over more than one variable")
|
||||
}
|
||||
v := vars[0].Var()
|
||||
v := vars[0].AsVar()
|
||||
name := v.Name().Str(g.tm)
|
||||
b.writes("{\n")
|
||||
|
||||
@@ -515,16 +515,16 @@ func (g *gen) mightActuallySuspend(n *a.Expr, depth uint32) error {
|
||||
// The evaluation order for suspendible calls (which can have side effects)
|
||||
// is important here: LHS, MHS, RHS, Args and finally the node itself.
|
||||
if !n.CallSuspendible() {
|
||||
for _, o := range n.Node().Raw().SubNodes() {
|
||||
for _, o := range n.AsNode().AsRaw().SubNodes() {
|
||||
if o != nil && o.Kind() == a.KExpr {
|
||||
if err := g.mightActuallySuspend(o.Expr(), depth); err != nil {
|
||||
if err := g.mightActuallySuspend(o.AsExpr(), depth); err != nil {
|
||||
return err
|
||||
}
|
||||
}
|
||||
}
|
||||
for _, o := range n.Args() {
|
||||
if o != nil && o.Kind() == a.KExpr {
|
||||
if err := g.mightActuallySuspend(o.Expr(), depth); err != nil {
|
||||
if err := g.mightActuallySuspend(o.AsExpr(), depth); err != nil {
|
||||
return err
|
||||
}
|
||||
}
|
||||
@@ -547,16 +547,16 @@ func (g *gen) writeCallSuspendibles(b *buffer, n *a.Expr, depth uint32) error {
|
||||
// The evaluation order for suspendible calls (which can have side effects)
|
||||
// is important here: LHS, MHS, RHS, Args and finally the node itself.
|
||||
if !n.CallSuspendible() {
|
||||
for _, o := range n.Node().Raw().SubNodes() {
|
||||
for _, o := range n.AsNode().AsRaw().SubNodes() {
|
||||
if o != nil && o.Kind() == a.KExpr {
|
||||
if err := g.writeCallSuspendibles(b, o.Expr(), depth); err != nil {
|
||||
if err := g.writeCallSuspendibles(b, o.AsExpr(), depth); err != nil {
|
||||
return err
|
||||
}
|
||||
}
|
||||
}
|
||||
for _, o := range n.Args() {
|
||||
if o != nil && o.Kind() == a.KExpr {
|
||||
if err := g.writeCallSuspendibles(b, o.Expr(), depth); err != nil {
|
||||
if err := g.writeCallSuspendibles(b, o.AsExpr(), depth); err != nil {
|
||||
return err
|
||||
}
|
||||
}
|
||||
|
||||
@@ -31,19 +31,19 @@ func (g *gen) needDerivedVar(name t.ID) bool {
|
||||
if p.Kind() != a.KExpr {
|
||||
return nil
|
||||
}
|
||||
q := p.Expr()
|
||||
q := p.AsExpr()
|
||||
if q.Operator() != t.IDOpenParen {
|
||||
return nil
|
||||
}
|
||||
q = q.LHS().Expr()
|
||||
q = q.LHS().AsExpr()
|
||||
if q.Operator() != t.IDDot {
|
||||
return nil
|
||||
}
|
||||
q = q.LHS().Expr()
|
||||
q = q.LHS().AsExpr()
|
||||
if q.Operator() != t.IDDot || q.Ident() != name {
|
||||
return nil
|
||||
}
|
||||
q = q.LHS().Expr()
|
||||
q = q.LHS().AsExpr()
|
||||
if q.Operator() != 0 || q.Ident() != t.IDIn {
|
||||
return nil
|
||||
}
|
||||
@@ -58,7 +58,7 @@ func (g *gen) needDerivedVar(name t.ID) bool {
|
||||
|
||||
func (g *gen) findDerivedVars() {
|
||||
for _, o := range g.currFunk.astFunc.In().Fields() {
|
||||
o := o.Field()
|
||||
o := o.AsField()
|
||||
oTyp := o.XType()
|
||||
if oTyp.Decorator() != 0 {
|
||||
continue
|
||||
@@ -182,7 +182,7 @@ func (g *gen) writeLoadExprDerivedVars(b *buffer, n *a.Expr) error {
|
||||
return nil
|
||||
}
|
||||
for _, o := range n.Args() {
|
||||
o := o.Arg()
|
||||
o := o.AsArg()
|
||||
// TODO: don't hard-code these.
|
||||
hack := ""
|
||||
if s := o.Value().Str(g.tm); s != "in.dst" && s != "in.src" && s != "w" {
|
||||
@@ -205,7 +205,7 @@ func (g *gen) writeSaveExprDerivedVars(b *buffer, n *a.Expr) error {
|
||||
return nil
|
||||
}
|
||||
for _, o := range n.Args() {
|
||||
o := o.Arg()
|
||||
o := o.AsArg()
|
||||
// TODO: don't hard-code these.
|
||||
hack := ""
|
||||
if s := o.Value().Str(g.tm); s != "in.dst" && s != "in.src" && s != "w" {
|
||||
@@ -229,7 +229,7 @@ func (g *gen) visitVars(b *buffer, block []*a.Node, depth uint32, f func(*gen, *
|
||||
for _, o := range block {
|
||||
switch o.Kind() {
|
||||
case a.KIf:
|
||||
for o := o.If(); o != nil; o = o.ElseIf() {
|
||||
for o := o.AsIf(); o != nil; o = o.ElseIf() {
|
||||
if err := g.visitVars(b, o.BodyIfTrue(), depth, f); err != nil {
|
||||
return err
|
||||
}
|
||||
@@ -239,25 +239,25 @@ func (g *gen) visitVars(b *buffer, block []*a.Node, depth uint32, f func(*gen, *
|
||||
}
|
||||
|
||||
case a.KIOBind:
|
||||
if err := g.visitVars(b, o.IOBind().Body(), depth, f); err != nil {
|
||||
if err := g.visitVars(b, o.AsIOBind().Body(), depth, f); err != nil {
|
||||
return err
|
||||
}
|
||||
|
||||
case a.KIterate:
|
||||
if err := g.visitVars(b, o.Iterate().Variables(), depth, f); err != nil {
|
||||
if err := g.visitVars(b, o.AsIterate().Variables(), depth, f); err != nil {
|
||||
return err
|
||||
}
|
||||
if err := g.visitVars(b, o.Iterate().Body(), depth, f); err != nil {
|
||||
if err := g.visitVars(b, o.AsIterate().Body(), depth, f); err != nil {
|
||||
return err
|
||||
}
|
||||
|
||||
case a.KVar:
|
||||
if err := f(g, b, o.Var()); err != nil {
|
||||
if err := f(g, b, o.AsVar()); err != nil {
|
||||
return err
|
||||
}
|
||||
|
||||
case a.KWhile:
|
||||
if err := g.visitVars(b, o.While().Body(), depth, f); err != nil {
|
||||
if err := g.visitVars(b, o.AsWhile().Body(), depth, f); err != nil {
|
||||
return err
|
||||
}
|
||||
}
|
||||
|
||||
+7
-7
@@ -213,7 +213,7 @@ func (h *genHelper) genDirDependencies(qualifiedFilenames []string) error {
|
||||
if n.Kind() != a.KUse {
|
||||
continue
|
||||
}
|
||||
useDirname := h.tm.ByID(n.Use().Path())
|
||||
useDirname := h.tm.ByID(n.AsUse().Path())
|
||||
useDirname, _ = t.Unescape(useDirname)
|
||||
if err := h.gen(useDirname, false); err != nil {
|
||||
return err
|
||||
@@ -241,7 +241,7 @@ func (h *genHelper) genWuffs(dirname string, qualifiedFilenames []string) error
|
||||
for _, f := range files {
|
||||
for _, n := range f.TopLevelDecls() {
|
||||
if n.Kind() == a.KPackageID {
|
||||
pkgIDNode = n.PackageID()
|
||||
pkgIDNode = n.AsPackageID()
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -261,14 +261,14 @@ func (h *genHelper) genWuffs(dirname string, qualifiedFilenames []string) error
|
||||
for _, n := range f.TopLevelDecls() {
|
||||
switch n.Kind() {
|
||||
case a.KConst:
|
||||
n := n.Const()
|
||||
n := n.AsConst()
|
||||
if !n.Public() {
|
||||
continue
|
||||
}
|
||||
return fmt.Errorf("TODO: genWuffs for consts")
|
||||
|
||||
case a.KFunc:
|
||||
n := n.Func()
|
||||
n := n.AsFunc()
|
||||
if !n.Public() {
|
||||
continue
|
||||
}
|
||||
@@ -288,7 +288,7 @@ func (h *genHelper) genWuffs(dirname string, qualifiedFilenames []string) error
|
||||
fmt.Fprintf(out, ")(")
|
||||
}
|
||||
for j, field := range param.Fields() {
|
||||
field := field.Field()
|
||||
field := field.AsField()
|
||||
if j > 0 {
|
||||
fmt.Fprintf(out, ", ")
|
||||
}
|
||||
@@ -300,7 +300,7 @@ func (h *genHelper) genWuffs(dirname string, qualifiedFilenames []string) error
|
||||
fmt.Fprintf(out, ") { }\n")
|
||||
|
||||
case a.KStatus:
|
||||
n := n.Status()
|
||||
n := n.AsStatus()
|
||||
if !n.Public() {
|
||||
continue
|
||||
}
|
||||
@@ -308,7 +308,7 @@ func (h *genHelper) genWuffs(dirname string, qualifiedFilenames []string) error
|
||||
n.Keyword().Str(&h.tm), n.Value().Str(&h.tm), n.QID().Str(&h.tm))
|
||||
|
||||
case a.KStruct:
|
||||
n := n.Struct()
|
||||
n := n.AsStruct()
|
||||
if !n.Public() {
|
||||
continue
|
||||
}
|
||||
|
||||
Reference in new issue
Block a user