Remove the (table T).linearize method

This commit is contained in:
Nigel Tao committed 2018-05-29 08:23:10 +10:00
1 parent c723329263
commit 47cf248e57
11 files changed
+6 -95

No files matched your search

-11
View File
@@ -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) {
-9
View File
@@ -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(")
+1 -1
View File
@@ -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" +
"" +
-11
View File
@@ -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) {
-11
View File
@@ -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) {
-11
View File
@@ -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) {
-11
View File
@@ -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) {
-11
View File
@@ -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) {
-11
View File
@@ -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) {
-1
View File
@@ -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)",
}
+5 -7
View File
@@ -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",