From f857d777ee4329b8bd3c4630e3e39d16e97db202 Mon Sep 17 00:00:00 2001 From: Nigel Tao Date: Thu, 22 Jun 2017 15:30:53 +1000 Subject: [PATCH] Type check "var x T0 = y as T1". --- gen/c/std/gif.c | 4 ++-- lang/check/type.go | 11 ++++++++++- std/gif/decode_gif.puffs | 4 ++-- 3 files changed, 14 insertions(+), 5 deletions(-) diff --git a/gen/c/std/gif.c b/gen/c/std/gif.c index ff5d2eed..79140554 100644 --- a/gen/c/std/gif.c +++ b/gen/c/std/gif.c @@ -478,7 +478,7 @@ puffs_gif_status puffs_gif_decoder_decode_extension(puffs_gif_decoder* self, return status; } uint8_t t_1 = a_src.buf->ptr[a_src.buf->ri++]; - v_block_size = ((uint32_t)(t_1)); + v_block_size = t_1; if (v_block_size == 0) { goto label_0_break; } @@ -546,7 +546,7 @@ puffs_gif_status puffs_gif_decoder_decode_id(puffs_gif_decoder* self, return status; } uint8_t t_2 = a_src.buf->ptr[a_src.buf->ri++]; - v_block_size = ((uint32_t)(t_2)); + v_block_size = t_2; if (v_block_size == 0) { goto label_0_break; } diff --git a/lang/check/type.go b/lang/check/type.go index 9c75d254..69a516e8 100644 --- a/lang/check/type.go +++ b/lang/check/type.go @@ -144,7 +144,16 @@ func (q *checker) tcheckStatement(n *a.Node) error { if err := q.tcheckExpr(value, 0); err != nil { return err } - // TODO: check that value.Type is assignable to n.TypeExpr(). + lTyp := n.XType() + rTyp := value.MType() + if (rTyp.IsIdeal() && lTyp.IsNumType()) || lTyp.EqIgnoringRefinements(rTyp) { + // No-op. + } else { + return fmt.Errorf("check: cannot assign %q of type %q to %q of type %q", + value.String(q.tm), rTyp.String(q.tm), n.Name().String(q.tm), lTyp.String(q.tm)) + } + } else { + // TODO: check that the default zero value is assignable to n.XType(). } case a.KWhile: diff --git a/std/gif/decode_gif.puffs b/std/gif/decode_gif.puffs index 18dae5c7..d5c741da 100644 --- a/std/gif/decode_gif.puffs +++ b/std/gif/decode_gif.puffs @@ -105,7 +105,7 @@ pri func decoder.decode_extension?(src reader1)() { // Skip the data blocks. while true { - var block_size u8 = in.src.read_u8?() as u32 + var block_size u8 = in.src.read_u8?() if block_size == 0 { break } @@ -145,7 +145,7 @@ pri func decoder.decode_id?(src reader1)() { // TODO: pass the data blocks' payload to this.lzw. while true { - var block_size u8 = in.src.read_u8?() as u32 + var block_size u8 = in.src.read_u8?() if block_size == 0 { break }