scc

simple c99 compiler
git clone git://git.simple-cc.org/scc
Log | Files | Refs | README | LICENSE

commit ffc937443d699eb0460bf3e34ee481a51e33064c
parent 0e247b5f4f5742e31b8d57e30fd582e867533b9f
Author: Quentin Rameau <quinq@fifth.space>
Date:   Sun,  2 May 2021 13:18:05 +0200

cc1: rename (u)shortype to (u)shorttype

This aligns with the rest of the naming: $TYPEtype

Diffstat:
Msrc/cmd/cc/cc1/amd64-sysv.c | 4++--
Msrc/cmd/cc/cc1/arch.c | 6+++---
Msrc/cmd/cc/cc1/arm64-sysv.c | 4++--
Msrc/cmd/cc/cc1/builtin.c | 4++--
Msrc/cmd/cc/cc1/cc1.h | 6+++---
Msrc/cmd/cc/cc1/i386-sysv.c | 4++--
Msrc/cmd/cc/cc1/types.c | 2+-
Msrc/cmd/cc/cc1/z80-scc.c | 4++--
8 files changed, 17 insertions(+), 17 deletions(-)

diff --git a/src/cmd/cc/cc1/amd64-sysv.c b/src/cmd/cc/cc1/amd64-sysv.c @@ -71,7 +71,7 @@ amd64_sysv(void) .align = 1, .n.rank = RANK_CHAR, }, - .ushortype = { + .ushorttype = { .op = INT, .letter = L_UINT16, .prop = TDEFINED | TINTEGER | TARITH, @@ -80,7 +80,7 @@ amd64_sysv(void) .n.rank = RANK_USHORT, }, - .shortype = { + .shorttype = { .op = INT, .letter = L_INT16, .prop = TDEFINED | TINTEGER | TARITH | TSIGNED, diff --git a/src/cmd/cc/cc1/arch.c b/src/cmd/cc/cc1/arch.c @@ -9,7 +9,7 @@ Type *voidtype, *pvoidtype, *booltype, *uchartype, *chartype, *schartype, *uinttype, *inttype, *sizettype, *pdifftype, - *ushortype, *shortype, + *ushorttype, *shorttype, *longtype, *ulongtype, *ullongtype, *llongtype, *floattype, *doubletype, *ldoubletype, @@ -66,8 +66,8 @@ iarch(void) inttype = &arch->inttype; sizettype = &arch->sizettype; pdifftype = &arch->pdifftype; - ushortype = &arch->ushortype; - shortype = &arch->shortype; + ushorttype = &arch->ushorttype; + shorttype = &arch->shorttype; longtype = &arch->longtype; ulongtype = &arch->ulongtype; ullongtype = &arch->ullongtype; diff --git a/src/cmd/cc/cc1/arm64-sysv.c b/src/cmd/cc/cc1/arm64-sysv.c @@ -71,7 +71,7 @@ arm64_sysv(void) .align = 1, .n.rank = RANK_CHAR, }, - .ushortype = { + .ushorttype = { .op = INT, .letter = L_UINT16, .prop = TDEFINED | TINTEGER | TARITH, @@ -80,7 +80,7 @@ arm64_sysv(void) .n.rank = RANK_USHORT, }, - .shortype = { + .shorttype = { .op = INT, .letter = L_INT16, .prop = TDEFINED | TINTEGER | TARITH | TSIGNED, diff --git a/src/cmd/cc/cc1/builtin.c b/src/cmd/cc/cc1/builtin.c @@ -19,7 +19,7 @@ builtin_va_arg(Symbol *sym) } if (tp == booltype || tp == chartype || tp == uchartype || tp == schartype || - tp == shortype || tp == ushortype) { + tp == shorttype || tp == ushorttype) { warn("bool, char and short are promoted to int when passed through '...'"); tp = (tp->prop & TSIGNED) ? inttype : uinttype; } @@ -75,7 +75,7 @@ builtin_va_start(Symbol *sym) tp = last->type; if (tp == booltype || tp == chartype || tp == uchartype || tp == schartype || - tp == shortype || tp == ushortype) { + tp == shorttype || tp == ushorttype) { warn("last parameter before '...' must not be bool, char or short"); } diff --git a/src/cmd/cc/cc1/cc1.h b/src/cmd/cc/cc1/cc1.h @@ -370,8 +370,8 @@ struct arch { Type schartype; Type uchartype; Type chartype; - Type ushortype; - Type shortype; + Type ushorttype; + Type shorttype; Type uinttype; Type inttype; Type longtype; @@ -530,7 +530,7 @@ extern Type *voidtype, *pvoidtype, *booltype, *uchartype, *chartype, *schartype, *uinttype, *inttype, *sizettype, *pdifftype, - *ushortype, *shortype, + *ushorttype, *shorttype, *longtype, *ulongtype, *ullongtype, *llongtype, *floattype, *doubletype, *ldoubletype, diff --git a/src/cmd/cc/cc1/i386-sysv.c b/src/cmd/cc/cc1/i386-sysv.c @@ -71,7 +71,7 @@ i386_sysv(void) .align = 1, .n.rank = RANK_CHAR, }, - .ushortype = { + .ushorttype = { .op = INT, .letter = L_UINT16, .prop = TDEFINED | TINTEGER | TARITH, @@ -80,7 +80,7 @@ i386_sysv(void) .n.rank = RANK_USHORT, }, - .shortype = { + .shorttype = { .op = INT, .letter = L_INT16, .prop = TDEFINED | TINTEGER | TARITH | TSIGNED, diff --git a/src/cmd/cc/cc1/types.c b/src/cmd/cc/cc1/types.c @@ -138,7 +138,7 @@ ctype(int type, int sign, int size) case 0: return (sign == UNSIGNED) ? uinttype : inttype; case SHORT: - return (sign == UNSIGNED) ? ushortype : shortype; + return (sign == UNSIGNED) ? ushorttype : shorttype; case LONG: return (sign == UNSIGNED) ? ulongtype : longtype; case LLONG: diff --git a/src/cmd/cc/cc1/z80-scc.c b/src/cmd/cc/cc1/z80-scc.c @@ -71,7 +71,7 @@ z80_scc(void) .align = 1, .n.rank = RANK_CHAR, }, - .ushortype = { + .ushorttype = { .op = INT, .letter = L_UINT16, .prop = TDEFINED | TINTEGER | TARITH, @@ -80,7 +80,7 @@ z80_scc(void) .n.rank = RANK_USHORT, }, - .shortype = { + .shorttype = { .op = INT, .letter = L_INT16, .prop = TDEFINED | TINTEGER | TARITH | TSIGNED,