diff --git a/cmd/wuffs-c/internal/cgen/base/base-private.h b/cmd/wuffs-c/internal/cgen/base/base-private.h index ba5d639e..11700119 100644 --- a/cmd/wuffs-c/internal/cgen/base/base-private.h +++ b/cmd/wuffs-c/internal/cgen/base/base-private.h @@ -432,7 +432,7 @@ wuffs_base__table_u8__row(wuffs_base__table_u8 t, uint32_t y) { // ---------------- Utility static inline wuffs_base__range_ii_u32 // -wuffs_base__utility__make_range_ii_u32(wuffs_base__utility* ignored, +wuffs_base__utility__make_range_ii_u32(const wuffs_base__utility* ignored, uint32_t min_incl, uint32_t max_incl) { return ((wuffs_base__range_ii_u32){ @@ -442,7 +442,7 @@ wuffs_base__utility__make_range_ii_u32(wuffs_base__utility* ignored, } static inline wuffs_base__range_ie_u32 // -wuffs_base__utility__make_range_ie_u32(wuffs_base__utility* ignored, +wuffs_base__utility__make_range_ie_u32(const wuffs_base__utility* ignored, uint32_t min_incl, uint32_t max_excl) { return ((wuffs_base__range_ie_u32){ @@ -452,7 +452,7 @@ wuffs_base__utility__make_range_ie_u32(wuffs_base__utility* ignored, } static inline wuffs_base__range_ii_u64 // -wuffs_base__utility__make_range_ii_u64(wuffs_base__utility* ignored, +wuffs_base__utility__make_range_ii_u64(const wuffs_base__utility* ignored, uint64_t min_incl, uint64_t max_incl) { return ((wuffs_base__range_ii_u64){ @@ -462,7 +462,7 @@ wuffs_base__utility__make_range_ii_u64(wuffs_base__utility* ignored, } static inline wuffs_base__range_ie_u64 // -wuffs_base__utility__make_range_ie_u64(wuffs_base__utility* ignored, +wuffs_base__utility__make_range_ie_u64(const wuffs_base__utility* ignored, uint64_t min_incl, uint64_t max_excl) { return ((wuffs_base__range_ie_u64){ @@ -472,7 +472,7 @@ wuffs_base__utility__make_range_ie_u64(wuffs_base__utility* ignored, } static inline wuffs_base__rect_ii_u32 // -wuffs_base__utility__make_rect_ii_u32(wuffs_base__utility* ignored, +wuffs_base__utility__make_rect_ii_u32(const wuffs_base__utility* ignored, uint32_t min_incl_x, uint32_t min_incl_y, uint32_t max_incl_x, @@ -486,7 +486,7 @@ wuffs_base__utility__make_rect_ii_u32(wuffs_base__utility* ignored, } static inline wuffs_base__rect_ie_u32 // -wuffs_base__utility__make_rect_ie_u32(wuffs_base__utility* ignored, +wuffs_base__utility__make_rect_ie_u32(const wuffs_base__utility* ignored, uint32_t min_incl_x, uint32_t min_incl_y, uint32_t max_excl_x, diff --git a/cmd/wuffs-c/internal/cgen/data.go b/cmd/wuffs-c/internal/cgen/data.go index 5f555e9d..dcbe2fb4 100644 --- a/cmd/wuffs-c/internal/cgen/data.go +++ b/cmd/wuffs-c/internal/cgen/data.go @@ -99,9 +99,9 @@ const baseBasePrivateH = "" + "" + "// --------\n\nstatic inline wuffs_base__slice_u8 //\nwuffs_base__table_u8__row(wuffs_base__table_u8 t, uint32_t y) {\n if (y < t.height) {\n return ((wuffs_base__slice_u8){\n .ptr = t.ptr + (t.stride * y),\n .len = t.width,\n });\n }\n return ((wuffs_base__slice_u8){});\n}\n\n" + "" + - "// ---------------- Utility\n\nstatic inline wuffs_base__range_ii_u32 //\nwuffs_base__utility__make_range_ii_u32(wuffs_base__utility* ignored,\n uint32_t min_incl,\n uint32_t max_incl) {\n return ((wuffs_base__range_ii_u32){\n .min_incl = min_incl,\n .max_incl = max_incl,\n });\n}\n\nstatic inline wuffs_base__range_ie_u32 //\nwuffs_base__utility__make_range_ie_u32(wuffs_base__utility* ignored,\n uint32_t min_incl,\n uint32_t max_excl) {\n return ((wuffs_base__range_ie_u32){\n .min_incl = min_incl,\n .max_excl = max_excl,\n });\n}\n\nstatic inline wuffs_base__range_ii_u64 //\nwuffs_base__utility__make_range_ii_u64(wuffs_base__utility* ignored,\n uint64_t min_incl,\n uint64_t max_incl) {\n return ((wuffs_base__range_ii_u64){\n .min_incl = min_incl,\n .max_incl = max_incl,\n });" + - "\n}\n\nstatic inline wuffs_base__range_ie_u64 //\nwuffs_base__utility__make_range_ie_u64(wuffs_base__utility* ignored,\n uint64_t min_incl,\n uint64_t max_excl) {\n return ((wuffs_base__range_ie_u64){\n .min_incl = min_incl,\n .max_excl = max_excl,\n });\n}\n\nstatic inline wuffs_base__rect_ii_u32 //\nwuffs_base__utility__make_rect_ii_u32(wuffs_base__utility* ignored,\n uint32_t min_incl_x,\n uint32_t min_incl_y,\n uint32_t max_incl_x,\n uint32_t max_incl_y) {\n return ((wuffs_base__rect_ii_u32){\n .min_incl_x = min_incl_x,\n .min_incl_y = min_incl_y,\n .max_incl_x = max_incl_x,\n .max_incl_y = max_incl_y,\n });\n}\n\nstatic inline wuffs_base__rect_ie_u32 //\nwuffs_base__utility__make_rect_ie_u32(wuffs_base__utility* ignored,\n uint32_t min_incl" + - "_x,\n uint32_t min_incl_y,\n uint32_t max_excl_x,\n uint32_t max_excl_y) {\n return ((wuffs_base__rect_ie_u32){\n .min_incl_x = min_incl_x,\n .min_incl_y = min_incl_y,\n .max_excl_x = max_excl_x,\n .max_excl_y = max_excl_y,\n });\n}\n\n" + + "// ---------------- Utility\n\nstatic inline wuffs_base__range_ii_u32 //\nwuffs_base__utility__make_range_ii_u32(const wuffs_base__utility* ignored,\n uint32_t min_incl,\n uint32_t max_incl) {\n return ((wuffs_base__range_ii_u32){\n .min_incl = min_incl,\n .max_incl = max_incl,\n });\n}\n\nstatic inline wuffs_base__range_ie_u32 //\nwuffs_base__utility__make_range_ie_u32(const wuffs_base__utility* ignored,\n uint32_t min_incl,\n uint32_t max_excl) {\n return ((wuffs_base__range_ie_u32){\n .min_incl = min_incl,\n .max_excl = max_excl,\n });\n}\n\nstatic inline wuffs_base__range_ii_u64 //\nwuffs_base__utility__make_range_ii_u64(const wuffs_base__utility* ignored,\n uint64_t min_incl,\n uint64_t max_incl) {\n return ((wuffs_base__range_ii_u64){\n .min_incl = min_incl,\n .max_incl" + + " = max_incl,\n });\n}\n\nstatic inline wuffs_base__range_ie_u64 //\nwuffs_base__utility__make_range_ie_u64(const wuffs_base__utility* ignored,\n uint64_t min_incl,\n uint64_t max_excl) {\n return ((wuffs_base__range_ie_u64){\n .min_incl = min_incl,\n .max_excl = max_excl,\n });\n}\n\nstatic inline wuffs_base__rect_ii_u32 //\nwuffs_base__utility__make_rect_ii_u32(const wuffs_base__utility* ignored,\n uint32_t min_incl_x,\n uint32_t min_incl_y,\n uint32_t max_incl_x,\n uint32_t max_incl_y) {\n return ((wuffs_base__rect_ii_u32){\n .min_incl_x = min_incl_x,\n .min_incl_y = min_incl_y,\n .max_incl_x = max_incl_x,\n .max_incl_y = max_incl_y,\n });\n}\n\nstatic inline wuffs_base__rect_ie_u32 //\nwuffs_base__utility__make_rect_ie_u32(const wuffs_base__utility* ignored,\n " + + " uint32_t min_incl_x,\n uint32_t min_incl_y,\n uint32_t max_excl_x,\n uint32_t max_excl_y) {\n return ((wuffs_base__rect_ie_u32){\n .min_incl_x = min_incl_x,\n .min_incl_y = min_incl_y,\n .max_excl_x = max_excl_x,\n .max_excl_y = max_excl_y,\n });\n}\n\n" + "" + "// ---------------- I/O\n\nstatic inline bool //\nwuffs_base__io_buffer__is_valid(wuffs_base__io_buffer buf) {\n return (buf.data.ptr || (buf.data.len == 0)) &&\n (buf.data.len >= buf.meta.wi) && (buf.meta.wi >= buf.meta.ri);\n}\n\n// TODO: wuffs_base__io_reader__is_eof is no longer used by Wuffs per se, but\n// it might be handy to programs that use Wuffs. Either delete it, or promote\n// it to the public API.\n//\n// If making this function public (i.e. moving it to base-header.h), it also\n// needs to allow NULL (i.e. implicit, callee-calculated) mark/limit.\n\nstatic inline bool //\nwuffs_base__io_reader__is_eof(wuffs_base__io_reader o) {\n wuffs_base__io_buffer* buf = o.private_impl.buf;\n return buf && buf->meta.closed &&\n (buf->data.ptr + buf->meta.wi == o.private_impl.limit);\n}\n\nstatic inline bool //\nwuffs_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) mark/limit.\n return buf ? ((buf->data.ptr <= o.private_impl.mark) &&\n (o.private_impl.mark <= o.private_impl.limit) &&\n (o.private_impl.limit <= buf->data.ptr + buf->data.len))\n : ((o.private_impl.mark == NULL) &&\n (o.private_impl.limit == NULL));\n}\n\nstatic inline bool //\nwuffs_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) mark/limit.\n return buf ? ((buf->data.ptr <= o.private_impl.mark) &&\n (o.private_impl.mark <= o.private_impl.limit) &&\n (o.private_impl.limit <= buf->data.ptr + buf->data.len))\n : ((o.private_impl.mark == NULL) &&\n (o.private_impl.limit == NULL));\n}\n\nstatic inline uint32_t //\nwuffs_base__io_writer__copy_n_from_history(uin" + diff --git a/cmd/wuffs-c/internal/cgen/func.go b/cmd/wuffs-c/internal/cgen/func.go index 97556328..ca51ad77 100644 --- a/cmd/wuffs-c/internal/cgen/func.go +++ b/cmd/wuffs-c/internal/cgen/func.go @@ -115,6 +115,9 @@ func (g *gen) writeFuncSignature(b *buffer, n *a.Func, cpp uint32) error { comma := false if cpp == cppNone { if r := n.Receiver(); !r.IsZero() { + if n.Effect().Pure() { + b.writes("const ") + } b.printf("%s%s *self", g.pkgPrefix, r.Str(g.tm)) comma = true } @@ -132,6 +135,9 @@ func (g *gen) writeFuncSignature(b *buffer, n *a.Func, cpp uint32) error { } b.printf(")") + if cpp != cppNone && !n.Receiver().IsZero() && n.Effect().Pure() { + b.writes(" const ") + } return nil } diff --git a/release/c/wuffs-unsupported-snapshot.h b/release/c/wuffs-unsupported-snapshot.h index a7e00e1e..a0f739d8 100644 --- a/release/c/wuffs-unsupported-snapshot.h +++ b/release/c/wuffs-unsupported-snapshot.h @@ -2597,16 +2597,16 @@ wuffs_gif__decoder__decode_image_config(wuffs_gif__decoder* self, wuffs_base__io_reader a_src); WUFFS_BASE__MAYBE_STATIC uint32_t // -wuffs_gif__decoder__num_animation_loops(wuffs_gif__decoder* self); +wuffs_gif__decoder__num_animation_loops(const wuffs_gif__decoder* self); WUFFS_BASE__MAYBE_STATIC uint64_t // -wuffs_gif__decoder__num_decoded_frame_configs(wuffs_gif__decoder* self); +wuffs_gif__decoder__num_decoded_frame_configs(const wuffs_gif__decoder* self); WUFFS_BASE__MAYBE_STATIC uint64_t // -wuffs_gif__decoder__num_decoded_frames(wuffs_gif__decoder* self); +wuffs_gif__decoder__num_decoded_frames(const wuffs_gif__decoder* self); WUFFS_BASE__MAYBE_STATIC wuffs_base__range_ii_u64 // -wuffs_gif__decoder__workbuf_len(wuffs_gif__decoder* self); +wuffs_gif__decoder__workbuf_len(const wuffs_gif__decoder* self); WUFFS_BASE__MAYBE_STATIC wuffs_base__status // wuffs_gif__decoder__restart_frame(wuffs_gif__decoder* self, @@ -2765,22 +2765,22 @@ struct wuffs_gif__decoder__struct { } inline uint32_t // - num_animation_loops() { + num_animation_loops() const { return wuffs_gif__decoder__num_animation_loops(this); } inline uint64_t // - num_decoded_frame_configs() { + num_decoded_frame_configs() const { return wuffs_gif__decoder__num_decoded_frame_configs(this); } inline uint64_t // - num_decoded_frames() { + num_decoded_frames() const { return wuffs_gif__decoder__num_decoded_frames(this); } inline wuffs_base__range_ii_u64 // - workbuf_len() { + workbuf_len() const { return wuffs_gif__decoder__workbuf_len(this); } @@ -3461,7 +3461,7 @@ wuffs_base__table_u8__row(wuffs_base__table_u8 t, uint32_t y) { // ---------------- Utility static inline wuffs_base__range_ii_u32 // -wuffs_base__utility__make_range_ii_u32(wuffs_base__utility* ignored, +wuffs_base__utility__make_range_ii_u32(const wuffs_base__utility* ignored, uint32_t min_incl, uint32_t max_incl) { return ((wuffs_base__range_ii_u32){ @@ -3471,7 +3471,7 @@ wuffs_base__utility__make_range_ii_u32(wuffs_base__utility* ignored, } static inline wuffs_base__range_ie_u32 // -wuffs_base__utility__make_range_ie_u32(wuffs_base__utility* ignored, +wuffs_base__utility__make_range_ie_u32(const wuffs_base__utility* ignored, uint32_t min_incl, uint32_t max_excl) { return ((wuffs_base__range_ie_u32){ @@ -3481,7 +3481,7 @@ wuffs_base__utility__make_range_ie_u32(wuffs_base__utility* ignored, } static inline wuffs_base__range_ii_u64 // -wuffs_base__utility__make_range_ii_u64(wuffs_base__utility* ignored, +wuffs_base__utility__make_range_ii_u64(const wuffs_base__utility* ignored, uint64_t min_incl, uint64_t max_incl) { return ((wuffs_base__range_ii_u64){ @@ -3491,7 +3491,7 @@ wuffs_base__utility__make_range_ii_u64(wuffs_base__utility* ignored, } static inline wuffs_base__range_ie_u64 // -wuffs_base__utility__make_range_ie_u64(wuffs_base__utility* ignored, +wuffs_base__utility__make_range_ie_u64(const wuffs_base__utility* ignored, uint64_t min_incl, uint64_t max_excl) { return ((wuffs_base__range_ie_u64){ @@ -3501,7 +3501,7 @@ wuffs_base__utility__make_range_ie_u64(wuffs_base__utility* ignored, } static inline wuffs_base__rect_ii_u32 // -wuffs_base__utility__make_rect_ii_u32(wuffs_base__utility* ignored, +wuffs_base__utility__make_rect_ii_u32(const wuffs_base__utility* ignored, uint32_t min_incl_x, uint32_t min_incl_y, uint32_t max_incl_x, @@ -3515,7 +3515,7 @@ wuffs_base__utility__make_rect_ii_u32(wuffs_base__utility* ignored, } static inline wuffs_base__rect_ie_u32 // -wuffs_base__utility__make_rect_ie_u32(wuffs_base__utility* ignored, +wuffs_base__utility__make_rect_ie_u32(const wuffs_base__utility* ignored, uint32_t min_incl_x, uint32_t min_incl_y, uint32_t max_excl_x, @@ -7436,7 +7436,7 @@ exit: // -------- func gif.decoder.num_animation_loops WUFFS_BASE__MAYBE_STATIC uint32_t // -wuffs_gif__decoder__num_animation_loops(wuffs_gif__decoder* self) { +wuffs_gif__decoder__num_animation_loops(const wuffs_gif__decoder* self) { if (!self) { return 0; } @@ -7453,7 +7453,7 @@ wuffs_gif__decoder__num_animation_loops(wuffs_gif__decoder* self) { // -------- func gif.decoder.num_decoded_frame_configs WUFFS_BASE__MAYBE_STATIC uint64_t // -wuffs_gif__decoder__num_decoded_frame_configs(wuffs_gif__decoder* self) { +wuffs_gif__decoder__num_decoded_frame_configs(const wuffs_gif__decoder* self) { if (!self) { return 0; } @@ -7467,7 +7467,7 @@ wuffs_gif__decoder__num_decoded_frame_configs(wuffs_gif__decoder* self) { // -------- func gif.decoder.num_decoded_frames WUFFS_BASE__MAYBE_STATIC uint64_t // -wuffs_gif__decoder__num_decoded_frames(wuffs_gif__decoder* self) { +wuffs_gif__decoder__num_decoded_frames(const wuffs_gif__decoder* self) { if (!self) { return 0; } @@ -7481,7 +7481,7 @@ wuffs_gif__decoder__num_decoded_frames(wuffs_gif__decoder* self) { // -------- func gif.decoder.workbuf_len WUFFS_BASE__MAYBE_STATIC wuffs_base__range_ii_u64 // -wuffs_gif__decoder__workbuf_len(wuffs_gif__decoder* self) { +wuffs_gif__decoder__workbuf_len(const wuffs_gif__decoder* self) { if (!self) { return ((wuffs_base__range_ii_u64){}); }