Re-do how limits work.

This commit is contained in:
Nigel Tao committed 2017-10-26 16:59:03 +11:00
1 parent a382101a9c
commit 8ff453c752
16 files changed
+389 -122

No files matched your search

+1 -2
View File
@@ -613,9 +613,8 @@ func (n *TypeExpr) HasPointers() bool {
for ; n != nil; n = n.Inner() {
switch n.id0.Key() {
case 0:
// TODO: add t.KeyReader1, after figuring out how limit's should really work.
switch n.id1.Key() {
case t.KeyBuf1, t.KeyWriter1, t.KeyBuf2:
case t.KeyBuf1, t.KeyReader1, t.KeyWriter1, t.KeyBuf2:
return true
}
case t.KeyPtr, t.KeyNptr, t.KeyColon:
+6 -2
View File
@@ -731,7 +731,9 @@ func (q *checker) bcheckExprOther(n *a.Expr, depth uint32) (*big.Int, *big.Int,
isThisMethod(q.tm, n, "decode_uncompressed", 2) || isThisMethod(q.tm, n, "decode_huffman", 2) ||
isThisMethod(q.tm, n, "decode_blocks", 2) ||
isThisMethod(q.tm, n, "init_fixed_huffman", 0) || isThisMethod(q.tm, n, "init_dynamic_huffman", 1) ||
isThisMethod(q.tm, n, "init_huff", 4) {
isThisMethod(q.tm, n, "init_huff", 4) ||
isThatMethod(q.tm, n, t.KeyMark, 0) || isThatMethod(q.tm, n, t.KeyLimitt, 1) ||
isThatMethod(q.tm, n, t.KeySinceMark, 0) {
for _, o := range n.Args() {
a := o.Arg().Value()
@@ -784,7 +786,9 @@ func (q *checker) bcheckExprOther(n *a.Expr, depth uint32) (*big.Int, *big.Int,
return nil, nil, nil
}
// TODO: delete this hack that only matches "foo.decode(etc)".
if isThatMethod(q.tm, n, q.tm.ByName("decode").Key(), 2) || isThatMethod(q.tm, n, t.KeyCopyFromSlice, 1) ||
if isThatMethod(q.tm, n, q.tm.ByName("decode").Key(), 2) ||
isThatMethod(q.tm, n, q.tm.ByName("decode").Key(), 3) ||
isThatMethod(q.tm, n, t.KeyCopyFromSlice, 1) ||
isThatMethod(q.tm, n, q.tm.ByName("update").Key(), 1) {
for _, o := range n.Args() {
a := o.Arg().Value()
+5 -2
View File
@@ -449,7 +449,9 @@ func (q *checker) tcheckExprOther(n *a.Expr, depth uint32) error {
isThisMethod(q.tm, n, "decode_uncompressed", 2) || isThisMethod(q.tm, n, "decode_huffman", 2) ||
isThisMethod(q.tm, n, "decode_blocks", 2) ||
isThisMethod(q.tm, n, "init_fixed_huffman", 0) || isThisMethod(q.tm, n, "init_dynamic_huffman", 1) ||
isThisMethod(q.tm, n, "init_huff", 4) {
isThisMethod(q.tm, n, "init_huff", 4) ||
isThatMethod(q.tm, n, t.KeyMark, 0) || isThatMethod(q.tm, n, t.KeyLimitt, 1) ||
isThatMethod(q.tm, n, t.KeySinceMark, 0) {
if err := q.tcheckExpr(n.LHS().Expr(), depth); err != nil {
return err
@@ -530,7 +532,8 @@ func (q *checker) tcheckExprOther(n *a.Expr, depth uint32) error {
}
// TODO: delete this hack that only matches "foo.set_literal_width(etc)".
if isThatMethod(q.tm, n, q.tm.ByName("set_literal_width").Key(), 1) ||
isThatMethod(q.tm, n, q.tm.ByName("decode").Key(), 2) {
isThatMethod(q.tm, n, q.tm.ByName("decode").Key(), 2) ||
isThatMethod(q.tm, n, q.tm.ByName("decode").Key(), 3) {
foo := n.LHS().Expr().LHS().Expr()
if err := q.tcheckExpr(foo, depth); err != nil {
return err