lang: make "return a slice" return a slice of this

This commit is contained in:
Nigel Tao committed 2023-06-13 22:38:29 +10:00
1 parent 66723c6706
commit 43beae1d3d
3 files changed
+31 -12

No files matched your search

+14
View File
@@ -240,6 +240,20 @@ func (q *checker) tcheckStatement(n *a.Node) error {
return fmt.Errorf("check: cannot return %q (of type %q) as type %q",
value.Str(q.tm), rTyp.Str(q.tm), lTyp.Str(q.tm))
}
if rTyp.IsEitherSliceType() {
ok := false
if value.Operator() != t.IDDotDot {
// No-op.
} else if lhs := value.LHS().AsExpr(); lhs.Operator() != t.IDDot {
// No-op.
} else if llhs := lhs.LHS().AsExpr(); true {
ok = (llhs.Operator() == 0) && (llhs.Ident() == t.IDThis)
}
if !ok {
return fmt.Errorf("check: cannot return %q, need something of the form this.etc[i .. j]",
value.Str(q.tm))
}
}
case a.KVar:
n := n.AsVar()
+8 -7
View File
@@ -33975,16 +33975,17 @@ wuffs_lzw__decoder__flush(
return wuffs_base__make_slice_u8(NULL, 0);
}
wuffs_base__slice_u8 v_s = {0};
uint32_t v_ri = 0;
uint32_t v_wi = 0;
if (self->private_impl.f_output_ri <= self->private_impl.f_output_wi) {
v_s = wuffs_base__make_slice_u8_ij(self->private_data.f_output,
self->private_impl.f_output_ri,
self->private_impl.f_output_wi);
}
v_ri = self->private_impl.f_output_ri;
v_wi = self->private_impl.f_output_wi;
self->private_impl.f_output_ri = 0u;
self->private_impl.f_output_wi = 0u;
return v_s;
if (v_ri <= v_wi) {
return wuffs_base__make_slice_u8_ij(self->private_data.f_output, v_ri, v_wi);
}
return wuffs_base__make_slice_u8(self->private_data.f_output, 0);
}
#endif // !defined(WUFFS_CONFIG__MODULES) || defined(WUFFS_CONFIG__MODULE__LZW)
+9 -5
View File
@@ -369,12 +369,16 @@ pri func decoder.write_to?(dst: base.io_writer) {
}
pub func decoder.flush!() roslice base.u8 {
var s : slice base.u8
var ri : base.u32[..= 8191]
var wi : base.u32[..= 8191]
if this.output_ri <= this.output_wi {
s = this.output[this.output_ri .. this.output_wi]
}
ri = this.output_ri
wi = this.output_wi
this.output_ri = 0
this.output_wi = 0
return s
if ri <= wi {
return this.output[ri .. wi]
}
return this.output[.. 0]
}