diff --git a/cmd/wuffs-c/internal/cgen/base-impl.h b/cmd/wuffs-c/internal/cgen/base-impl.h index 6bf955f8..a454e755 100644 --- a/cmd/wuffs-c/internal/cgen/base-impl.h +++ b/cmd/wuffs-c/internal/cgen/base-impl.h @@ -232,17 +232,6 @@ static inline uint64_t wuffs_base__slice_u8__copy_from_slice( // -------- -static inline wuffs_base__slice_u8 wuffs_base__table_u8__linearize( - wuffs_base__table_u8 t) { - if (t.width == t.stride) { - return ((wuffs_base__slice_u8){ - .ptr = t.ptr, - .len = t.width * t.height, - }); - } - return ((wuffs_base__slice_u8){}); -} - static inline wuffs_base__slice_u8 wuffs_base__table_u8__row( wuffs_base__table_u8 t, uint32_t y) { diff --git a/cmd/wuffs-c/internal/cgen/builtin.go b/cmd/wuffs-c/internal/cgen/builtin.go index 674ca92c..04fc1aab 100644 --- a/cmd/wuffs-c/internal/cgen/builtin.go +++ b/cmd/wuffs-c/internal/cgen/builtin.go @@ -324,15 +324,6 @@ func (g *gen) writeBuiltinTable(b *buffer, recv *a.Expr, method t.ID, args []*a. case t.IDWidth: field = "width" - case t.IDLinearize: - // TODO: don't assume that the table is a table of base.u8. - b.writes("wuffs_base__table_u8__linearize(") - if err := g.writeExpr(b, recv, rp, depth); err != nil { - return err - } - b.writeb(')') - return nil - case t.IDRow: // TODO: don't assume that the table is a table of base.u8. b.writes("wuffs_base__table_u8__row(") diff --git a/cmd/wuffs-c/internal/cgen/data.go b/cmd/wuffs-c/internal/cgen/data.go index 7faeaf3c..52df2e42 100644 --- a/cmd/wuffs-c/internal/cgen/data.go +++ b/cmd/wuffs-c/internal/cgen/data.go @@ -98,7 +98,7 @@ const baseImpl = "" + "// ---------------- Slices and Tables\n\nstatic inline wuffs_base__slice_u8 wuffs_base__slice_u8__subslice_i(\n wuffs_base__slice_u8 s,\n uint64_t i) {\n if ((i <= SIZE_MAX) && (i <= s.len)) {\n return ((wuffs_base__slice_u8){\n .ptr = s.ptr + i,\n .len = s.len - i,\n });\n }\n return ((wuffs_base__slice_u8){});\n}\n\nstatic inline wuffs_base__slice_u8 wuffs_base__slice_u8__subslice_j(\n wuffs_base__slice_u8 s,\n uint64_t j) {\n if ((j <= SIZE_MAX) && (j <= s.len)) {\n return ((wuffs_base__slice_u8){.ptr = s.ptr, .len = j});\n }\n return ((wuffs_base__slice_u8){});\n}\n\nstatic inline wuffs_base__slice_u8 wuffs_base__slice_u8__subslice_ij(\n wuffs_base__slice_u8 s,\n uint64_t i,\n uint64_t j) {\n if ((i <= j) && (j <= SIZE_MAX) && (j <= s.len)) {\n return ((wuffs_base__slice_u8){\n .ptr = s.ptr + i,\n .len = j - i,\n });\n }\n return ((wuffs_base__slice_u8){});\n}\n\n// wuffs_base__slice_u8__prefix returns up to the first up_to bytes of s.\nstatic inline wuffs_base__slice_u" + "8 wuffs_base__slice_u8__prefix(\n wuffs_base__slice_u8 s,\n uint64_t up_to) {\n if ((uint64_t)(s.len) > up_to) {\n s.len = up_to;\n }\n return s;\n}\n\n// wuffs_base__slice_u8__suffix returns up to the last up_to bytes of s.\nstatic inline wuffs_base__slice_u8 wuffs_base__slice_u8__suffix(\n wuffs_base__slice_u8 s,\n uint64_t up_to) {\n if ((uint64_t)(s.len) > up_to) {\n s.ptr += (uint64_t)(s.len) - up_to;\n s.len = up_to;\n }\n return s;\n}\n\n// wuffs_base__slice_u8__copy_from_slice calls memmove(dst.ptr, src.ptr,\n// length) where length is the minimum of dst.len and src.len.\n//\n// Passing a wuffs_base__slice_u8 with all fields NULL or zero (a valid, empty\n// slice) is valid and results in a no-op.\nstatic inline uint64_t wuffs_base__slice_u8__copy_from_slice(\n wuffs_base__slice_u8 dst,\n wuffs_base__slice_u8 src) {\n size_t length = dst.len < src.len ? dst.len : src.len;\n if (length > 0) {\n memmove(dst.ptr, src.ptr, length);\n }\n return length;\n}\n\n" + "" + - "// --------\n\nstatic inline wuffs_base__slice_u8 wuffs_base__table_u8__linearize(\n wuffs_base__table_u8 t) {\n if (t.width == t.stride) {\n return ((wuffs_base__slice_u8){\n .ptr = t.ptr,\n .len = t.width * t.height,\n });\n }\n return ((wuffs_base__slice_u8){});\n}\n\nstatic inline wuffs_base__slice_u8 wuffs_base__table_u8__row(\n wuffs_base__table_u8 t,\n 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" + + "// --------\n\nstatic inline wuffs_base__slice_u8 wuffs_base__table_u8__row(\n wuffs_base__table_u8 t,\n 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" + "" + "// ---------------- 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" + "" + diff --git a/gen/c/std/adler32.c b/gen/c/std/adler32.c index 44170b4a..e30f3167 100644 --- a/gen/c/std/adler32.c +++ b/gen/c/std/adler32.c @@ -1467,17 +1467,6 @@ static inline uint64_t wuffs_base__slice_u8__copy_from_slice( // -------- -static inline wuffs_base__slice_u8 wuffs_base__table_u8__linearize( - wuffs_base__table_u8 t) { - if (t.width == t.stride) { - return ((wuffs_base__slice_u8){ - .ptr = t.ptr, - .len = t.width * t.height, - }); - } - return ((wuffs_base__slice_u8){}); -} - static inline wuffs_base__slice_u8 wuffs_base__table_u8__row( wuffs_base__table_u8 t, uint32_t y) { diff --git a/gen/c/std/crc32.c b/gen/c/std/crc32.c index bdf6efae..24e99fd2 100644 --- a/gen/c/std/crc32.c +++ b/gen/c/std/crc32.c @@ -1466,17 +1466,6 @@ static inline uint64_t wuffs_base__slice_u8__copy_from_slice( // -------- -static inline wuffs_base__slice_u8 wuffs_base__table_u8__linearize( - wuffs_base__table_u8 t) { - if (t.width == t.stride) { - return ((wuffs_base__slice_u8){ - .ptr = t.ptr, - .len = t.width * t.height, - }); - } - return ((wuffs_base__slice_u8){}); -} - static inline wuffs_base__slice_u8 wuffs_base__table_u8__row( wuffs_base__table_u8 t, uint32_t y) { diff --git a/gen/c/std/deflate.c b/gen/c/std/deflate.c index 41b9e016..7db21c65 100644 --- a/gen/c/std/deflate.c +++ b/gen/c/std/deflate.c @@ -1558,17 +1558,6 @@ static inline uint64_t wuffs_base__slice_u8__copy_from_slice( // -------- -static inline wuffs_base__slice_u8 wuffs_base__table_u8__linearize( - wuffs_base__table_u8 t) { - if (t.width == t.stride) { - return ((wuffs_base__slice_u8){ - .ptr = t.ptr, - .len = t.width * t.height, - }); - } - return ((wuffs_base__slice_u8){}); -} - static inline wuffs_base__slice_u8 wuffs_base__table_u8__row( wuffs_base__table_u8 t, uint32_t y) { diff --git a/gen/c/std/gif.c b/gen/c/std/gif.c index e2588746..2de1613b 100644 --- a/gen/c/std/gif.c +++ b/gen/c/std/gif.c @@ -1613,17 +1613,6 @@ static inline uint64_t wuffs_base__slice_u8__copy_from_slice( // -------- -static inline wuffs_base__slice_u8 wuffs_base__table_u8__linearize( - wuffs_base__table_u8 t) { - if (t.width == t.stride) { - return ((wuffs_base__slice_u8){ - .ptr = t.ptr, - .len = t.width * t.height, - }); - } - return ((wuffs_base__slice_u8){}); -} - static inline wuffs_base__slice_u8 wuffs_base__table_u8__row( wuffs_base__table_u8 t, uint32_t y) { diff --git a/gen/c/std/gzip.c b/gen/c/std/gzip.c index 45779ee4..ef35676b 100644 --- a/gen/c/std/gzip.c +++ b/gen/c/std/gzip.c @@ -1761,17 +1761,6 @@ static inline uint64_t wuffs_base__slice_u8__copy_from_slice( // -------- -static inline wuffs_base__slice_u8 wuffs_base__table_u8__linearize( - wuffs_base__table_u8 t) { - if (t.width == t.stride) { - return ((wuffs_base__slice_u8){ - .ptr = t.ptr, - .len = t.width * t.height, - }); - } - return ((wuffs_base__slice_u8){}); -} - static inline wuffs_base__slice_u8 wuffs_base__table_u8__row( wuffs_base__table_u8 t, uint32_t y) { diff --git a/gen/c/std/zlib.c b/gen/c/std/zlib.c index 9ec25244..545a7a1b 100644 --- a/gen/c/std/zlib.c +++ b/gen/c/std/zlib.c @@ -1761,17 +1761,6 @@ static inline uint64_t wuffs_base__slice_u8__copy_from_slice( // -------- -static inline wuffs_base__slice_u8 wuffs_base__table_u8__linearize( - wuffs_base__table_u8 t) { - if (t.width == t.stride) { - return ((wuffs_base__slice_u8){ - .ptr = t.ptr, - .len = t.width * t.height, - }); - } - return ((wuffs_base__slice_u8){}); -} - static inline wuffs_base__slice_u8 wuffs_base__table_u8__row( wuffs_base__table_u8 t, uint32_t y) { diff --git a/lang/builtin/builtin.go b/lang/builtin/builtin.go index b927546b..9f73bfe3 100644 --- a/lang/builtin/builtin.go +++ b/lang/builtin/builtin.go @@ -200,6 +200,5 @@ var TableFuncs = []string{ "T2.stride()(ret u64)", "T2.width()(ret u64)", - "T2.linearize()(ret T1)", "T2.row(y u32)(ret T1)", } diff --git a/lang/token/list.go b/lang/token/list.go index 337afce7..f09581b3 100644 --- a/lang/token/list.go +++ b/lang/token/list.go @@ -489,12 +489,11 @@ const ( IDAvailable = ID(0x240) IDHeight = ID(0x241) IDLength = ID(0x242) - IDLinearize = ID(0x243) - IDPrefix = ID(0x244) - IDRow = ID(0x245) - IDStride = ID(0x246) - IDSuffix = ID(0x247) - IDWidth = ID(0x248) + IDPrefix = ID(0x243) + IDRow = ID(0x244) + IDStride = ID(0x245) + IDSuffix = ID(0x246) + IDWidth = ID(0x247) ) var builtInsByID = [nBuiltInIDs]string{ @@ -712,7 +711,6 @@ var builtInsByID = [nBuiltInIDs]string{ IDAvailable: "available", IDHeight: "height", IDLength: "length", - IDLinearize: "linearize", IDPrefix: "prefix", IDRow: "row", IDStride: "stride",