From 4a1b349cb85941b73acfd3326bab629c221e9bb6 Mon Sep 17 00:00:00 2001 From: Nigel Tao Date: Fri, 18 May 2018 20:22:56 +1000 Subject: [PATCH] Add a base.rect_ie_u32 type --- gen/c/std/gif.c | 1 + gen/h/std/gif.h | 1 + lang/builtin/builtin.go | 3 +++ lang/check/resolve.go | 6 ++++++ lang/token/list.go | 16 +++++++++++----- std/gif/decode_gif.wuffs | 1 + 6 files changed, 23 insertions(+), 5 deletions(-) diff --git a/gen/c/std/gif.c b/gen/c/std/gif.c index 3d5f5c02..366a55f1 100644 --- a/gen/c/std/gif.c +++ b/gen/c/std/gif.c @@ -1197,6 +1197,7 @@ typedef struct { bool f_interlace; bool f_seen_num_loops; uint32_t f_num_loops; + wuffs_base__rect_ie_u32 f_frame_rect; uint32_t f_frame_top; uint32_t f_frame_left; uint32_t f_frame_width; diff --git a/gen/h/std/gif.h b/gen/h/std/gif.h index 18969d52..6871fb03 100644 --- a/gen/h/std/gif.h +++ b/gen/h/std/gif.h @@ -1197,6 +1197,7 @@ typedef struct { bool f_interlace; bool f_seen_num_loops; uint32_t f_num_loops; + wuffs_base__rect_ie_u32 f_frame_rect; uint32_t f_frame_top; uint32_t f_frame_left; uint32_t f_frame_width; diff --git a/lang/builtin/builtin.go b/lang/builtin/builtin.go index 8612585b..7ee25826 100644 --- a/lang/builtin/builtin.go +++ b/lang/builtin/builtin.go @@ -73,6 +73,9 @@ var Types = []string{ "empty_struct", "bool", + "rect_ie_u32", + "rect_ii_u32", + "image_buffer", "image_config", "io_reader", diff --git a/lang/check/resolve.go b/lang/check/resolve.go index 057aa313..1d2d0790 100644 --- a/lang/check/resolve.go +++ b/lang/check/resolve.go @@ -48,6 +48,9 @@ var ( typeExprEmptyStruct = a.NewTypeExpr(0, t.IDBase, t.IDEmptyStruct, nil, nil, nil) typeExprBool = a.NewTypeExpr(0, t.IDBase, t.IDBool, nil, nil, nil) + typeExprRectIEU32 = a.NewTypeExpr(0, t.IDBase, t.IDRectIEU32, nil, nil, nil) + typeExprRectIIU32 = a.NewTypeExpr(0, t.IDBase, t.IDRectIIU32, nil, nil, nil) + typeExprImageBuffer = a.NewTypeExpr(0, t.IDBase, t.IDImageBuffer, nil, nil, nil) typeExprImageConfig = a.NewTypeExpr(0, t.IDBase, t.IDImageConfig, nil, nil, nil) typeExprIOReader = a.NewTypeExpr(0, t.IDBase, t.IDIOReader, nil, nil, nil) @@ -70,6 +73,9 @@ var builtInTypeMap = typeMap{ t.IDEmptyStruct: typeExprEmptyStruct, t.IDBool: typeExprBool, + t.IDRectIEU32: typeExprRectIEU32, + t.IDRectIIU32: typeExprRectIIU32, + t.IDImageBuffer: typeExprImageBuffer, t.IDImageConfig: typeExprImageConfig, t.IDIOReader: typeExprIOReader, diff --git a/lang/token/list.go b/lang/token/list.go index e550f42f..42889a50 100644 --- a/lang/token/list.go +++ b/lang/token/list.go @@ -398,11 +398,14 @@ const ( IDEmptyStruct = ID(0x100) IDBool = ID(0x101) - IDImageBuffer = ID(0x102) - IDImageConfig = ID(0x103) - IDIOReader = ID(0x104) - IDIOWriter = ID(0x105) - IDStatus = ID(0x106) + IDRectIEU32 = ID(0x102) + IDRectIIU32 = ID(0x103) + + IDImageBuffer = ID(0x104) + IDImageConfig = ID(0x105) + IDIOReader = ID(0x106) + IDIOWriter = ID(0x107) + IDStatus = ID(0x108) IDT1 = ID(0x10A) IDT2 = ID(0x10B) @@ -594,6 +597,9 @@ var builtInsByID = [nBuiltInIDs]string{ IDEmptyStruct: "empty_struct", IDBool: "bool", + IDRectIEU32: "rect_ie_u32", + IDRectIIU32: "rect_ii_u32", + IDImageBuffer: "image_buffer", IDImageConfig: "image_config", IDIOReader: "io_reader", diff --git a/std/gif/decode_gif.wuffs b/std/gif/decode_gif.wuffs index e9ce723e..6fb74fb9 100644 --- a/std/gif/decode_gif.wuffs +++ b/std/gif/decode_gif.wuffs @@ -45,6 +45,7 @@ pub struct decoder?( seen_num_loops base.bool, num_loops base.u32 = 1, + frame_rect base.rect_ie_u32, frame_top base.u32[..65535], frame_left base.u32[..65535], frame_width base.u32[..65535],