StreetLight
/
libxkbcommon
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Move some definitions from expr.h to expr.c 

Signed-off-by: Daniel Stone <daniel@fooishbar.org>
master
Daniel Stone 2012-02-20 16:59:51 +00:00
parent 90d86c360a
commit 55e058f856
2 changed files with 17 additions and 34 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
src/xkbcomp/expr.c
View File

@ -34,6 +34,21 @@
/***====================================================================***/ /***====================================================================***/
typedef Bool(*IdentLookupFunc) (char * /* priv */ ,
uint32_t /* field */ ,
unsigned /* type */ ,
ExprResult * /* val_rtrn */
);
typedef struct _LookupPriv
{
char * priv;
IdentLookupFunc chain;
char * chainPriv;
} LookupPriv;
/***====================================================================***/
char * char *
exprOpText(unsigned type) exprOpText(unsigned type)
{ {
@ -155,7 +170,7 @@ ExprResolveLhs(ExprDef * expr,
return False; return False;
} }
Bool static Bool
SimpleLookup(char * priv, uint32_t field, unsigned type, SimpleLookup(char * priv, uint32_t field, unsigned type,
ExprResult * val_rtrn) ExprResult * val_rtrn)
{ {
@ -182,7 +197,7 @@ SimpleLookup(char * priv, uint32_t field, unsigned type,
return False; return False;
} }
Bool static Bool
RadioLookup(char * priv, uint32_t field, unsigned type, ExprResult * val_rtrn) RadioLookup(char * priv, uint32_t field, unsigned type, ExprResult * val_rtrn)
{ {
const char *str; const char *str;

32
src/xkbcomp/expr.h
View File

@ -35,54 +35,22 @@ typedef union _ExprResult
struct xkb_key_name keyName; struct xkb_key_name keyName;
} ExprResult; } ExprResult;
typedef Bool(*IdentLookupFunc) (char * /* priv */ ,
uint32_t /* field */ ,
unsigned /* type */ ,
ExprResult * /* val_rtrn */
);
extern int ExprResolveLhs(ExprDef * /* expr */ , extern int ExprResolveLhs(ExprDef * /* expr */ ,
ExprResult * /* elem_rtrn */ , ExprResult * /* elem_rtrn */ ,
ExprResult * /* field_rtrn */ , ExprResult * /* field_rtrn */ ,
ExprDef ** /* index_rtrn */ ExprDef ** /* index_rtrn */
); );
typedef struct _LookupPriv
{
char * priv;
IdentLookupFunc chain;
char * chainPriv;
} LookupPriv;
typedef struct _LookupEntry typedef struct _LookupEntry
{ {
const char *name; const char *name;
unsigned result; unsigned result;
} LookupEntry; } LookupEntry;
typedef struct _LookupTable
{
char *element;
LookupEntry *entries;
struct _LookupTable *nextElement;
} LookupTable;
extern char *exprOpText(unsigned /* type */ extern char *exprOpText(unsigned /* type */
); );
extern int RadioLookup(char * /* priv */ ,
uint32_t /* field */ ,
unsigned /* type */ ,
ExprResult * /* val_rtrn */
);
extern int SimpleLookup(char * /* priv */ ,
uint32_t /* field */ ,
unsigned /* type */ ,
ExprResult * /* val_rtrn */
);
extern int LookupModIndex(char * /* priv */ , extern int LookupModIndex(char * /* priv */ ,
uint32_t /* field */ , uint32_t /* field */ ,
unsigned /* type */ , unsigned /* type */ ,