Rename "union" semantics to "typeset".
This commit is contained in:
parent
8a8917ba2e
commit
9c98edd104
@ -445,7 +445,7 @@ native void GetConVarName(Handle convar, char[] name, maxlength);
|
|||||||
*/
|
*/
|
||||||
native bool SendConVarValue(int client, Handle convar, const char[] value);
|
native bool SendConVarValue(int client, Handle convar, const char[] value);
|
||||||
|
|
||||||
union ConVarQueryFinished
|
typeset ConVarQueryFinished
|
||||||
{
|
{
|
||||||
// Called when a query to retrieve a client's console variable has finished.
|
// Called when a query to retrieve a client's console variable has finished.
|
||||||
//
|
//
|
||||||
|
@ -48,7 +48,7 @@ enum EventHookMode
|
|||||||
/**
|
/**
|
||||||
* Hook function types for events.
|
* Hook function types for events.
|
||||||
*/
|
*/
|
||||||
union EventHook
|
typeset EventHook
|
||||||
{
|
{
|
||||||
/**
|
/**
|
||||||
* Called when a game event is fired.
|
* Called when a game event is fired.
|
||||||
@ -273,4 +273,4 @@ methodmap Event < Handle {
|
|||||||
public SetString() = SetEventString;
|
public SetString() = SetEventString;
|
||||||
public GetName() = GetEventName;
|
public GetName() = GetEventName;
|
||||||
public SetBroadcast() = SetEventBroadcast;
|
public SetBroadcast() = SetEventBroadcast;
|
||||||
}
|
}
|
||||||
|
@ -110,7 +110,7 @@ enum RayType
|
|||||||
RayType_Infinite /**< The trace ray will go from the start position to infinity using a direction vector. */
|
RayType_Infinite /**< The trace ray will go from the start position to infinity using a direction vector. */
|
||||||
};
|
};
|
||||||
|
|
||||||
union TraceEntityFilter
|
typeset TraceEntityFilter
|
||||||
{
|
{
|
||||||
/**
|
/**
|
||||||
* Called on entity filtering.
|
* Called on entity filtering.
|
||||||
|
@ -123,7 +123,7 @@ native SortCustom1D(array[], array_size, SortFunc1D:sortfunc, Handle:hndl=INVALI
|
|||||||
* 0 if first is equal to second
|
* 0 if first is equal to second
|
||||||
* 1 if first should go after second
|
* 1 if first should go after second
|
||||||
*/
|
*/
|
||||||
union SortFunc2D
|
typeset SortFunc2D
|
||||||
{
|
{
|
||||||
function int (int[] elem1, int[] elem2, const int[][] array, Handle hndl);
|
function int (int[] elem1, int[] elem2, const int[][] array, Handle hndl);
|
||||||
function int (char[] elem1, char[] elem2, const char[][] array, Handle hndl);
|
function int (char[] elem1, char[] elem2, const char[][] array, Handle hndl);
|
||||||
|
@ -45,7 +45,7 @@
|
|||||||
/**
|
/**
|
||||||
* Any of the following prototypes will work for a timed function.
|
* Any of the following prototypes will work for a timed function.
|
||||||
*/
|
*/
|
||||||
union Timer
|
typeset Timer
|
||||||
{
|
{
|
||||||
/**
|
/**
|
||||||
* Called when the timer interval has elapsed.
|
* Called when the timer interval has elapsed.
|
||||||
|
@ -440,6 +440,7 @@ enum TokenKind {
|
|||||||
tTHEN,
|
tTHEN,
|
||||||
tTHIS,
|
tTHIS,
|
||||||
tTYPEDEF,
|
tTYPEDEF,
|
||||||
|
tTYPESET,
|
||||||
tUNION,
|
tUNION,
|
||||||
tVAR,
|
tVAR,
|
||||||
tVIEW_AS,
|
tVIEW_AS,
|
||||||
|
@ -144,7 +144,7 @@ static void dolabel(void);
|
|||||||
static void doreturn(void);
|
static void doreturn(void);
|
||||||
static void dofuncenum(int listmode);
|
static void dofuncenum(int listmode);
|
||||||
static void dotypedef();
|
static void dotypedef();
|
||||||
static void dounion();
|
static void dotypeset();
|
||||||
static void domethodmap(LayoutSpec spec);
|
static void domethodmap(LayoutSpec spec);
|
||||||
static void dobreak(void);
|
static void dobreak(void);
|
||||||
static void docont(void);
|
static void docont(void);
|
||||||
@ -1526,8 +1526,8 @@ static void parse(void)
|
|||||||
case tTYPEDEF:
|
case tTYPEDEF:
|
||||||
dotypedef();
|
dotypedef();
|
||||||
break;
|
break;
|
||||||
case tUNION:
|
case tTYPESET:
|
||||||
dounion();
|
dotypeset();
|
||||||
break;
|
break;
|
||||||
case tSTRUCT:
|
case tSTRUCT:
|
||||||
declstruct();
|
declstruct();
|
||||||
@ -4357,8 +4357,8 @@ static void dotypedef()
|
|||||||
functags_add(def, &type);
|
functags_add(def, &type);
|
||||||
}
|
}
|
||||||
|
|
||||||
// Unsafe union - only supports function types. This is a transition hack for SP2.
|
// Unsafe typeset - only supports function types. This is a transition hack for SP2.
|
||||||
static void dounion()
|
static void dotypeset()
|
||||||
{
|
{
|
||||||
token_ident_t ident;
|
token_ident_t ident;
|
||||||
if (!needsymbol(&ident))
|
if (!needsymbol(&ident))
|
||||||
|
@ -1974,7 +1974,7 @@ const char *sc_tokens[] = {
|
|||||||
"public",
|
"public",
|
||||||
"return",
|
"return",
|
||||||
"sizeof", "sleep", "static", "stock", "struct", "switch",
|
"sizeof", "sleep", "static", "stock", "struct", "switch",
|
||||||
"tagof", "*then", "this", "typedef",
|
"tagof", "*then", "this", "typedef", "typeset",
|
||||||
"union",
|
"union",
|
||||||
"var", "view_as", "void",
|
"var", "view_as", "void",
|
||||||
"while",
|
"while",
|
||||||
|
Loading…
Reference in New Issue
Block a user