diff --git a/internal/cgen/expr.go b/internal/cgen/expr.go index 562ebca5..b4d08e72 100644 --- a/internal/cgen/expr.go +++ b/internal/cgen/expr.go @@ -531,17 +531,24 @@ func (g *gen) writeCTypeName(b *buffer, n *a.TypeExpr, varNamePrefix string, var for ; x != nil && x.IsEitherArrayType(); x = x.Inner() { } - numPointers, innermost := 0, x - for ; innermost != nil && innermost.Inner() != nil; innermost = innermost.Inner() { - if p := innermost.Decorator(); p == t.IDNptr || p == t.IDPtr { - if numPointers == maxNumPointers { - return fmt.Errorf("cannot convert Wuffs type %q to C: too many ptr's", n.Str(g.tm)) + numPointers, innermost, isPointerToArray := 0, x, false + if x.IsPointerType() && x.Inner().IsEitherArrayType() && x.Inner().IsBulkNumType() { + isPointerToArray = true + innermost = x.Inner() + for ; innermost != nil && innermost.Inner() != nil; innermost = innermost.Inner() { + } + } else { + for ; innermost != nil && innermost.Inner() != nil; innermost = innermost.Inner() { + if innermost.IsPointerType() { + if numPointers == maxNumPointers { + return fmt.Errorf("cannot convert Wuffs type %q to C: too many ptr's", n.Str(g.tm)) + } + numPointers++ + continue } - numPointers++ - continue + // TODO: fix this. + return fmt.Errorf("cannot convert Wuffs type %q to C", n.Str(g.tm)) } - // TODO: fix this. - return fmt.Errorf("cannot convert Wuffs type %q to C", n.Str(g.tm)) } fallback := true @@ -558,8 +565,12 @@ func (g *gen) writeCTypeName(b *buffer, n *a.TypeExpr, varNamePrefix string, var b.printf("%s%s", g.packagePrefix(qid), qid[1].Str(g.tm)) } - for i := 0; i < numPointers; i++ { - b.writeb('*') + if isPointerToArray { + b.writes("(*") + } else { + for i := 0; i < numPointers; i++ { + b.writeb('*') + } } if varNamePrefix != "" { @@ -569,6 +580,10 @@ func (g *gen) writeCTypeName(b *buffer, n *a.TypeExpr, varNamePrefix string, var } x = n + if isPointerToArray { + b.writes(")") + x = x.Inner().Inner() + } for ; x != nil && x.IsEitherArrayType(); x = x.Inner() { b.writeb('[') b.writes(x.ArrayLength().ConstValue().String()) diff --git a/internal/cgen/var.go b/internal/cgen/var.go index 9c6c3ad8..bce8c62f 100644 --- a/internal/cgen/var.go +++ b/internal/cgen/var.go @@ -358,7 +358,14 @@ func (g *gen) writeVars(b *buffer, f *funk, inStructDecl bool) error { } else if typ.Eq(typeExprARMCRC32U32) { b.writes(" = 0;\n") } else { - b.writes(" = {0};\n") + switch typ.Decorator() { + case t.IDNptr: + b.writes(" = NULL;\n") + case t.IDPtr: + return fmt.Errorf("cannot zero-initialize a non-nullable ptr") + default: + b.writes(" = {0};\n") + } } if typ.IsIOType() { diff --git a/lang/ast/ast.go b/lang/ast/ast.go index 1f3b8c31..2c270ea1 100644 --- a/lang/ast/ast.go +++ b/lang/ast/ast.go @@ -860,7 +860,7 @@ func (n *TypeExpr) BulkSize() *big.Int { } func (n *TypeExpr) IsBulkNumType() bool { - for ; n.id0 == t.IDArray; n = n.rhs.AsTypeExpr() { + for ; (n.id0 == t.IDArray) || (n.id0 == t.IDRoarray); n = n.rhs.AsTypeExpr() { } return n.id0 == 0 && n.id1 == t.IDBase && n.id2.IsNumType() } diff --git a/lang/ast/eq.go b/lang/ast/eq.go index 03e8c457..8a52ae53 100644 --- a/lang/ast/eq.go +++ b/lang/ast/eq.go @@ -95,7 +95,8 @@ func (n *TypeExpr) EqIgnoringRefinements(o *TypeExpr) bool { // EqIgnoringRefinementsLHSReadOnly returns whether n and o are equal, ignoring // the "[i:j]" in "base.u32[i:j]" and allowing n (the Left Hand Side of an -// assignment) to be read-only when o (the Right Hand Side) is read-write. +// assignment) to be read-only when o (the Right Hand Side) is read-write, or n +// to be "nptr T" when o is "ptr T". func (n *TypeExpr) EqIgnoringRefinementsLHSReadOnly(o *TypeExpr) bool { return n.eq(o, true, true) } @@ -118,6 +119,7 @@ func (n *TypeExpr) eq(o *TypeExpr, ignoreRefinements bool, lhsReadOnly bool) boo case (n.id0 == t.IDRoarray) && (o.id0 == t.IDArray): case (n.id0 == t.IDRoslice) && (o.id0 == t.IDSlice): case (n.id0 == t.IDRotable) && (o.id0 == t.IDTable): + case (n.id0 == t.IDNptr) && (o.id0 == t.IDPtr): } } if n.id1 != o.id1 || n.id2 != o.id2 { diff --git a/lang/check/assert.go b/lang/check/assert.go index 675f701a..c3680bc6 100644 --- a/lang/check/assert.go +++ b/lang/check/assert.go @@ -367,3 +367,18 @@ func proveReasonRequirementForRHSLength(q *checker, op t.ID, lhs *a.Expr, rhs *a } return nil } + +func (q *checker) proveRecvNotEqNullptr(recv *a.Expr) error { + for _, x := range q.facts { + if x.Operator() != t.IDXBinaryNotEq { + continue + } + xLHS := x.LHS().AsExpr() + xRHS := x.RHS().AsExpr() + if (xLHS.Eq(exprNullptr) && xRHS.Eq(recv)) || + (xRHS.Eq(exprNullptr) && xLHS.Eq(recv)) { + return nil + } + } + return fmt.Errorf("check: cannot prove %q", recv.Str(q.tm)+" <> nullptr") +} diff --git a/lang/check/bounds.go b/lang/check/bounds.go index f0c2feb5..35f9582e 100644 --- a/lang/check/bounds.go +++ b/lang/check/bounds.go @@ -507,7 +507,10 @@ func (q *checker) bcheckAssignment(lhs *a.Expr, op t.ID, rhs *a.Expr) error { return err } - if lhs.MType().IsNumType() && rhs.Effect().Pure() { + if !rhs.Effect().Pure() { + // No-op. + + } else if lhs.MType().IsNumType() { q.facts.appendBinaryOpFact(t.IDXBinaryEqEq, lhs, rhs) if rhs.Operator() == a.ExprOperatorCall { @@ -520,6 +523,16 @@ func (q *checker) bcheckAssignment(lhs *a.Expr, op t.ID, rhs *a.Expr) error { } } } + + } else if lhs.MType().IsPointerType() { + if cv := rhs.ConstValue(); (cv != nil) && (cv.Sign() == 0) { + q.facts.appendBinaryOpFact(t.IDXBinaryEqEq, lhs, exprNullptr) + } else { + q.facts.appendBinaryOpFact(t.IDXBinaryEqEq, lhs, rhs) + if (lhs.MType().Decorator() == t.IDNptr) && (rhs.MType().Decorator() == t.IDPtr) { + q.facts.appendBinaryOpFact(t.IDXBinaryNotEq, lhs, exprNullptr) + } + } } // Look for "lhs = x[i .. j]" where i and j are constants. @@ -979,6 +992,11 @@ func (q *checker) bcheckExprOther(n *a.Expr, depth uint32) (bounds, error) { lengthExpr := (*a.Expr)(nil) if lTyp := lhs.MType(); lTyp.IsEitherArrayType() { lengthExpr = lTyp.ArrayLength() + } else if lTyp.IsPointerType() && lTyp.Inner().IsEitherArrayType() { + lengthExpr = lTyp.Inner().ArrayLength() + if err := q.proveRecvNotEqNullptr(lhs); err != nil { + return bounds{}, err + } } else { lengthExpr = makeSliceLength(lhs) } @@ -1093,19 +1111,7 @@ func (q *checker) bcheckExprCall(n *a.Expr, depth uint32) error { if recv.MType().Decorator() != t.IDNptr { return nil } - // Check that q.facts contain "recv != nullptr". - for _, x := range q.facts { - if x.Operator() != t.IDXBinaryNotEq { - continue - } - xLHS := x.LHS().AsExpr() - xRHS := x.RHS().AsExpr() - if (xLHS.Eq(exprNullptr) && xRHS.Eq(recv)) || - (xRHS.Eq(exprNullptr) && xLHS.Eq(recv)) { - return nil - } - } - return fmt.Errorf("check: cannot prove %q", recv.Str(q.tm)+" != nullptr") + return q.proveRecvNotEqNullptr(recv) } var errNotASpecialCase = errors.New("not a special case") diff --git a/lang/check/type.go b/lang/check/type.go index 4a47b104..13b7d1d1 100644 --- a/lang/check/type.go +++ b/lang/check/type.go @@ -514,8 +514,12 @@ func (q *checker) tcheckExprOther(n *a.Expr, depth uint32) error { return err } lTyp := lhs.MType() - if key := lTyp.Decorator(); key != t.IDArray && key != t.IDRoarray && key != t.IDRoslice && key != t.IDSlice { - return fmt.Errorf("check: %s is an index expression but %s has type %s, not an array or slice type", + if lTyp.IsEitherArrayType() || lTyp.IsEitherSliceType() { + // No-op. + } else if lTyp.IsPointerType() && lTyp.Inner().IsEitherArrayType() { + // No-op. + } else { + return fmt.Errorf("check: %s is an index expression but %s has type %s, not an array, slice or pointer-to-array type", n.Str(q.tm), lhs.Str(q.tm), lTyp.Str(q.tm)) } rTyp := rhs.MType() @@ -523,7 +527,11 @@ func (q *checker) tcheckExprOther(n *a.Expr, depth uint32) error { return fmt.Errorf("check: %s is an index expression but %s has type %s, not a numeric type", n.Str(q.tm), rhs.Str(q.tm), rTyp.Str(q.tm)) } - n.SetMType(lTyp.Inner()) + if lTyp.IsPointerType() { + n.SetMType(lTyp.Inner().Inner()) + } else { + n.SetMType(lTyp.Inner()) + } return nil case t.IDDotDot: