Prepare array and slice tokens

This commit is contained in:
Nigel Tao committed 2018-04-05 21:51:38 +10:00
1 parent 97aab37462
commit 2b91e7861c
12 files changed
+81 -68

No files matched your search

+3 -3
View File
@@ -409,7 +409,7 @@ func (g *gen) writeExprOther(b *buffer, n *a.Expr, rp replacementPolicy, pp pare
b.writes("wuffs_base__slice_u8__subslice_ij(")
}
lhsIsArray := lhs.MType().Decorator().Key() == t.KeyOpenBracket
lhsIsArray := lhs.MType().IsArrayType()
if lhsIsArray {
// TODO: don't assume that the slice is a slice of u8.
b.writes("((wuffs_base__slice_u8){.ptr=")
@@ -556,7 +556,7 @@ func (g *gen) writeCTypeName(b *buffer, n *a.TypeExpr, varNamePrefix string, var
const maxNumPointers = 16
x := n
for ; x != nil && x.Decorator().Key() == t.KeyOpenBracket; x = x.Inner() {
for ; x != nil && x.IsArrayType(); x = x.Inner() {
}
numPointers, innermost := 0, x
@@ -617,7 +617,7 @@ func (g *gen) writeCTypeName(b *buffer, n *a.TypeExpr, varNamePrefix string, var
b.writes(varName)
x = n
for ; x != nil && x.Decorator().Key() == t.KeyOpenBracket; x = x.Inner() {
for ; x != nil && x.IsArrayType(); x = x.Inner() {
b.writeb('[')
b.writes(x.ArrayLength().ConstValue().String())
b.writeb(']')
+1 -1
View File
@@ -275,7 +275,7 @@ func (g *gen) writeStatement(b *buffer, n *a.Node, depth uint32) error {
return err
}
}
if n.XType().Decorator().Key() == t.KeyOpenBracket {
if n.XType().IsArrayType() {
if n.Value() != nil {
// TODO: something like:
// cv := n.XType().ArrayLength().ConstValue()
+2 -2
View File
@@ -312,7 +312,7 @@ func (g *gen) writeResumeSuspend1(b *buffer, n *a.Var, suspend bool, initBoolTyp
rhs = cTypeNames[key]
}
}
case t.KeyColon:
case t.KeySlice:
// TODO: don't assume that the slice is a slice of u8.
rhs = "wuffs_base__slice_u8"
}
@@ -362,7 +362,7 @@ func (g *gen) writeResumeSuspend1(b *buffer, n *a.Var, suspend bool, initBoolTyp
case 0:
b.printf("%s = %s;\n", lhs, rhs)
return nil
case t.KeyOpenBracket:
case t.KeyArray:
inner := typ.Inner()
if inner.Decorator() != 0 {
break