diff --git a/cmd/puffs-gen-c/main.go b/cmd/puffs-gen-c/main.go index 6f62dd75..9556bd0a 100644 --- a/cmd/puffs-gen-c/main.go +++ b/cmd/puffs-gen-c/main.go @@ -390,15 +390,22 @@ func (g *gen) cName(name string) string { b = append(b, "puffs_"...) b = append(b, g.pkgName...) b = append(b, '_') + underscore := true for _, r := range name { if 'A' <= r && r <= 'Z' { b = append(b, byte(r+'a'-'A')) - } else if ('a' <= r && r <= 'z') || ('0' <= r && r <= '9') || ('_' == r) { + underscore = false + } else if ('a' <= r && r <= 'z') || ('0' <= r && r <= '9') { b = append(b, byte(r)) - } else if ' ' == r { + underscore = false + } else if !underscore { b = append(b, '_') + underscore = true } } + if underscore { + b = b[:len(b)-1] + } return string(b) } diff --git a/gen/c/std/flate.c b/gen/c/std/flate.c index 011cbaa1..337b1194 100644 --- a/gen/c/std/flate.c +++ b/gen/c/std/flate.c @@ -102,7 +102,7 @@ typedef int32_t puffs_flate_status; #define PUFFS_FLATE_ERROR_BAD_DISTANCE_CODE_COUNT -1157040128 // 0xbb08f800 #define PUFFS_FLATE_ERROR_BAD_FLATE_BLOCK -1157040127 // 0xbb08f801 -#define PUFFS_FLATE_ERROR_BAD_LITERALLENGTH_CODE_COUNT \ +#define PUFFS_FLATE_ERROR_BAD_LITERAL_LENGTH_CODE_COUNT \ -1157040126 // 0xbb08f802 #define PUFFS_FLATE_ERROR_INCONSISTENT_STORED_BLOCK_LENGTH \ -1157040125 // 0xbb08f803 @@ -673,7 +673,7 @@ puffs_flate_status puffs_flate_decoder_decode_dynamic( } v_hlit = (((v_bits) & ((1 << (5)) - 1)) + 257); if (v_hlit > 286) { - status = PUFFS_FLATE_ERROR_BAD_LITERALLENGTH_CODE_COUNT; + status = PUFFS_FLATE_ERROR_BAD_LITERAL_LENGTH_CODE_COUNT; goto suspend; } v_bits >>= 5; diff --git a/gen/h/std/flate.h b/gen/h/std/flate.h index 032bde64..27b74e34 100644 --- a/gen/h/std/flate.h +++ b/gen/h/std/flate.h @@ -102,7 +102,7 @@ typedef int32_t puffs_flate_status; #define PUFFS_FLATE_ERROR_BAD_DISTANCE_CODE_COUNT -1157040128 // 0xbb08f800 #define PUFFS_FLATE_ERROR_BAD_FLATE_BLOCK -1157040127 // 0xbb08f801 -#define PUFFS_FLATE_ERROR_BAD_LITERALLENGTH_CODE_COUNT \ +#define PUFFS_FLATE_ERROR_BAD_LITERAL_LENGTH_CODE_COUNT \ -1157040126 // 0xbb08f802 #define PUFFS_FLATE_ERROR_INCONSISTENT_STORED_BLOCK_LENGTH \ -1157040125 // 0xbb08f803