From bd12c54ab59912a826b51d5bce23cb0e813e9272 Mon Sep 17 00:00:00 2001 From: Nigel Tao Date: Sat, 12 May 2018 14:17:26 +1000 Subject: [PATCH] Rename mark to set_mark, part 1 of N --- cmd/wuffs-c/internal/cgen/expr.go | 4 ++-- cmd/wuffs-c/internal/cgen/statement.go | 4 ++-- lang/builtin/builtin.go | 4 ++-- lang/check/type.go | 3 +++ lang/token/list.go | 4 ++-- std/deflate/decode_deflate.wuffs | 2 +- std/gif/decode_gif.wuffs | 3 +-- std/gzip/decode_gzip.wuffs | 2 +- std/zlib/decode_zlib.wuffs | 2 +- 9 files changed, 15 insertions(+), 13 deletions(-) diff --git a/cmd/wuffs-c/internal/cgen/expr.go b/cmd/wuffs-c/internal/cgen/expr.go index 80e22b3a..50f570fd 100644 --- a/cmd/wuffs-c/internal/cgen/expr.go +++ b/cmd/wuffs-c/internal/cgen/expr.go @@ -167,7 +167,7 @@ func (g *gen) writeExprOther(b *buffer, n *a.Expr, rp replacementPolicy, pp pare // TODO: update the bPrefix variables? return nil } - if isInSrc(g.tm, n, t.IDMark, 0) { + if isInSrc(g.tm, n, t.IDSetMark, 0) { b.printf("wuffs_base__io_reader__mark(&%ssrc, %srptr_src)", aPrefix, bPrefix) return nil } @@ -178,7 +178,7 @@ func (g *gen) writeExprOther(b *buffer, n *a.Expr, rp replacementPolicy, pp pare aPrefix, bPrefix, aPrefix) return nil } - if isInDst(g.tm, n, t.IDMark, 0) { + if isInDst(g.tm, n, t.IDSetMark, 0) { // TODO: is a private_impl.bounds[0] the right representation? What // if the function is passed a (ptr io_writer) instead of a // (io_writer)? Do we still want to have that mark live outside of diff --git a/cmd/wuffs-c/internal/cgen/statement.go b/cmd/wuffs-c/internal/cgen/statement.go index 81bbef71..fcc4c568 100644 --- a/cmd/wuffs-c/internal/cgen/statement.go +++ b/cmd/wuffs-c/internal/cgen/statement.go @@ -875,7 +875,7 @@ func (g *gen) writeReadUXX(b *buffer, n *a.Expr, name string, size uint32, endia func isInSrc(tm *t.Map, n *a.Expr, methodName t.ID, nArgs int) bool { callSuspendible := methodName != t.IDSinceMark && - methodName != t.IDMark && + methodName != t.IDSetMark && methodName != t.IDSetLimit if n.Operator() != t.IDOpenParen || n.CallSuspendible() != callSuspendible || len(n.Args()) != nArgs { return false @@ -898,7 +898,7 @@ func isInDst(tm *t.Map, n *a.Expr, methodName t.ID, nArgs int) bool { methodName != t.IDCopyFromSlice32 && methodName != t.IDCopyFromSlice && methodName != t.IDSinceMark && - methodName != t.IDMark + methodName != t.IDSetMark // TODO: check that n.Args() is "(x:bar)". if n.Operator() != t.IDOpenParen || n.CallSuspendible() != callSuspendible || len(n.Args()) != nArgs { return false diff --git a/lang/builtin/builtin.go b/lang/builtin/builtin.go index d3cf65f0..a830df69 100644 --- a/lang/builtin/builtin.go +++ b/lang/builtin/builtin.go @@ -110,7 +110,7 @@ var Funcs = []string{ "io_reader.available()(ret u64)", "io_reader.set_limit(l u64)()", - "io_reader.mark()()", + "io_reader.set_mark()()", "io_reader.since_mark()(ret slice u8)", "io_reader.skip32?(n u32)()", @@ -128,7 +128,7 @@ var Funcs = []string{ "io_writer.available()(ret u64)", "io_writer.set_limit(l u64)()", - "io_writer.mark()()", + "io_writer.set_mark()()", "io_writer.since_mark()(ret slice u8)", "io_writer.copy_from_history32(distance u32, length u32)(ret u32)", diff --git a/lang/check/type.go b/lang/check/type.go index f1f63674..9656f4db 100644 --- a/lang/check/type.go +++ b/lang/check/type.go @@ -681,6 +681,9 @@ func (q *checker) tcheckDot(n *a.Expr, depth uint32) error { if s == nil { s = q.c.structs[lQID] if s == nil { + if lQID[0] == t.IDBase { + return fmt.Errorf("check: no built-in function %q found", qqid.Str(q.tm)) + } return fmt.Errorf("check: no struct type %q found for expression %q", lTyp.Str(q.tm), lhs.Str(q.tm)) } } diff --git a/lang/token/list.go b/lang/token/list.go index 2be34215..dc741216 100644 --- a/lang/token/list.go +++ b/lang/token/list.go @@ -461,7 +461,7 @@ const ( IDLowBits = ID(0x20E) IDHighBits = ID(0x20F) IDUnroll = ID(0x210) - IDMark = ID(0x211) + IDSetMark = ID(0x211) IDSinceMark = ID(0x212) ) @@ -651,7 +651,7 @@ var builtInsByID = [nBuiltInIDs]string{ IDLowBits: "low_bits", IDHighBits: "high_bits", IDUnroll: "unroll", - IDMark: "mark", + IDSetMark: "set_mark", IDSinceMark: "since_mark", } diff --git a/std/deflate/decode_deflate.wuffs b/std/deflate/decode_deflate.wuffs index cff8c112..f2e97585 100644 --- a/std/deflate/decode_deflate.wuffs +++ b/std/deflate/decode_deflate.wuffs @@ -123,7 +123,7 @@ pub struct decoder?( pub func decoder.decode?(dst base.io_writer, src base.io_reader)() { while true { - in.dst.mark() + in.dst.set_mark() var z base.status = try this.decode_blocks?(dst:in.dst, src:in.src) if not z.is_suspension() { return z diff --git a/std/gif/decode_gif.wuffs b/std/gif/decode_gif.wuffs index 8d5f7fce..44afe5e2 100644 --- a/std/gif/decode_gif.wuffs +++ b/std/gif/decode_gif.wuffs @@ -319,8 +319,7 @@ pri func decoder.decode_id?(dst base.io_writer, src base.io_reader)() { this.previous_lzw_decode_ended_abruptly = true while true { - // TODO: should "mark" be "set_mark" or "set_mark_here"? - in.src.mark() + in.src.set_mark() io_bind (in.src) { in.src.set_limit(l:block_size) var z base.status = try this.lzw.decode?(dst:in.dst, src:in.src) diff --git a/std/gzip/decode_gzip.wuffs b/std/gzip/decode_gzip.wuffs index 46a6ca2a..b96741a2 100644 --- a/std/gzip/decode_gzip.wuffs +++ b/std/gzip/decode_gzip.wuffs @@ -92,7 +92,7 @@ pub func decoder.decode?(dst base.io_writer, src base.io_reader)() { var checksum_got base.u32 var decoded_length_got base.u32 while true { - in.dst.mark() + in.dst.set_mark() var z base.status = try this.flate.decode?(dst:in.dst, src:in.src) if not this.ignore_checksum { checksum_got = this.checksum.update(x:in.dst.since_mark()) diff --git a/std/zlib/decode_zlib.wuffs b/std/zlib/decode_zlib.wuffs index 7c856999..bc7b5e5f 100644 --- a/std/zlib/decode_zlib.wuffs +++ b/std/zlib/decode_zlib.wuffs @@ -52,7 +52,7 @@ pub func decoder.decode?(dst base.io_writer, src base.io_reader)() { // Decode and checksum the DEFLATE-encoded payload. var checksum_got base.u32 while true { - in.dst.mark() + in.dst.set_mark() var z base.status = try this.flate.decode?(dst:in.dst, src:in.src) if not this.ignore_checksum { checksum_got = this.checksum.update(x:in.dst.since_mark())