From 724aec33dfaea6a8e633e5d74e90d5bb2aaa3881 Mon Sep 17 00:00:00 2001 From: Nigel Tao Date: Tue, 13 Jun 2023 22:37:28 +1000 Subject: [PATCH] cgen: remove unnecessary parens for ptr-to-array --- internal/cgen/expr.go | 10 ++++++++-- release/c/wuffs-unsupported-snapshot.c | 6 +++--- 2 files changed, 11 insertions(+), 5 deletions(-) diff --git a/internal/cgen/expr.go b/internal/cgen/expr.go index 85b53dcc..8838ebae 100644 --- a/internal/cgen/expr.go +++ b/internal/cgen/expr.go @@ -586,7 +586,11 @@ func (g *gen) writeCTypeName(b *buffer, n *a.TypeExpr, varNamePrefix string, var } if isPointerToArray { - b.writes("(*") + if x.Inner().Inner().IsNumType() { + b.writes("*") + } else { + b.writes("(*") + } } else { for i := 0; i < numPointers; i++ { b.writeb('*') @@ -601,8 +605,10 @@ func (g *gen) writeCTypeName(b *buffer, n *a.TypeExpr, varNamePrefix string, var x = n if isPointerToArray { - b.writes(")") x = x.Inner().Inner() + if !x.IsNumType() { + b.writes(")") + } } for ; x != nil && x.IsEitherArrayType(); x = x.Inner() { b.writeb('[') diff --git a/release/c/wuffs-unsupported-snapshot.c b/release/c/wuffs-unsupported-snapshot.c index 0cbd1358..c49f2276 100644 --- a/release/c/wuffs-unsupported-snapshot.c +++ b/release/c/wuffs-unsupported-snapshot.c @@ -41586,7 +41586,7 @@ wuffs_jpeg__decoder__decode_mcu__choosy_default( uint32_t v_dc_blm1 = 0; uint32_t v_dc_ht_slow = 0; uint32_t v_dc_value = 0; - const uint16_t(* v_ac_huff_table_fast) = NULL; + const uint16_t* v_ac_huff_table_fast = NULL; uint8_t v_ac_h = 0; uint32_t v_ac_symbol = 0; uint32_t v_ac_ht_fast = 0; @@ -41790,7 +41790,7 @@ wuffs_jpeg__decoder__decode_mcu_progressive_ac_high_bits( const uint8_t* io1_v_r WUFFS_BASE__POTENTIALLY_UNUSED = NULL; const uint8_t* io2_v_r WUFFS_BASE__POTENTIALLY_UNUSED = NULL; uint32_t v_pos = 0; - const uint16_t(* v_ac_huff_table_fast) = NULL; + const uint16_t* v_ac_huff_table_fast = NULL; uint8_t v_ac_h = 0; uint32_t v_ac_symbol = 0; uint32_t v_ac_ht_fast = 0; @@ -41948,7 +41948,7 @@ wuffs_jpeg__decoder__decode_mcu_progressive_ac_low_bit( const uint8_t* io1_v_r WUFFS_BASE__POTENTIALLY_UNUSED = NULL; const uint8_t* io2_v_r WUFFS_BASE__POTENTIALLY_UNUSED = NULL; uint32_t v_pos = 0; - const uint16_t(* v_ac_huff_table_fast) = NULL; + const uint16_t* v_ac_huff_table_fast = NULL; uint8_t v_ac_h = 0; uint32_t v_ac_symbol = 0; uint32_t v_ac_ht_fast = 0;