ast: use more suitable types in a few ast nodes
The int ones cannot be signed (they come as such from the scanner, and NEGATE is never applied to them). The uint32_t one is really an atom, but presumably the type was never converted to xkb_atom_t. Signed-off-by: Ran Benita <ran234@gmail.com>master
parent
b9b3593cbd
commit
6ea15719d1
|
@ -356,7 +356,7 @@ SymbolsCreate(xkb_atom_t keyName, VarDef *symbols)
|
|||
}
|
||||
|
||||
GroupCompatDef *
|
||||
GroupCompatCreate(int group, ExprDef *val)
|
||||
GroupCompatCreate(unsigned group, ExprDef *val)
|
||||
{
|
||||
GroupCompatDef *def = malloc(sizeof(*def));
|
||||
if (!def)
|
||||
|
@ -372,7 +372,7 @@ GroupCompatCreate(int group, ExprDef *val)
|
|||
}
|
||||
|
||||
ModMapDef *
|
||||
ModMapCreate(uint32_t modifier, ExprDef *keys)
|
||||
ModMapCreate(xkb_atom_t modifier, ExprDef *keys)
|
||||
{
|
||||
ModMapDef *def = malloc(sizeof(*def));
|
||||
if (!def)
|
||||
|
@ -404,7 +404,7 @@ LedMapCreate(xkb_atom_t name, VarDef *body)
|
|||
}
|
||||
|
||||
LedNameDef *
|
||||
LedNameCreate(int ndx, ExprDef *name, bool virtual)
|
||||
LedNameCreate(unsigned ndx, ExprDef *name, bool virtual)
|
||||
{
|
||||
LedNameDef *def = malloc(sizeof(*def));
|
||||
if (!def)
|
||||
|
|
|
@ -98,16 +98,16 @@ SymbolsDef *
|
|||
SymbolsCreate(xkb_atom_t keyName, VarDef *symbols);
|
||||
|
||||
GroupCompatDef *
|
||||
GroupCompatCreate(int group, ExprDef *def);
|
||||
GroupCompatCreate(unsigned group, ExprDef *def);
|
||||
|
||||
ModMapDef *
|
||||
ModMapCreate(uint32_t modifier, ExprDef *keys);
|
||||
ModMapCreate(xkb_atom_t modifier, ExprDef *keys);
|
||||
|
||||
LedMapDef *
|
||||
LedMapCreate(xkb_atom_t name, VarDef *body);
|
||||
|
||||
LedNameDef *
|
||||
LedNameCreate(int ndx, ExprDef *name, bool virtual);
|
||||
LedNameCreate(unsigned ndx, ExprDef *name, bool virtual);
|
||||
|
||||
IncludeStmt *
|
||||
IncludeCreate(struct xkb_context *ctx, char *str, enum merge_mode merge);
|
||||
|
|
|
@ -299,7 +299,7 @@ typedef struct {
|
|||
typedef struct {
|
||||
ParseCommon common;
|
||||
enum merge_mode merge;
|
||||
int group;
|
||||
unsigned group;
|
||||
ExprDef *def;
|
||||
} GroupCompatDef;
|
||||
|
||||
|
@ -314,7 +314,7 @@ typedef struct {
|
|||
typedef struct {
|
||||
ParseCommon common;
|
||||
enum merge_mode merge;
|
||||
int ndx;
|
||||
unsigned ndx;
|
||||
ExprDef *name;
|
||||
bool virtual;
|
||||
} LedNameDef;
|
||||
|
|
Loading…
Reference in New Issue