Rename "union" semantics to "typeset".
This commit is contained in:
@@ -440,6 +440,7 @@ enum TokenKind {
|
||||
tTHEN,
|
||||
tTHIS,
|
||||
tTYPEDEF,
|
||||
tTYPESET,
|
||||
tUNION,
|
||||
tVAR,
|
||||
tVIEW_AS,
|
||||
|
||||
@@ -144,7 +144,7 @@ static void dolabel(void);
|
||||
static void doreturn(void);
|
||||
static void dofuncenum(int listmode);
|
||||
static void dotypedef();
|
||||
static void dounion();
|
||||
static void dotypeset();
|
||||
static void domethodmap(LayoutSpec spec);
|
||||
static void dobreak(void);
|
||||
static void docont(void);
|
||||
@@ -1526,8 +1526,8 @@ static void parse(void)
|
||||
case tTYPEDEF:
|
||||
dotypedef();
|
||||
break;
|
||||
case tUNION:
|
||||
dounion();
|
||||
case tTYPESET:
|
||||
dotypeset();
|
||||
break;
|
||||
case tSTRUCT:
|
||||
declstruct();
|
||||
@@ -4357,8 +4357,8 @@ static void dotypedef()
|
||||
functags_add(def, &type);
|
||||
}
|
||||
|
||||
// Unsafe union - only supports function types. This is a transition hack for SP2.
|
||||
static void dounion()
|
||||
// Unsafe typeset - only supports function types. This is a transition hack for SP2.
|
||||
static void dotypeset()
|
||||
{
|
||||
token_ident_t ident;
|
||||
if (!needsymbol(&ident))
|
||||
|
||||
@@ -1974,7 +1974,7 @@ const char *sc_tokens[] = {
|
||||
"public",
|
||||
"return",
|
||||
"sizeof", "sleep", "static", "stock", "struct", "switch",
|
||||
"tagof", "*then", "this", "typedef",
|
||||
"tagof", "*then", "this", "typedef", "typeset",
|
||||
"union",
|
||||
"var", "view_as", "void",
|
||||
"while",
|
||||
|
||||
Reference in New Issue
Block a user