From 0702faf8360f1333e15822b690c19b6b4aedfe18 Mon Sep 17 00:00:00 2001 From: Nigel Tao Date: Mon, 11 Jun 2018 08:32:23 +1000 Subject: [PATCH] Remove obsolete set_min_inclusive_x etc methods --- cmd/wuffs-c/internal/cgen/base/base-private.h | 60 ------------------- cmd/wuffs-c/internal/cgen/data.go | 4 -- gen/c/std/adler32.c | 60 ------------------- gen/c/std/crc32.c | 60 ------------------- gen/c/std/deflate.c | 60 ------------------- gen/c/std/gif.c | 60 ------------------- gen/c/std/gzip.c | 60 ------------------- gen/c/std/lzw.c | 60 ------------------- gen/c/std/zlib.c | 60 ------------------- lang/builtin/builtin.go | 14 ----- lang/token/list.go | 14 +---- 11 files changed, 1 insertion(+), 511 deletions(-) diff --git a/cmd/wuffs-c/internal/cgen/base/base-private.h b/cmd/wuffs-c/internal/cgen/base/base-private.h index f0d724fd..33834c4f 100644 --- a/cmd/wuffs-c/internal/cgen/base/base-private.h +++ b/cmd/wuffs-c/internal/cgen/base/base-private.h @@ -353,66 +353,6 @@ static inline wuffs_base__rect_ie_u32 wuffs_base__utility__make_rect_ie_u32( }); } -// ---------------- Ranges and Rects - -static inline wuffs_base__empty_struct -wuffs_base__rect_ii_u32__set_min_inclusive_x(wuffs_base__rect_ii_u32* r, - uint32_t x) { - r->min_inclusive_x = x; - return ((wuffs_base__empty_struct){}); -} - -static inline wuffs_base__empty_struct -wuffs_base__rect_ii_u32__set_min_inclusive_y(wuffs_base__rect_ii_u32* r, - uint32_t y) { - r->min_inclusive_y = y; - return ((wuffs_base__empty_struct){}); -} - -static inline wuffs_base__empty_struct -wuffs_base__rect_ii_u32__set_max_inclusive_x(wuffs_base__rect_ii_u32* r, - uint32_t x) { - r->max_inclusive_x = x; - return ((wuffs_base__empty_struct){}); -} - -static inline wuffs_base__empty_struct -wuffs_base__rect_ii_u32__set_max_inclusive_y(wuffs_base__rect_ii_u32* r, - uint32_t y) { - r->max_inclusive_y = y; - return ((wuffs_base__empty_struct){}); -} - -// -------- - -static inline wuffs_base__empty_struct -wuffs_base__rect_ie_u32__set_min_inclusive_x(wuffs_base__rect_ie_u32* r, - uint32_t x) { - r->min_inclusive_x = x; - return ((wuffs_base__empty_struct){}); -} - -static inline wuffs_base__empty_struct -wuffs_base__rect_ie_u32__set_min_inclusive_y(wuffs_base__rect_ie_u32* r, - uint32_t y) { - r->min_inclusive_y = y; - return ((wuffs_base__empty_struct){}); -} - -static inline wuffs_base__empty_struct -wuffs_base__rect_ie_u32__set_max_exclusive_x(wuffs_base__rect_ie_u32* r, - uint32_t x) { - r->max_exclusive_x = x; - return ((wuffs_base__empty_struct){}); -} - -static inline wuffs_base__empty_struct -wuffs_base__rect_ie_u32__set_max_exclusive_y(wuffs_base__rect_ie_u32* r, - uint32_t y) { - r->max_exclusive_y = y; - return ((wuffs_base__empty_struct){}); -} - // ---------------- I/O static inline bool wuffs_base__io_buffer__is_valid(wuffs_base__io_buffer buf) { diff --git a/cmd/wuffs-c/internal/cgen/data.go b/cmd/wuffs-c/internal/cgen/data.go index cd25d083..92ee687e 100644 --- a/cmd/wuffs-c/internal/cgen/data.go +++ b/cmd/wuffs-c/internal/cgen/data.go @@ -114,10 +114,6 @@ const basePrivateH = "" + " uint64_t min_inclusive,\n uint64_t max_exclusive) {\n return ((wuffs_base__range_ie_u64){\n .min_inclusive = min_inclusive,\n .max_exclusive = max_exclusive,\n });\n}\n\nstatic inline wuffs_base__rect_ii_u32 wuffs_base__utility__make_rect_ii_u32(\n wuffs_base__utility* ignored,\n uint32_t min_inclusive_x,\n uint32_t min_inclusive_y,\n uint32_t max_inclusive_x,\n uint32_t max_inclusive_y) {\n return ((wuffs_base__rect_ii_u32){\n .min_inclusive_x = min_inclusive_x,\n .min_inclusive_y = min_inclusive_y,\n .max_inclusive_x = max_inclusive_x,\n .max_inclusive_y = max_inclusive_y,\n });\n}\n\nstatic inline wuffs_base__rect_ie_u32 wuffs_base__utility__make_rect_ie_u32(\n wuffs_base__utility* ignored,\n uint32_t min_inclusive_x,\n uint32_t min_inclusive_y,\n uint32_t max_exclusive_x,\n uint32_t max_exclusive_y) {\n return ((wuffs_base__rect_ie_u32){\n .min_inclusive_x = min_inclusive_x,\n .min_inclusive_y = min_inclusive_y,\n .max_exclusive_x = max_exclusive_x,\n" + " .max_exclusive_y = max_exclusive_y,\n });\n}\n\n" + "" + - "// ---------------- Ranges and Rects\n\nstatic inline wuffs_base__empty_struct\nwuffs_base__rect_ii_u32__set_min_inclusive_x(wuffs_base__rect_ii_u32* r,\n uint32_t x) {\n r->min_inclusive_x = x;\n return ((wuffs_base__empty_struct){});\n}\n\nstatic inline wuffs_base__empty_struct\nwuffs_base__rect_ii_u32__set_min_inclusive_y(wuffs_base__rect_ii_u32* r,\n uint32_t y) {\n r->min_inclusive_y = y;\n return ((wuffs_base__empty_struct){});\n}\n\nstatic inline wuffs_base__empty_struct\nwuffs_base__rect_ii_u32__set_max_inclusive_x(wuffs_base__rect_ii_u32* r,\n uint32_t x) {\n r->max_inclusive_x = x;\n return ((wuffs_base__empty_struct){});\n}\n\nstatic inline wuffs_base__empty_struct\nwuffs_base__rect_ii_u32__set_max_inclusive_y(wuffs_base__rect_ii_u32* r,\n uint32_t y) {\n r->max_inclusive_y = y;\n return ((wuffs_base__empty_struct){});\n}\n\n" + - "" + - "// --------\n\nstatic inline wuffs_base__empty_struct\nwuffs_base__rect_ie_u32__set_min_inclusive_x(wuffs_base__rect_ie_u32* r,\n uint32_t x) {\n r->min_inclusive_x = x;\n return ((wuffs_base__empty_struct){});\n}\n\nstatic inline wuffs_base__empty_struct\nwuffs_base__rect_ie_u32__set_min_inclusive_y(wuffs_base__rect_ie_u32* r,\n uint32_t y) {\n r->min_inclusive_y = y;\n return ((wuffs_base__empty_struct){});\n}\n\nstatic inline wuffs_base__empty_struct\nwuffs_base__rect_ie_u32__set_max_exclusive_x(wuffs_base__rect_ie_u32* r,\n uint32_t x) {\n r->max_exclusive_x = x;\n return ((wuffs_base__empty_struct){});\n}\n\nstatic inline wuffs_base__empty_struct\nwuffs_base__rect_ie_u32__set_max_exclusive_y(wuffs_base__rect_ie_u32* r,\n uint32_t y) {\n r->max_exclusive_y = y;\n return ((wuffs_base__empty_struct){});\n}\n\n" + - "" + "// ---------------- I/O\n\nstatic inline bool wuffs_base__io_buffer__is_valid(wuffs_base__io_buffer buf) {\n return (buf.ptr || (buf.len == 0)) && (buf.len >= buf.wi) &&\n (buf.wi >= buf.ri);\n}\n\nstatic inline bool wuffs_base__io_reader__is_eof(wuffs_base__io_reader o) {\n wuffs_base__io_buffer* buf = o.private_impl.buf;\n return buf && buf->closed && (buf->ptr + buf->wi == o.private_impl.bounds[1]);\n}\n\nstatic inline bool wuffs_base__io_reader__is_valid(wuffs_base__io_reader o) {\n wuffs_base__io_buffer* buf = o.private_impl.buf;\n // Note: if making this function public (i.e. moving it to base-header.h), it\n // also needs to allow NULL (i.e. implicit, callee-calculated) bounds.\n return buf ? ((buf->ptr <= o.private_impl.bounds[0]) &&\n (o.private_impl.bounds[0] <= o.private_impl.bounds[1]) &&\n (o.private_impl.bounds[1] <= buf->ptr + buf->len))\n : ((o.private_impl.bounds[0] == NULL) &&\n (o.private_impl.bounds[1] == NULL));\n}\n\nstatic inline bool wuf" + "fs_base__io_writer__is_valid(wuffs_base__io_writer o) {\n wuffs_base__io_buffer* buf = o.private_impl.buf;\n // Note: if making this function public (i.e. moving it to base-header.h), it\n // also needs to allow NULL (i.e. implicit, callee-calculated) bounds.\n return buf ? ((buf->ptr <= o.private_impl.bounds[0]) &&\n (o.private_impl.bounds[0] <= o.private_impl.bounds[1]) &&\n (o.private_impl.bounds[1] <= buf->ptr + buf->len))\n : ((o.private_impl.bounds[0] == NULL) &&\n (o.private_impl.bounds[1] == NULL));\n}\n\nstatic inline uint32_t wuffs_base__io_writer__copy_from_history32(\n uint8_t** ptr_ptr,\n uint8_t* start,\n uint8_t* end,\n uint32_t distance,\n uint32_t length) {\n if (!distance) {\n return 0;\n }\n uint8_t* ptr = *ptr_ptr;\n if ((size_t)(ptr - start) < (size_t)(distance)) {\n return 0;\n }\n start = ptr - distance;\n size_t n = end - ptr;\n if ((size_t)(length) > n) {\n length = n;\n } else {\n n = length;\n }\n // TODO: unrolling" + " by 3 seems best for the std/deflate benchmarks, but that\n // is mostly because 3 is the minimum length for the deflate format. This\n // function implementation shouldn't overfit to that one format. Perhaps the\n // copy_from_history32 Wuffs method should also take an unroll hint argument,\n // and the cgen can look if that argument is the constant expression '3'.\n //\n // See also wuffs_base__io_writer__copy_from_history32__bco below.\n //\n // Alternatively, or additionally, have a sloppy_copy_from_history32 method\n // that copies 8 bytes at a time, possibly writing more than length bytes?\n for (; n >= 3; n -= 3) {\n *ptr++ = *start++;\n *ptr++ = *start++;\n *ptr++ = *start++;\n }\n for (; n; n--) {\n *ptr++ = *start++;\n }\n *ptr_ptr = ptr;\n return length;\n}\n\n// wuffs_base__io_writer__copy_from_history32__bco is a Bounds Check Optimized\n// version of the wuffs_base__io_writer__copy_from_history32 function above.\n// The caller needs to prove that:\n// - distance > 0\n// - distance <= (*ptr_pt" + diff --git a/gen/c/std/adler32.c b/gen/c/std/adler32.c index 3895ce47..1bcfc468 100644 --- a/gen/c/std/adler32.c +++ b/gen/c/std/adler32.c @@ -1677,66 +1677,6 @@ static inline wuffs_base__rect_ie_u32 wuffs_base__utility__make_rect_ie_u32( }); } -// ---------------- Ranges and Rects - -static inline wuffs_base__empty_struct -wuffs_base__rect_ii_u32__set_min_inclusive_x(wuffs_base__rect_ii_u32* r, - uint32_t x) { - r->min_inclusive_x = x; - return ((wuffs_base__empty_struct){}); -} - -static inline wuffs_base__empty_struct -wuffs_base__rect_ii_u32__set_min_inclusive_y(wuffs_base__rect_ii_u32* r, - uint32_t y) { - r->min_inclusive_y = y; - return ((wuffs_base__empty_struct){}); -} - -static inline wuffs_base__empty_struct -wuffs_base__rect_ii_u32__set_max_inclusive_x(wuffs_base__rect_ii_u32* r, - uint32_t x) { - r->max_inclusive_x = x; - return ((wuffs_base__empty_struct){}); -} - -static inline wuffs_base__empty_struct -wuffs_base__rect_ii_u32__set_max_inclusive_y(wuffs_base__rect_ii_u32* r, - uint32_t y) { - r->max_inclusive_y = y; - return ((wuffs_base__empty_struct){}); -} - -// -------- - -static inline wuffs_base__empty_struct -wuffs_base__rect_ie_u32__set_min_inclusive_x(wuffs_base__rect_ie_u32* r, - uint32_t x) { - r->min_inclusive_x = x; - return ((wuffs_base__empty_struct){}); -} - -static inline wuffs_base__empty_struct -wuffs_base__rect_ie_u32__set_min_inclusive_y(wuffs_base__rect_ie_u32* r, - uint32_t y) { - r->min_inclusive_y = y; - return ((wuffs_base__empty_struct){}); -} - -static inline wuffs_base__empty_struct -wuffs_base__rect_ie_u32__set_max_exclusive_x(wuffs_base__rect_ie_u32* r, - uint32_t x) { - r->max_exclusive_x = x; - return ((wuffs_base__empty_struct){}); -} - -static inline wuffs_base__empty_struct -wuffs_base__rect_ie_u32__set_max_exclusive_y(wuffs_base__rect_ie_u32* r, - uint32_t y) { - r->max_exclusive_y = y; - return ((wuffs_base__empty_struct){}); -} - // ---------------- I/O static inline bool wuffs_base__io_buffer__is_valid(wuffs_base__io_buffer buf) { diff --git a/gen/c/std/crc32.c b/gen/c/std/crc32.c index b3901980..65dfbdd4 100644 --- a/gen/c/std/crc32.c +++ b/gen/c/std/crc32.c @@ -1677,66 +1677,6 @@ static inline wuffs_base__rect_ie_u32 wuffs_base__utility__make_rect_ie_u32( }); } -// ---------------- Ranges and Rects - -static inline wuffs_base__empty_struct -wuffs_base__rect_ii_u32__set_min_inclusive_x(wuffs_base__rect_ii_u32* r, - uint32_t x) { - r->min_inclusive_x = x; - return ((wuffs_base__empty_struct){}); -} - -static inline wuffs_base__empty_struct -wuffs_base__rect_ii_u32__set_min_inclusive_y(wuffs_base__rect_ii_u32* r, - uint32_t y) { - r->min_inclusive_y = y; - return ((wuffs_base__empty_struct){}); -} - -static inline wuffs_base__empty_struct -wuffs_base__rect_ii_u32__set_max_inclusive_x(wuffs_base__rect_ii_u32* r, - uint32_t x) { - r->max_inclusive_x = x; - return ((wuffs_base__empty_struct){}); -} - -static inline wuffs_base__empty_struct -wuffs_base__rect_ii_u32__set_max_inclusive_y(wuffs_base__rect_ii_u32* r, - uint32_t y) { - r->max_inclusive_y = y; - return ((wuffs_base__empty_struct){}); -} - -// -------- - -static inline wuffs_base__empty_struct -wuffs_base__rect_ie_u32__set_min_inclusive_x(wuffs_base__rect_ie_u32* r, - uint32_t x) { - r->min_inclusive_x = x; - return ((wuffs_base__empty_struct){}); -} - -static inline wuffs_base__empty_struct -wuffs_base__rect_ie_u32__set_min_inclusive_y(wuffs_base__rect_ie_u32* r, - uint32_t y) { - r->min_inclusive_y = y; - return ((wuffs_base__empty_struct){}); -} - -static inline wuffs_base__empty_struct -wuffs_base__rect_ie_u32__set_max_exclusive_x(wuffs_base__rect_ie_u32* r, - uint32_t x) { - r->max_exclusive_x = x; - return ((wuffs_base__empty_struct){}); -} - -static inline wuffs_base__empty_struct -wuffs_base__rect_ie_u32__set_max_exclusive_y(wuffs_base__rect_ie_u32* r, - uint32_t y) { - r->max_exclusive_y = y; - return ((wuffs_base__empty_struct){}); -} - // ---------------- I/O static inline bool wuffs_base__io_buffer__is_valid(wuffs_base__io_buffer buf) { diff --git a/gen/c/std/deflate.c b/gen/c/std/deflate.c index 3c35b4b9..7a3dafb8 100644 --- a/gen/c/std/deflate.c +++ b/gen/c/std/deflate.c @@ -1765,66 +1765,6 @@ static inline wuffs_base__rect_ie_u32 wuffs_base__utility__make_rect_ie_u32( }); } -// ---------------- Ranges and Rects - -static inline wuffs_base__empty_struct -wuffs_base__rect_ii_u32__set_min_inclusive_x(wuffs_base__rect_ii_u32* r, - uint32_t x) { - r->min_inclusive_x = x; - return ((wuffs_base__empty_struct){}); -} - -static inline wuffs_base__empty_struct -wuffs_base__rect_ii_u32__set_min_inclusive_y(wuffs_base__rect_ii_u32* r, - uint32_t y) { - r->min_inclusive_y = y; - return ((wuffs_base__empty_struct){}); -} - -static inline wuffs_base__empty_struct -wuffs_base__rect_ii_u32__set_max_inclusive_x(wuffs_base__rect_ii_u32* r, - uint32_t x) { - r->max_inclusive_x = x; - return ((wuffs_base__empty_struct){}); -} - -static inline wuffs_base__empty_struct -wuffs_base__rect_ii_u32__set_max_inclusive_y(wuffs_base__rect_ii_u32* r, - uint32_t y) { - r->max_inclusive_y = y; - return ((wuffs_base__empty_struct){}); -} - -// -------- - -static inline wuffs_base__empty_struct -wuffs_base__rect_ie_u32__set_min_inclusive_x(wuffs_base__rect_ie_u32* r, - uint32_t x) { - r->min_inclusive_x = x; - return ((wuffs_base__empty_struct){}); -} - -static inline wuffs_base__empty_struct -wuffs_base__rect_ie_u32__set_min_inclusive_y(wuffs_base__rect_ie_u32* r, - uint32_t y) { - r->min_inclusive_y = y; - return ((wuffs_base__empty_struct){}); -} - -static inline wuffs_base__empty_struct -wuffs_base__rect_ie_u32__set_max_exclusive_x(wuffs_base__rect_ie_u32* r, - uint32_t x) { - r->max_exclusive_x = x; - return ((wuffs_base__empty_struct){}); -} - -static inline wuffs_base__empty_struct -wuffs_base__rect_ie_u32__set_max_exclusive_y(wuffs_base__rect_ie_u32* r, - uint32_t y) { - r->max_exclusive_y = y; - return ((wuffs_base__empty_struct){}); -} - // ---------------- I/O static inline bool wuffs_base__io_buffer__is_valid(wuffs_base__io_buffer buf) { diff --git a/gen/c/std/gif.c b/gen/c/std/gif.c index a7776eec..639c7580 100644 --- a/gen/c/std/gif.c +++ b/gen/c/std/gif.c @@ -1875,66 +1875,6 @@ static inline wuffs_base__rect_ie_u32 wuffs_base__utility__make_rect_ie_u32( }); } -// ---------------- Ranges and Rects - -static inline wuffs_base__empty_struct -wuffs_base__rect_ii_u32__set_min_inclusive_x(wuffs_base__rect_ii_u32* r, - uint32_t x) { - r->min_inclusive_x = x; - return ((wuffs_base__empty_struct){}); -} - -static inline wuffs_base__empty_struct -wuffs_base__rect_ii_u32__set_min_inclusive_y(wuffs_base__rect_ii_u32* r, - uint32_t y) { - r->min_inclusive_y = y; - return ((wuffs_base__empty_struct){}); -} - -static inline wuffs_base__empty_struct -wuffs_base__rect_ii_u32__set_max_inclusive_x(wuffs_base__rect_ii_u32* r, - uint32_t x) { - r->max_inclusive_x = x; - return ((wuffs_base__empty_struct){}); -} - -static inline wuffs_base__empty_struct -wuffs_base__rect_ii_u32__set_max_inclusive_y(wuffs_base__rect_ii_u32* r, - uint32_t y) { - r->max_inclusive_y = y; - return ((wuffs_base__empty_struct){}); -} - -// -------- - -static inline wuffs_base__empty_struct -wuffs_base__rect_ie_u32__set_min_inclusive_x(wuffs_base__rect_ie_u32* r, - uint32_t x) { - r->min_inclusive_x = x; - return ((wuffs_base__empty_struct){}); -} - -static inline wuffs_base__empty_struct -wuffs_base__rect_ie_u32__set_min_inclusive_y(wuffs_base__rect_ie_u32* r, - uint32_t y) { - r->min_inclusive_y = y; - return ((wuffs_base__empty_struct){}); -} - -static inline wuffs_base__empty_struct -wuffs_base__rect_ie_u32__set_max_exclusive_x(wuffs_base__rect_ie_u32* r, - uint32_t x) { - r->max_exclusive_x = x; - return ((wuffs_base__empty_struct){}); -} - -static inline wuffs_base__empty_struct -wuffs_base__rect_ie_u32__set_max_exclusive_y(wuffs_base__rect_ie_u32* r, - uint32_t y) { - r->max_exclusive_y = y; - return ((wuffs_base__empty_struct){}); -} - // ---------------- I/O static inline bool wuffs_base__io_buffer__is_valid(wuffs_base__io_buffer buf) { diff --git a/gen/c/std/gzip.c b/gen/c/std/gzip.c index a08e7c47..76bfd5b8 100644 --- a/gen/c/std/gzip.c +++ b/gen/c/std/gzip.c @@ -1917,66 +1917,6 @@ static inline wuffs_base__rect_ie_u32 wuffs_base__utility__make_rect_ie_u32( }); } -// ---------------- Ranges and Rects - -static inline wuffs_base__empty_struct -wuffs_base__rect_ii_u32__set_min_inclusive_x(wuffs_base__rect_ii_u32* r, - uint32_t x) { - r->min_inclusive_x = x; - return ((wuffs_base__empty_struct){}); -} - -static inline wuffs_base__empty_struct -wuffs_base__rect_ii_u32__set_min_inclusive_y(wuffs_base__rect_ii_u32* r, - uint32_t y) { - r->min_inclusive_y = y; - return ((wuffs_base__empty_struct){}); -} - -static inline wuffs_base__empty_struct -wuffs_base__rect_ii_u32__set_max_inclusive_x(wuffs_base__rect_ii_u32* r, - uint32_t x) { - r->max_inclusive_x = x; - return ((wuffs_base__empty_struct){}); -} - -static inline wuffs_base__empty_struct -wuffs_base__rect_ii_u32__set_max_inclusive_y(wuffs_base__rect_ii_u32* r, - uint32_t y) { - r->max_inclusive_y = y; - return ((wuffs_base__empty_struct){}); -} - -// -------- - -static inline wuffs_base__empty_struct -wuffs_base__rect_ie_u32__set_min_inclusive_x(wuffs_base__rect_ie_u32* r, - uint32_t x) { - r->min_inclusive_x = x; - return ((wuffs_base__empty_struct){}); -} - -static inline wuffs_base__empty_struct -wuffs_base__rect_ie_u32__set_min_inclusive_y(wuffs_base__rect_ie_u32* r, - uint32_t y) { - r->min_inclusive_y = y; - return ((wuffs_base__empty_struct){}); -} - -static inline wuffs_base__empty_struct -wuffs_base__rect_ie_u32__set_max_exclusive_x(wuffs_base__rect_ie_u32* r, - uint32_t x) { - r->max_exclusive_x = x; - return ((wuffs_base__empty_struct){}); -} - -static inline wuffs_base__empty_struct -wuffs_base__rect_ie_u32__set_max_exclusive_y(wuffs_base__rect_ie_u32* r, - uint32_t y) { - r->max_exclusive_y = y; - return ((wuffs_base__empty_struct){}); -} - // ---------------- I/O static inline bool wuffs_base__io_buffer__is_valid(wuffs_base__io_buffer buf) { diff --git a/gen/c/std/lzw.c b/gen/c/std/lzw.c index cb354476..82ab7e4c 100644 --- a/gen/c/std/lzw.c +++ b/gen/c/std/lzw.c @@ -1701,66 +1701,6 @@ static inline wuffs_base__rect_ie_u32 wuffs_base__utility__make_rect_ie_u32( }); } -// ---------------- Ranges and Rects - -static inline wuffs_base__empty_struct -wuffs_base__rect_ii_u32__set_min_inclusive_x(wuffs_base__rect_ii_u32* r, - uint32_t x) { - r->min_inclusive_x = x; - return ((wuffs_base__empty_struct){}); -} - -static inline wuffs_base__empty_struct -wuffs_base__rect_ii_u32__set_min_inclusive_y(wuffs_base__rect_ii_u32* r, - uint32_t y) { - r->min_inclusive_y = y; - return ((wuffs_base__empty_struct){}); -} - -static inline wuffs_base__empty_struct -wuffs_base__rect_ii_u32__set_max_inclusive_x(wuffs_base__rect_ii_u32* r, - uint32_t x) { - r->max_inclusive_x = x; - return ((wuffs_base__empty_struct){}); -} - -static inline wuffs_base__empty_struct -wuffs_base__rect_ii_u32__set_max_inclusive_y(wuffs_base__rect_ii_u32* r, - uint32_t y) { - r->max_inclusive_y = y; - return ((wuffs_base__empty_struct){}); -} - -// -------- - -static inline wuffs_base__empty_struct -wuffs_base__rect_ie_u32__set_min_inclusive_x(wuffs_base__rect_ie_u32* r, - uint32_t x) { - r->min_inclusive_x = x; - return ((wuffs_base__empty_struct){}); -} - -static inline wuffs_base__empty_struct -wuffs_base__rect_ie_u32__set_min_inclusive_y(wuffs_base__rect_ie_u32* r, - uint32_t y) { - r->min_inclusive_y = y; - return ((wuffs_base__empty_struct){}); -} - -static inline wuffs_base__empty_struct -wuffs_base__rect_ie_u32__set_max_exclusive_x(wuffs_base__rect_ie_u32* r, - uint32_t x) { - r->max_exclusive_x = x; - return ((wuffs_base__empty_struct){}); -} - -static inline wuffs_base__empty_struct -wuffs_base__rect_ie_u32__set_max_exclusive_y(wuffs_base__rect_ie_u32* r, - uint32_t y) { - r->max_exclusive_y = y; - return ((wuffs_base__empty_struct){}); -} - // ---------------- I/O static inline bool wuffs_base__io_buffer__is_valid(wuffs_base__io_buffer buf) { diff --git a/gen/c/std/zlib.c b/gen/c/std/zlib.c index cbf77cab..dbdf0ff5 100644 --- a/gen/c/std/zlib.c +++ b/gen/c/std/zlib.c @@ -1915,66 +1915,6 @@ static inline wuffs_base__rect_ie_u32 wuffs_base__utility__make_rect_ie_u32( }); } -// ---------------- Ranges and Rects - -static inline wuffs_base__empty_struct -wuffs_base__rect_ii_u32__set_min_inclusive_x(wuffs_base__rect_ii_u32* r, - uint32_t x) { - r->min_inclusive_x = x; - return ((wuffs_base__empty_struct){}); -} - -static inline wuffs_base__empty_struct -wuffs_base__rect_ii_u32__set_min_inclusive_y(wuffs_base__rect_ii_u32* r, - uint32_t y) { - r->min_inclusive_y = y; - return ((wuffs_base__empty_struct){}); -} - -static inline wuffs_base__empty_struct -wuffs_base__rect_ii_u32__set_max_inclusive_x(wuffs_base__rect_ii_u32* r, - uint32_t x) { - r->max_inclusive_x = x; - return ((wuffs_base__empty_struct){}); -} - -static inline wuffs_base__empty_struct -wuffs_base__rect_ii_u32__set_max_inclusive_y(wuffs_base__rect_ii_u32* r, - uint32_t y) { - r->max_inclusive_y = y; - return ((wuffs_base__empty_struct){}); -} - -// -------- - -static inline wuffs_base__empty_struct -wuffs_base__rect_ie_u32__set_min_inclusive_x(wuffs_base__rect_ie_u32* r, - uint32_t x) { - r->min_inclusive_x = x; - return ((wuffs_base__empty_struct){}); -} - -static inline wuffs_base__empty_struct -wuffs_base__rect_ie_u32__set_min_inclusive_y(wuffs_base__rect_ie_u32* r, - uint32_t y) { - r->min_inclusive_y = y; - return ((wuffs_base__empty_struct){}); -} - -static inline wuffs_base__empty_struct -wuffs_base__rect_ie_u32__set_max_exclusive_x(wuffs_base__rect_ie_u32* r, - uint32_t x) { - r->max_exclusive_x = x; - return ((wuffs_base__empty_struct){}); -} - -static inline wuffs_base__empty_struct -wuffs_base__rect_ie_u32__set_max_exclusive_y(wuffs_base__rect_ie_u32* r, - uint32_t y) { - r->max_exclusive_y = y; - return ((wuffs_base__empty_struct){}); -} - // ---------------- I/O static inline bool wuffs_base__io_buffer__is_valid(wuffs_base__io_buffer buf) { diff --git a/lang/builtin/builtin.go b/lang/builtin/builtin.go index 43954d34..760a030a 100644 --- a/lang/builtin/builtin.go +++ b/lang/builtin/builtin.go @@ -127,20 +127,6 @@ var Funcs = []string{ "utility.make_rect_ie_u32(min_inclusive_x u32, min_inclusive_y u32," + "max_exclusive_x u32, max_exclusive_y u32)(ret rect_ie_u32)", - // ---- rect_ie_u32 - - "rect_ie_u32.set_min_inclusive_x!(x u32)()", - "rect_ie_u32.set_min_inclusive_y!(y u32)()", - "rect_ie_u32.set_max_exclusive_x!(x u32)()", - "rect_ie_u32.set_max_exclusive_y!(y u32)()", - - // ---- rect_ii_u32 - - "rect_ii_u32.set_min_inclusive_x!(x u32)()", - "rect_ii_u32.set_min_inclusive_y!(y u32)()", - "rect_ii_u32.set_max_inclusive_x!(x u32)()", - "rect_ii_u32.set_max_inclusive_y!(y u32)()", - // ---- image_buffer "image_buffer.plane(p u32[..3])(ret table u8)", diff --git a/lang/token/list.go b/lang/token/list.go index 20a986b8..bcccec12 100644 --- a/lang/token/list.go +++ b/lang/token/list.go @@ -491,12 +491,7 @@ const ( IDSet = ID(0x201) IDUnroll = ID(0x202) - IDSetMaxExclusiveX = ID(0x210) - IDSetMaxExclusiveY = ID(0x211) - IDSetMaxInclusiveX = ID(0x212) - IDSetMaxInclusiveY = ID(0x213) - IDSetMinInclusiveX = ID(0x214) - IDSetMinInclusiveY = ID(0x215) + // TODO: range/rect methods like intersection and contains? IDHighBits = ID(0x220) IDLowBits = ID(0x221) @@ -734,13 +729,6 @@ var builtInsByID = [nBuiltInIDs]string{ IDSet: "set", IDUnroll: "unroll", - IDSetMaxExclusiveX: "set_max_exclusive_x", - IDSetMaxExclusiveY: "set_max_exclusive_y", - IDSetMaxInclusiveX: "set_max_inclusive_x", - IDSetMaxInclusiveY: "set_max_inclusive_y", - IDSetMinInclusiveX: "set_min_inclusive_x", - IDSetMinInclusiveY: "set_min_inclusive_y", - IDHighBits: "high_bits", IDLowBits: "low_bits", IDMax: "max",