diff options
Diffstat (limited to 'src/3rdparty/xkbcommon/src/xkbcomp')
21 files changed, 1632 insertions, 3982 deletions
diff --git a/src/3rdparty/xkbcommon/src/xkbcomp/action.c b/src/3rdparty/xkbcommon/src/xkbcomp/action.c index 88323f9952..2bd0bd1589 100644 --- a/src/3rdparty/xkbcommon/src/xkbcomp/action.c +++ b/src/3rdparty/xkbcommon/src/xkbcomp/action.c @@ -56,18 +56,22 @@ #include "expr.h" #include "action.h" -static const ExprDef constTrue = { - .common = { .type = STMT_EXPR, .next = NULL }, - .op = EXPR_VALUE, - .value_type = EXPR_TYPE_BOOLEAN, - .value = { .ival = 1 }, +static const ExprBoolean constTrue = { + .expr = { + .common = { .type = STMT_EXPR, .next = NULL }, + .op = EXPR_VALUE, + .value_type = EXPR_TYPE_BOOLEAN, + }, + .set = true, }; -static const ExprDef constFalse = { - .common = { .type = STMT_EXPR, .next = NULL }, - .op = EXPR_VALUE, - .value_type = EXPR_TYPE_BOOLEAN, - .value = { .ival = 0 }, +static const ExprBoolean constFalse = { + .expr = { + .common = { .type = STMT_EXPR, .next = NULL }, + .op = EXPR_VALUE, + .value_type = EXPR_TYPE_BOOLEAN, + }, + .set = false, }; enum action_field { @@ -214,17 +218,6 @@ ReportActionNotArray(struct xkb_keymap *keymap, enum xkb_action_type action, return false; } -static inline bool -ReportNotFound(struct xkb_keymap *keymap, enum xkb_action_type action, - enum action_field field, const char *what, const char *bad) -{ - log_err(keymap->ctx, - "%s named %s not found; " - "Ignoring the %s field of an %s action\n", - what, bad, fieldText(field), ActionTypeText(action)); - return false; -} - static bool HandleNoAction(struct xkb_keymap *keymap, union xkb_action *action, enum action_field field, const ExprDef *array_ndx, @@ -265,9 +258,9 @@ CheckModifierField(struct xkb_keymap *keymap, enum xkb_action_type action, const ExprDef *value, enum xkb_action_flags *flags_inout, xkb_mod_mask_t *mods_rtrn) { - if (value->op == EXPR_IDENT) { + if (value->expr.op == EXPR_IDENT) { const char *valStr; - valStr = xkb_atom_text(keymap->ctx, value->value.str); + valStr = xkb_atom_text(keymap->ctx, value->ident.ident); if (valStr && (istreq(valStr, "usemodmapmods") || istreq(valStr, "modmapmods"))) { @@ -367,9 +360,9 @@ CheckGroupField(struct xkb_keymap *keymap, unsigned action, { const ExprDef *spec; - if (value->op == EXPR_NEGATE || value->op == EXPR_UNARY_PLUS) { + if (value->expr.op == EXPR_NEGATE || value->expr.op == EXPR_UNARY_PLUS) { *flags_inout &= ~ACTION_ABSOLUTE_SWITCH; - spec = value->value.child; + spec = value->unary.child; } else { *flags_inout |= ACTION_ABSOLUTE_SWITCH; @@ -380,9 +373,9 @@ CheckGroupField(struct xkb_keymap *keymap, unsigned action, return ReportMismatch(keymap, action, ACTION_FIELD_GROUP, "integer (range 1..8)"); - if (value->op == EXPR_NEGATE) + if (value->expr.op == EXPR_NEGATE) *grp_rtrn = -*grp_rtrn; - else if (value->op != EXPR_UNARY_PLUS) + else if (value->expr.op != EXPR_UNARY_PLUS) (*grp_rtrn)--; return true; @@ -464,18 +457,14 @@ HandleMovePtr(struct xkb_keymap *keymap, union xkb_action *action, const ExprDef *value) { struct xkb_pointer_action *act = &action->ptr; - bool absolute; if (array_ndx && (field == ACTION_FIELD_X || field == ACTION_FIELD_Y)) return ReportActionNotArray(keymap, action->type, field); if (field == ACTION_FIELD_X || field == ACTION_FIELD_Y) { int val; - - if (value->op == EXPR_NEGATE || value->op == EXPR_UNARY_PLUS) - absolute = false; - else - absolute = true; + const bool absolute = (value->expr.op != EXPR_NEGATE && + value->expr.op != EXPR_UNARY_PLUS); if (!ExprResolveInteger(keymap->ctx, value, &val)) return ReportMismatch(keymap, action->type, field, "integer"); @@ -613,9 +602,10 @@ HandleSetPtrDflt(struct xkb_keymap *keymap, union xkb_action *action, if (array_ndx) return ReportActionNotArray(keymap, action->type, field); - if (value->op == EXPR_NEGATE || value->op == EXPR_UNARY_PLUS) { + if (value->expr.op == EXPR_NEGATE || + value->expr.op == EXPR_UNARY_PLUS) { act->flags &= ~ACTION_ABSOLUTE_SWITCH; - button = value->value.child; + button = value->unary.child; } else { act->flags |= ACTION_ABSOLUTE_SWITCH; @@ -639,7 +629,7 @@ HandleSetPtrDflt(struct xkb_keymap *keymap, union xkb_action *action, return false; } - act->value = (value->op == EXPR_NEGATE ? -btn: btn); + act->value = (value->expr.op == EXPR_NEGATE ? -btn: btn); return true; } @@ -660,9 +650,10 @@ HandleSwitchScreen(struct xkb_keymap *keymap, union xkb_action *action, if (array_ndx) return ReportActionNotArray(keymap, action->type, field); - if (value->op == EXPR_NEGATE || value->op == EXPR_UNARY_PLUS) { + if (value->expr.op == EXPR_NEGATE || + value->expr.op == EXPR_UNARY_PLUS) { act->flags &= ~ACTION_ABSOLUTE_SWITCH; - scrn = value->value.child; + scrn = value->unary.child; } else { act->flags |= ACTION_ABSOLUTE_SWITCH; @@ -680,7 +671,7 @@ HandleSwitchScreen(struct xkb_keymap *keymap, union xkb_action *action, return false; } - act->screen = (value->op == EXPR_NEGATE ? -val : val); + act->screen = (value->expr.op == EXPR_NEGATE ? -val : val); return true; } else if (field == ACTION_FIELD_SAME) { @@ -861,13 +852,13 @@ HandleActionDef(ExprDef *def, struct xkb_keymap *keymap, const char *str; unsigned handler_type; - if (def->op != EXPR_ACTION_DECL) { + if (def->expr.op != EXPR_ACTION_DECL) { log_err(keymap->ctx, "Expected an action definition, found %s\n", - expr_op_type_to_string(def->op)); + expr_op_type_to_string(def->expr.op)); return false; } - str = xkb_atom_text(keymap->ctx, def->value.action.name); + str = xkb_atom_text(keymap->ctx, def->action.name); if (!stringToAction(str, &handler_type)) { log_err(keymap->ctx, "Unknown action %s\n", str); return false; @@ -885,24 +876,24 @@ HandleActionDef(ExprDef *def, struct xkb_keymap *keymap, * particular instance, e.g. "modifiers" and "clearLocks" in: * SetMods(modifiers=Alt,clearLocks); */ - for (arg = def->value.action.args; arg != NULL; + for (arg = def->action.args; arg != NULL; arg = (ExprDef *) arg->common.next) { const ExprDef *value; ExprDef *field, *arrayRtrn; const char *elemRtrn, *fieldRtrn; enum action_field fieldNdx; - if (arg->op == EXPR_ASSIGN) { - field = arg->value.binary.left; - value = arg->value.binary.right; + if (arg->expr.op == EXPR_ASSIGN) { + field = arg->binary.left; + value = arg->binary.right; } - else if (arg->op == EXPR_NOT || arg->op == EXPR_INVERT) { - field = arg->value.child; - value = &constFalse; + else if (arg->expr.op == EXPR_NOT || arg->expr.op == EXPR_INVERT) { + field = arg->unary.child; + value = (const ExprDef *) &constFalse; } else { field = arg; - value = &constTrue; + value = (const ExprDef *) &constTrue; } if (!ExprResolveLhs(keymap->ctx, field, &elemRtrn, &fieldRtrn, diff --git a/src/3rdparty/xkbcommon/src/xkbcomp/ast-build.c b/src/3rdparty/xkbcommon/src/xkbcomp/ast-build.c index c9b7cb0a3e..d470884e78 100644 --- a/src/3rdparty/xkbcommon/src/xkbcomp/ast-build.c +++ b/src/3rdparty/xkbcommon/src/xkbcomp/ast-build.c @@ -70,57 +70,173 @@ AppendStmt(ParseCommon *to, ParseCommon *append) return to; } -ExprDef * -ExprCreate(enum expr_op_type op, enum expr_value_type type) +static ExprDef * +ExprCreate(enum expr_op_type op, enum expr_value_type type, size_t size) { - ExprDef *expr = malloc(sizeof(*expr)); + ExprDef *expr = malloc(size); if (!expr) return NULL; expr->common.type = STMT_EXPR; expr->common.next = NULL; - expr->op = op; - expr->value_type = type; + expr->expr.op = op; + expr->expr.value_type = type; return expr; } +#define EXPR_CREATE(type_, name_, op_, value_type_) \ + ExprDef *name_ = ExprCreate(op_, value_type_, sizeof(type_)); \ + if (!name_) \ + return NULL; + +ExprDef * +ExprCreateString(xkb_atom_t str) +{ + EXPR_CREATE(ExprString, expr, EXPR_VALUE, EXPR_TYPE_STRING); + expr->string.str = str; + return expr; +} + +ExprDef * +ExprCreateInteger(int ival) +{ + EXPR_CREATE(ExprInteger, expr, EXPR_VALUE, EXPR_TYPE_INT); + expr->integer.ival = ival; + return expr; +} + +ExprDef * +ExprCreateBoolean(bool set) +{ + EXPR_CREATE(ExprBoolean, expr, EXPR_VALUE, EXPR_TYPE_BOOLEAN); + expr->boolean.set = set; + return expr; +} + +ExprDef * +ExprCreateKeyName(xkb_atom_t key_name) +{ + EXPR_CREATE(ExprKeyName, expr, EXPR_VALUE, EXPR_TYPE_KEYNAME); + expr->key_name.key_name = key_name; + return expr; +} + +ExprDef * +ExprCreateIdent(xkb_atom_t ident) +{ + EXPR_CREATE(ExprIdent, expr, EXPR_IDENT, EXPR_TYPE_UNKNOWN); + expr->ident.ident = ident; + return expr; +} + ExprDef * ExprCreateUnary(enum expr_op_type op, enum expr_value_type type, ExprDef *child) { - ExprDef *expr = malloc(sizeof(*expr)); - if (!expr) - return NULL; + EXPR_CREATE(ExprUnary, expr, op, type); + expr->unary.child = child; + return expr; +} - expr->common.type = STMT_EXPR; - expr->common.next = NULL; - expr->op = op; - expr->value_type = type; - expr->value.child = child; +ExprDef * +ExprCreateBinary(enum expr_op_type op, ExprDef *left, ExprDef *right) +{ + EXPR_CREATE(ExprBinary, expr, op, EXPR_TYPE_UNKNOWN); + + if (op == EXPR_ASSIGN || left->expr.value_type == EXPR_TYPE_UNKNOWN) + expr->expr.value_type = right->expr.value_type; + else if (left->expr.value_type == right->expr.value_type || + right->expr.value_type == EXPR_TYPE_UNKNOWN) + expr->expr.value_type = left->expr.value_type; + expr->binary.left = left; + expr->binary.right = right; return expr; } ExprDef * -ExprCreateBinary(enum expr_op_type op, ExprDef *left, ExprDef *right) +ExprCreateFieldRef(xkb_atom_t element, xkb_atom_t field) { - ExprDef *expr = malloc(sizeof(*expr)); - if (!expr) - return NULL; + EXPR_CREATE(ExprFieldRef, expr, EXPR_FIELD_REF, EXPR_TYPE_UNKNOWN); + expr->field_ref.element = element; + expr->field_ref.field = field; + return expr; +} - expr->common.type = STMT_EXPR; - expr->common.next = NULL; - expr->op = op; - if (op == EXPR_ASSIGN || left->value_type == EXPR_TYPE_UNKNOWN) - expr->value_type = right->value_type; - else if (left->value_type == right->value_type || - right->value_type == EXPR_TYPE_UNKNOWN) - expr->value_type = left->value_type; - else - expr->value_type = EXPR_TYPE_UNKNOWN; - expr->value.binary.left = left; - expr->value.binary.right = right; +ExprDef * +ExprCreateArrayRef(xkb_atom_t element, xkb_atom_t field, ExprDef *entry) +{ + EXPR_CREATE(ExprArrayRef, expr, EXPR_ARRAY_REF, EXPR_TYPE_UNKNOWN); + expr->array_ref.element = element; + expr->array_ref.field = field; + expr->array_ref.entry = entry; + return expr; +} + +ExprDef * +ExprCreateAction(xkb_atom_t name, ExprDef *args) +{ + EXPR_CREATE(ExprAction, expr, EXPR_ACTION_DECL, EXPR_TYPE_UNKNOWN); + expr->action.name = name; + expr->action.args = args; + return expr; +} + +ExprDef * +ExprCreateKeysymList(xkb_keysym_t sym) +{ + EXPR_CREATE(ExprKeysymList, expr, EXPR_KEYSYM_LIST, EXPR_TYPE_SYMBOLS); + + darray_init(expr->keysym_list.syms); + darray_init(expr->keysym_list.symsMapIndex); + darray_init(expr->keysym_list.symsNumEntries); + + darray_append(expr->keysym_list.syms, sym); + darray_append(expr->keysym_list.symsMapIndex, 0); + darray_append(expr->keysym_list.symsNumEntries, 1); + + return expr; +} + +ExprDef * +ExprCreateMultiKeysymList(ExprDef *expr) +{ + size_t nLevels = darray_size(expr->keysym_list.symsMapIndex); + + darray_resize(expr->keysym_list.symsMapIndex, 1); + darray_resize(expr->keysym_list.symsNumEntries, 1); + darray_item(expr->keysym_list.symsMapIndex, 0) = 0; + darray_item(expr->keysym_list.symsNumEntries, 0) = nLevels; + + return expr; +} + +ExprDef * +ExprAppendKeysymList(ExprDef *expr, xkb_keysym_t sym) +{ + size_t nSyms = darray_size(expr->keysym_list.syms); + + darray_append(expr->keysym_list.symsMapIndex, nSyms); + darray_append(expr->keysym_list.symsNumEntries, 1); + darray_append(expr->keysym_list.syms, sym); + + return expr; +} + +ExprDef * +ExprAppendMultiKeysymList(ExprDef *expr, ExprDef *append) +{ + size_t nSyms = darray_size(expr->keysym_list.syms); + size_t numEntries = darray_size(append->keysym_list.syms); + + darray_append(expr->keysym_list.symsMapIndex, nSyms); + darray_append(expr->keysym_list.symsNumEntries, numEntries); + darray_append_items(expr->keysym_list.syms, + darray_mem(append->keysym_list.syms, 0), numEntries); + + darray_resize(append->keysym_list.syms, 0); + FreeStmt(&append->common); return expr; } @@ -186,22 +302,14 @@ VarCreate(ExprDef *name, ExprDef *value) } VarDef * -BoolVarCreate(xkb_atom_t nameToken, unsigned set) +BoolVarCreate(xkb_atom_t ident, bool set) { - ExprDef *name, *value; - VarDef *def; - - name = ExprCreate(EXPR_IDENT, EXPR_TYPE_UNKNOWN); - name->value.str = nameToken; - value = ExprCreate(EXPR_VALUE, EXPR_TYPE_BOOLEAN); - value->value.uval = set; - def = VarCreate(name, value); - - return def; + return VarCreate((ExprDef *) ExprCreateIdent(ident), + (ExprDef *) ExprCreateBoolean(set)); } InterpDef * -InterpCreate(char *sym, ExprDef *match) +InterpCreate(xkb_keysym_t sym, ExprDef *match) { InterpDef *def = malloc(sizeof(*def)); if (!def) @@ -232,7 +340,7 @@ KeyTypeCreate(xkb_atom_t name, VarDef *body) } SymbolsDef * -SymbolsCreate(xkb_atom_t keyName, ExprDef *symbols) +SymbolsCreate(xkb_atom_t keyName, VarDef *symbols) { SymbolsDef *def = malloc(sizeof(*def)); if (!def) @@ -312,83 +420,6 @@ LedNameCreate(int ndx, ExprDef *name, bool virtual) return def; } -ExprDef * -ActionCreate(xkb_atom_t name, ExprDef *args) -{ - ExprDef *act = malloc(sizeof(*act)); - if (!act) - return NULL; - - act->common.type = STMT_EXPR; - act->common.next = NULL; - act->op = EXPR_ACTION_DECL; - act->value.action.name = name; - act->value.action.args = args; - - return act; -} - -ExprDef * -CreateKeysymList(char *sym) -{ - ExprDef *def; - - def = ExprCreate(EXPR_KEYSYM_LIST, EXPR_TYPE_SYMBOLS); - - darray_init(def->value.list.syms); - darray_init(def->value.list.symsMapIndex); - darray_init(def->value.list.symsNumEntries); - - darray_append(def->value.list.syms, sym); - darray_append(def->value.list.symsMapIndex, 0); - darray_append(def->value.list.symsNumEntries, 1); - - return def; -} - -ExprDef * -CreateMultiKeysymList(ExprDef *list) -{ - size_t nLevels = darray_size(list->value.list.symsMapIndex); - - darray_resize(list->value.list.symsMapIndex, 1); - darray_resize(list->value.list.symsNumEntries, 1); - darray_item(list->value.list.symsMapIndex, 0) = 0; - darray_item(list->value.list.symsNumEntries, 0) = nLevels; - - return list; -} - -ExprDef * -AppendKeysymList(ExprDef *list, char *sym) -{ - size_t nSyms = darray_size(list->value.list.syms); - - darray_append(list->value.list.symsMapIndex, nSyms); - darray_append(list->value.list.symsNumEntries, 1); - darray_append(list->value.list.syms, sym); - - return list; -} - -ExprDef * -AppendMultiKeysymList(ExprDef *list, ExprDef *append) -{ - size_t nSyms = darray_size(list->value.list.syms); - size_t numEntries = darray_size(append->value.list.syms); - - darray_append(list->value.list.symsMapIndex, nSyms); - darray_append(list->value.list.symsNumEntries, numEntries); - darray_append_items(list->value.list.syms, - darray_mem(append->value.list.syms, 0), - numEntries); - - darray_resize(append->value.list.syms, 0); - FreeStmt(&append->common); - - return list; -} - static void FreeInclude(IncludeStmt *incl); @@ -464,30 +495,6 @@ err: return NULL; } -static void -EscapeMapName(char *name) -{ - /* - * All latin-1 alphanumerics, plus parens, slash, minus, underscore and - * wildcards. - */ - static const unsigned char legal[] = { - 0x00, 0x00, 0x00, 0x00, 0x00, 0xa7, 0xff, 0x83, - 0xfe, 0xff, 0xff, 0x87, 0xfe, 0xff, 0xff, 0x07, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0xff, 0xff, 0x7f, 0xff, 0xff, 0xff, 0x7f, 0xff - }; - - if (!name) - return; - - while (*name) { - if (!(legal[*name / 8] & (1 << (*name % 8)))) - *name = '_'; - name++; - } -} - XkbFile * XkbFileCreate(struct xkb_context *ctx, enum xkb_file_type type, char *name, ParseCommon *defs, enum xkb_map_flags flags) @@ -498,7 +505,7 @@ XkbFileCreate(struct xkb_context *ctx, enum xkb_file_type type, char *name, if (!file) return NULL; - EscapeMapName(name); + XkbEscapeMapName(name); file->file_type = type; file->topName = strdup_safe(name); file->name = name; @@ -549,18 +556,16 @@ err: static void FreeExpr(ExprDef *expr) { - char **sym; - if (!expr) return; - switch (expr->op) { + switch (expr->expr.op) { case EXPR_ACTION_LIST: case EXPR_NEGATE: case EXPR_UNARY_PLUS: case EXPR_NOT: case EXPR_INVERT: - FreeStmt(&expr->value.child->common); + FreeStmt(&expr->unary.child->common); break; case EXPR_DIVIDE: @@ -568,24 +573,22 @@ FreeExpr(ExprDef *expr) case EXPR_SUBTRACT: case EXPR_MULTIPLY: case EXPR_ASSIGN: - FreeStmt(&expr->value.binary.left->common); - FreeStmt(&expr->value.binary.right->common); + FreeStmt(&expr->binary.left->common); + FreeStmt(&expr->binary.right->common); break; case EXPR_ACTION_DECL: - FreeStmt(&expr->value.action.args->common); + FreeStmt(&expr->action.args->common); break; case EXPR_ARRAY_REF: - FreeStmt(&expr->value.array.entry->common); + FreeStmt(&expr->array_ref.entry->common); break; case EXPR_KEYSYM_LIST: - darray_foreach(sym, expr->value.list.syms) - free(*sym); - darray_free(expr->value.list.syms); - darray_free(expr->value.list.symsMapIndex); - darray_free(expr->value.list.symsNumEntries); + darray_free(expr->keysym_list.syms); + darray_free(expr->keysym_list.symsMapIndex); + darray_free(expr->keysym_list.symsNumEntries); break; default: @@ -640,7 +643,6 @@ FreeStmt(ParseCommon *stmt) FreeStmt(&u.keyType->body->common); break; case STMT_INTERP: - free(u.interp->sym); FreeStmt(&u.interp->match->common); FreeStmt(&u.interp->def->common); break; diff --git a/src/3rdparty/xkbcommon/src/xkbcomp/ast-build.h b/src/3rdparty/xkbcommon/src/xkbcomp/ast-build.h index 0ecd124145..8146b066d1 100644 --- a/src/3rdparty/xkbcommon/src/xkbcomp/ast-build.h +++ b/src/3rdparty/xkbcommon/src/xkbcomp/ast-build.h @@ -31,7 +31,19 @@ ParseCommon * AppendStmt(ParseCommon *to, ParseCommon *append); ExprDef * -ExprCreate(enum expr_op_type op, enum expr_value_type type); +ExprCreateString(xkb_atom_t str); + +ExprDef * +ExprCreateInteger(int ival); + +ExprDef * +ExprCreateBoolean(bool set); + +ExprDef * +ExprCreateKeyName(xkb_atom_t key_name); + +ExprDef * +ExprCreateIdent(xkb_atom_t ident); ExprDef * ExprCreateUnary(enum expr_op_type op, enum expr_value_type type, @@ -40,6 +52,27 @@ ExprCreateUnary(enum expr_op_type op, enum expr_value_type type, ExprDef * ExprCreateBinary(enum expr_op_type op, ExprDef *left, ExprDef *right); +ExprDef * +ExprCreateFieldRef(xkb_atom_t element, xkb_atom_t field); + +ExprDef * +ExprCreateArrayRef(xkb_atom_t element, xkb_atom_t field, ExprDef *entry); + +ExprDef * +ExprCreateAction(xkb_atom_t name, ExprDef *args); + +ExprDef * +ExprCreateMultiKeysymList(ExprDef *list); + +ExprDef * +ExprCreateKeysymList(xkb_keysym_t sym); + +ExprDef * +ExprAppendMultiKeysymList(ExprDef *list, ExprDef *append); + +ExprDef * +ExprAppendKeysymList(ExprDef *list, xkb_keysym_t sym); + KeycodeDef * KeycodeCreate(xkb_atom_t name, int64_t value); @@ -53,16 +86,16 @@ VarDef * VarCreate(ExprDef *name, ExprDef *value); VarDef * -BoolVarCreate(xkb_atom_t nameToken, unsigned set); +BoolVarCreate(xkb_atom_t ident, bool set); InterpDef * -InterpCreate(char *sym, ExprDef *match); +InterpCreate(xkb_keysym_t sym, ExprDef *match); KeyTypeDef * KeyTypeCreate(xkb_atom_t name, VarDef *body); SymbolsDef * -SymbolsCreate(xkb_atom_t keyName, ExprDef *symbols); +SymbolsCreate(xkb_atom_t keyName, VarDef *symbols); GroupCompatDef * GroupCompatCreate(int group, ExprDef *def); @@ -76,27 +109,12 @@ LedMapCreate(xkb_atom_t name, VarDef *body); LedNameDef * LedNameCreate(int ndx, ExprDef *name, bool virtual); -ExprDef * -ActionCreate(xkb_atom_t name, ExprDef *args); - -ExprDef * -CreateMultiKeysymList(ExprDef *list); - -ExprDef * -CreateKeysymList(char *sym); - -ExprDef * -AppendMultiKeysymList(ExprDef *list, ExprDef *append); - -ExprDef * -AppendKeysymList(ExprDef *list, char *sym); - IncludeStmt * IncludeCreate(struct xkb_context *ctx, char *str, enum merge_mode merge); XkbFile * XkbFileCreate(struct xkb_context *ctx, enum xkb_file_type type, char *name, - ParseCommon *defs, unsigned flags); + ParseCommon *defs, enum xkb_map_flags flags); void FreeStmt(ParseCommon *stmt); diff --git a/src/3rdparty/xkbcommon/src/xkbcomp/ast.h b/src/3rdparty/xkbcommon/src/xkbcomp/ast.h index c430a772ae..489b33193c 100644 --- a/src/3rdparty/xkbcommon/src/xkbcomp/ast.h +++ b/src/3rdparty/xkbcommon/src/xkbcomp/ast.h @@ -143,9 +143,11 @@ expr_op_type_to_string(enum expr_op_type type); const char * expr_value_type_to_string(enum expr_value_type type); -typedef struct _ParseCommon { - enum stmt_type type; +/* This struct contains fields common to all other AST nodes. It is only + * ever embedded in other structs, so save some memory by packing it. */ +typedef struct ATTR_PACKED _ParseCommon { struct _ParseCommon *next; + enum stmt_type type; } ParseCommon; typedef struct _IncludeStmt { @@ -158,40 +160,92 @@ typedef struct _IncludeStmt { struct _IncludeStmt *next_incl; } IncludeStmt; -typedef struct _Expr { +typedef struct { ParseCommon common; enum expr_op_type op; enum expr_value_type value_type; - union { - struct { - struct _Expr *left; - struct _Expr *right; - } binary; - struct { - xkb_atom_t element; - xkb_atom_t field; - } field; - struct { - xkb_atom_t element; - xkb_atom_t field; - struct _Expr *entry; - } array; - struct { - xkb_atom_t name; - struct _Expr *args; - } action; - struct { - darray(char *) syms; - darray(int) symsMapIndex; - darray(unsigned int) symsNumEntries; - } list; - struct _Expr *child; - xkb_atom_t str; - unsigned uval; - int ival; - xkb_atom_t keyName; - } value; -} ExprDef; +} ExprCommon; + +typedef union ExprDef ExprDef; + +typedef struct { + ExprCommon expr; + xkb_atom_t ident; +} ExprIdent; + +typedef struct { + ExprCommon expr; + xkb_atom_t str; +} ExprString; + +typedef struct { + ExprCommon expr; + bool set; +} ExprBoolean; + +typedef struct { + ExprCommon expr; + int ival; +} ExprInteger; + +typedef struct { + ExprCommon expr; + xkb_atom_t key_name; +} ExprKeyName; + +typedef struct { + ExprCommon expr; + ExprDef *left; + ExprDef *right; +} ExprBinary; + +typedef struct { + ExprCommon expr; + ExprDef *child; +} ExprUnary; + +typedef struct { + ExprCommon expr; + xkb_atom_t element; + xkb_atom_t field; +} ExprFieldRef; + +typedef struct { + ExprCommon expr; + xkb_atom_t element; + xkb_atom_t field; + ExprDef *entry; +} ExprArrayRef; + +typedef struct { + ExprCommon expr; + xkb_atom_t name; + ExprDef *args; +} ExprAction; + +typedef struct { + ExprCommon expr; + darray(xkb_keysym_t) syms; + darray(int) symsMapIndex; + darray(unsigned int) symsNumEntries; +} ExprKeysymList; + +union ExprDef { + ParseCommon common; + /* Maybe someday we can use C11 anonymous struct for ExprCommon here. */ + ExprCommon expr; + ExprIdent ident; + ExprString string; + ExprBoolean boolean; + ExprInteger integer; + ExprKeyName key_name; + ExprBinary binary; + ExprUnary unary; + ExprFieldRef field_ref; + ExprArrayRef array_ref; + ExprAction action; + ExprKeysymList keysym_list; +}; typedef struct { ParseCommon common; @@ -232,7 +286,7 @@ typedef struct { ParseCommon common; enum merge_mode merge; xkb_atom_t keyName; - ExprDef *symbols; + VarDef *symbols; } SymbolsDef; typedef struct { @@ -252,7 +306,7 @@ typedef struct { typedef struct { ParseCommon common; enum merge_mode merge; - char *sym; + xkb_keysym_t sym; ExprDef *match; VarDef *def; } InterpDef; diff --git a/src/3rdparty/xkbcommon/src/xkbcomp/compat.c b/src/3rdparty/xkbcommon/src/xkbcomp/compat.c index 5682895430..fffb2d34b2 100644 --- a/src/3rdparty/xkbcommon/src/xkbcomp/compat.c +++ b/src/3rdparty/xkbcommon/src/xkbcomp/compat.c @@ -432,19 +432,19 @@ ResolveStateAndPredicate(ExprDef *expr, enum xkb_match_operation *pred_rtrn, } *pred_rtrn = MATCH_EXACTLY; - if (expr->op == EXPR_ACTION_DECL) { + if (expr->expr.op == EXPR_ACTION_DECL) { const char *pred_txt = xkb_atom_text(info->keymap->ctx, - expr->value.action.name); + expr->action.name); if (!LookupString(symInterpretMatchMaskNames, pred_txt, pred_rtrn)) { log_err(info->keymap->ctx, "Illegal modifier predicate \"%s\"; Ignored\n", pred_txt); return false; } - expr = expr->value.action.args; + expr = expr->action.args; } - else if (expr->op == EXPR_IDENT) { + else if (expr->expr.op == EXPR_IDENT) { const char *pred_txt = xkb_atom_text(info->keymap->ctx, - expr->value.str); + expr->ident.ident); if (pred_txt && istreq(pred_txt, "any")) { *pred_rtrn = MATCH_ANY; *mods_rtrn = MOD_REAL_MASK_ALL; @@ -805,7 +805,7 @@ HandleInterpBody(CompatInfo *info, VarDef *def, SymInterpInfo *si) ExprDef *arrayNdx; for (; def; def = (VarDef *) def->common.next) { - if (def->name && def->name->op == EXPR_FIELD_REF) { + if (def->name && def->name->expr.op == EXPR_FIELD_REF) { log_err(info->keymap->ctx, "Cannot set a global default value from within an interpret statement; " "Move statements to the global file scope\n"); @@ -840,15 +840,7 @@ HandleInterpDef(CompatInfo *info, InterpDef *def, enum merge_mode merge) si = info->default_interp; si.merge = merge = (def->merge == MERGE_DEFAULT ? merge : def->merge); - - if (!LookupKeysym(def->sym, &si.interp.sym)) { - log_err(info->keymap->ctx, - "Could not resolve keysym %s; " - "Symbol interpretation ignored\n", - def->sym); - return false; - } - + si.interp.sym = def->sym; si.interp.match = pred; si.interp.mods = mods; @@ -941,7 +933,7 @@ HandleCompatMapFile(CompatInfo *info, XkbFile *file, enum merge_mode merge) break; default: log_err(info->keymap->ctx, - "Interpretation files may not include other types; " + "Compat files may not include other types; " "Ignoring %s\n", stmt_type_to_string(stmt->type)); ok = false; break; @@ -958,15 +950,21 @@ HandleCompatMapFile(CompatInfo *info, XkbFile *file, enum merge_mode merge) } } +/* Temporary struct for CopyInterps. */ +struct collect { + darray(struct xkb_sym_interpret) sym_interprets; +}; + static void -CopyInterps(CompatInfo *info, bool needSymbol, enum xkb_match_operation pred) +CopyInterps(CompatInfo *info, bool needSymbol, enum xkb_match_operation pred, + struct collect *collect) { SymInterpInfo *si; darray_foreach(si, info->interps) if (si->interp.match == pred && (si->interp.sym != XKB_KEY_NoSymbol) == needSymbol) - darray_append(info->keymap->sym_interprets, si->interp); + darray_append(collect->sym_interprets, si->interp); } static void @@ -1025,19 +1023,26 @@ static bool CopyCompatToKeymap(struct xkb_keymap *keymap, CompatInfo *info) { keymap->compat_section_name = strdup_safe(info->name); + XkbEscapeMapName(keymap->compat_section_name); if (!darray_empty(info->interps)) { + struct collect collect; + darray_init(collect.sym_interprets); + /* Most specific to least specific. */ - CopyInterps(info, true, MATCH_EXACTLY); - CopyInterps(info, true, MATCH_ALL); - CopyInterps(info, true, MATCH_NONE); - CopyInterps(info, true, MATCH_ANY); - CopyInterps(info, true, MATCH_ANY_OR_NONE); - CopyInterps(info, false, MATCH_EXACTLY); - CopyInterps(info, false, MATCH_ALL); - CopyInterps(info, false, MATCH_NONE); - CopyInterps(info, false, MATCH_ANY); - CopyInterps(info, false, MATCH_ANY_OR_NONE); + CopyInterps(info, true, MATCH_EXACTLY, &collect); + CopyInterps(info, true, MATCH_ALL, &collect); + CopyInterps(info, true, MATCH_NONE, &collect); + CopyInterps(info, true, MATCH_ANY, &collect); + CopyInterps(info, true, MATCH_ANY_OR_NONE, &collect); + CopyInterps(info, false, MATCH_EXACTLY, &collect); + CopyInterps(info, false, MATCH_ALL, &collect); + CopyInterps(info, false, MATCH_NONE, &collect); + CopyInterps(info, false, MATCH_ANY, &collect); + CopyInterps(info, false, MATCH_ANY_OR_NONE, &collect); + + keymap->num_sym_interprets = darray_size(collect.sym_interprets); + keymap->sym_interprets = darray_mem(collect.sym_interprets, 0); } CopyLedMapDefs(info); diff --git a/src/3rdparty/xkbcommon/src/xkbcomp/expr.c b/src/3rdparty/xkbcommon/src/xkbcomp/expr.c index dc64d7891f..ba71208f7e 100644 --- a/src/3rdparty/xkbcommon/src/xkbcomp/expr.c +++ b/src/3rdparty/xkbcommon/src/xkbcomp/expr.c @@ -37,26 +37,26 @@ ExprResolveLhs(struct xkb_context *ctx, const ExprDef *expr, const char **elem_rtrn, const char **field_rtrn, ExprDef **index_rtrn) { - switch (expr->op) { + switch (expr->expr.op) { case EXPR_IDENT: *elem_rtrn = NULL; - *field_rtrn = xkb_atom_text(ctx, expr->value.str); + *field_rtrn = xkb_atom_text(ctx, expr->ident.ident); *index_rtrn = NULL; return true; case EXPR_FIELD_REF: - *elem_rtrn = xkb_atom_text(ctx, expr->value.field.element); - *field_rtrn = xkb_atom_text(ctx, expr->value.field.field); + *elem_rtrn = xkb_atom_text(ctx, expr->field_ref.element); + *field_rtrn = xkb_atom_text(ctx, expr->field_ref.field); *index_rtrn = NULL; return true; case EXPR_ARRAY_REF: - *elem_rtrn = xkb_atom_text(ctx, expr->value.array.element); - *field_rtrn = xkb_atom_text(ctx, expr->value.array.field); - *index_rtrn = expr->value.array.entry; + *elem_rtrn = xkb_atom_text(ctx, expr->array_ref.element); + *field_rtrn = xkb_atom_text(ctx, expr->array_ref.field); + *index_rtrn = expr->array_ref.entry; return true; default: break; } - log_wsgo(ctx, "Unexpected operator %d in ResolveLhs\n", expr->op); + log_wsgo(ctx, "Unexpected operator %d in ResolveLhs\n", expr->expr.op); return false; } @@ -127,19 +127,19 @@ ExprResolveBoolean(struct xkb_context *ctx, const ExprDef *expr, bool ok = false; const char *ident; - switch (expr->op) { + switch (expr->expr.op) { case EXPR_VALUE: - if (expr->value_type != EXPR_TYPE_BOOLEAN) { + if (expr->expr.value_type != EXPR_TYPE_BOOLEAN) { log_err(ctx, "Found constant of type %s where boolean was expected\n", - expr_value_type_to_string(expr->value_type)); + expr_value_type_to_string(expr->expr.value_type)); return false; } - *set_rtrn = !!expr->value.ival; + *set_rtrn = expr->boolean.set; return true; case EXPR_IDENT: - ident = xkb_atom_text(ctx, expr->value.str); + ident = xkb_atom_text(ctx, expr->ident.ident); if (ident) { if (istreq(ident, "true") || istreq(ident, "yes") || @@ -154,14 +154,13 @@ ExprResolveBoolean(struct xkb_context *ctx, const ExprDef *expr, return true; } } - log_err(ctx, "Identifier \"%s\" of type boolean is unknown\n", - xkb_atom_text(ctx, expr->value.str)); + log_err(ctx, "Identifier \"%s\" of type boolean is unknown\n", ident); return false; case EXPR_FIELD_REF: log_err(ctx, "Default \"%s.%s\" of type boolean is unknown\n", - xkb_atom_text(ctx, expr->value.field.element), - xkb_atom_text(ctx, expr->value.field.field)); + xkb_atom_text(ctx, expr->field_ref.element), + xkb_atom_text(ctx, expr->field_ref.field)); return false; case EXPR_INVERT: @@ -178,11 +177,12 @@ ExprResolveBoolean(struct xkb_context *ctx, const ExprDef *expr, case EXPR_NEGATE: case EXPR_UNARY_PLUS: log_err(ctx, "%s of boolean values not permitted\n", - expr_op_type_to_string(expr->op)); + expr_op_type_to_string(expr->expr.op)); break; default: - log_wsgo(ctx, "Unknown operator %d in ResolveBoolean\n", expr->op); + log_wsgo(ctx, "Unknown operator %d in ResolveBoolean\n", + expr->expr.op); break; } @@ -194,32 +194,28 @@ ExprResolveKeyCode(struct xkb_context *ctx, const ExprDef *expr, xkb_keycode_t *kc) { xkb_keycode_t leftRtrn, rightRtrn; - ExprDef *left, *right; - switch (expr->op) { + switch (expr->expr.op) { case EXPR_VALUE: - if (expr->value_type != EXPR_TYPE_INT) { + if (expr->expr.value_type != EXPR_TYPE_INT) { log_err(ctx, "Found constant of type %s where an int was expected\n", - expr_value_type_to_string(expr->value_type)); + expr_value_type_to_string(expr->expr.value_type)); return false; } - *kc = expr->value.uval; + *kc = (xkb_keycode_t) expr->integer.ival; return true; case EXPR_ADD: case EXPR_SUBTRACT: case EXPR_MULTIPLY: case EXPR_DIVIDE: - left = expr->value.binary.left; - right = expr->value.binary.right; - - if (!ExprResolveKeyCode(ctx, left, &leftRtrn) || - !ExprResolveKeyCode(ctx, right, &rightRtrn)) + if (!ExprResolveKeyCode(ctx, expr->binary.left, &leftRtrn) || + !ExprResolveKeyCode(ctx, expr->binary.right, &rightRtrn)) return false; - switch (expr->op) { + switch (expr->expr.op) { case EXPR_ADD: *kc = leftRtrn + rightRtrn; break; @@ -245,19 +241,18 @@ ExprResolveKeyCode(struct xkb_context *ctx, const ExprDef *expr, return true; case EXPR_NEGATE: - left = expr->value.child; - if (!ExprResolveKeyCode(ctx, left, &leftRtrn)) + if (!ExprResolveKeyCode(ctx, expr->unary.child, &leftRtrn)) return false; *kc = ~leftRtrn; return true; case EXPR_UNARY_PLUS: - left = expr->value.child; - return ExprResolveKeyCode(ctx, left, kc); + return ExprResolveKeyCode(ctx, expr->unary.child, kc); default: - log_wsgo(ctx, "Unknown operator %d in ResolveKeyCode\n", expr->op); + log_wsgo(ctx, "Unknown operator %d in ResolveKeyCode\n", + expr->expr.op); break; } @@ -284,25 +279,25 @@ ExprResolveIntegerLookup(struct xkb_context *ctx, const ExprDef *expr, unsigned u; ExprDef *left, *right; - switch (expr->op) { + switch (expr->expr.op) { case EXPR_VALUE: - if (expr->value_type != EXPR_TYPE_INT) { + if (expr->expr.value_type != EXPR_TYPE_INT) { log_err(ctx, "Found constant of type %s where an int was expected\n", - expr_value_type_to_string(expr->value_type)); + expr_value_type_to_string(expr->expr.value_type)); return false; } - *val_rtrn = expr->value.ival; + *val_rtrn = expr->integer.ival; return true; case EXPR_IDENT: if (lookup) - ok = lookup(ctx, lookupPriv, expr->value.str, EXPR_TYPE_INT, &u); + ok = lookup(ctx, lookupPriv, expr->ident.ident, EXPR_TYPE_INT, &u); if (!ok) log_err(ctx, "Identifier \"%s\" of type int is unknown\n", - xkb_atom_text(ctx, expr->value.str)); + xkb_atom_text(ctx, expr->ident.ident)); else *val_rtrn = (int) u; @@ -310,21 +305,21 @@ ExprResolveIntegerLookup(struct xkb_context *ctx, const ExprDef *expr, case EXPR_FIELD_REF: log_err(ctx, "Default \"%s.%s\" of type int is unknown\n", - xkb_atom_text(ctx, expr->value.field.element), - xkb_atom_text(ctx, expr->value.field.field)); + xkb_atom_text(ctx, expr->field_ref.element), + xkb_atom_text(ctx, expr->field_ref.field)); return false; case EXPR_ADD: case EXPR_SUBTRACT: case EXPR_MULTIPLY: case EXPR_DIVIDE: - left = expr->value.binary.left; - right = expr->value.binary.right; + left = expr->binary.left; + right = expr->binary.right; if (!ExprResolveIntegerLookup(ctx, left, &l, lookup, lookupPriv) || !ExprResolveIntegerLookup(ctx, right, &r, lookup, lookupPriv)) return false; - switch (expr->op) { + switch (expr->expr.op) { case EXPR_ADD: *val_rtrn = l + r; break; @@ -357,20 +352,21 @@ ExprResolveIntegerLookup(struct xkb_context *ctx, const ExprDef *expr, case EXPR_INVERT: case EXPR_NEGATE: - left = expr->value.child; + left = expr->unary.child; if (!ExprResolveIntegerLookup(ctx, left, &l, lookup, lookupPriv)) return false; - *val_rtrn = (expr->op == EXPR_NEGATE ? -l : ~l); + *val_rtrn = (expr->expr.op == EXPR_NEGATE ? -l : ~l); return true; case EXPR_UNARY_PLUS: - left = expr->value.child; + left = expr->unary.child; return ExprResolveIntegerLookup(ctx, left, val_rtrn, lookup, lookupPriv); default: - log_wsgo(ctx, "Unknown operator %d in ResolveInteger\n", expr->op); + log_wsgo(ctx, "Unknown operator %d in ResolveInteger\n", + expr->expr.op); break; } @@ -445,26 +441,26 @@ bool ExprResolveString(struct xkb_context *ctx, const ExprDef *expr, xkb_atom_t *val_rtrn) { - switch (expr->op) { + switch (expr->expr.op) { case EXPR_VALUE: - if (expr->value_type != EXPR_TYPE_STRING) { + if (expr->expr.value_type != EXPR_TYPE_STRING) { log_err(ctx, "Found constant of type %s, expected a string\n", - expr_value_type_to_string(expr->value_type)); + expr_value_type_to_string(expr->expr.value_type)); return false; } - *val_rtrn = expr->value.str; + *val_rtrn = expr->string.str; return true; case EXPR_IDENT: log_err(ctx, "Identifier \"%s\" of type string not found\n", - xkb_atom_text(ctx, expr->value.str)); + xkb_atom_text(ctx, expr->ident.ident)); return false; case EXPR_FIELD_REF: log_err(ctx, "Default \"%s.%s\" of type string not found\n", - xkb_atom_text(ctx, expr->value.field.element), - xkb_atom_text(ctx, expr->value.field.field)); + xkb_atom_text(ctx, expr->field_ref.element), + xkb_atom_text(ctx, expr->field_ref.field)); return false; case EXPR_ADD: @@ -477,11 +473,12 @@ ExprResolveString(struct xkb_context *ctx, const ExprDef *expr, case EXPR_NOT: case EXPR_UNARY_PLUS: log_err(ctx, "%s of strings not permitted\n", - expr_op_type_to_string(expr->op)); + expr_op_type_to_string(expr->expr.op)); return false; default: - log_wsgo(ctx, "Unknown operator %d in ResolveString\n", expr->op); + log_wsgo(ctx, "Unknown operator %d in ResolveString\n", + expr->expr.op); break; } return false; @@ -491,16 +488,16 @@ bool ExprResolveEnum(struct xkb_context *ctx, const ExprDef *expr, unsigned int *val_rtrn, const LookupEntry *values) { - if (expr->op != EXPR_IDENT) { + if (expr->expr.op != EXPR_IDENT) { log_err(ctx, "Found a %s where an enumerated value was expected\n", - expr_op_type_to_string(expr->op)); + expr_op_type_to_string(expr->expr.op)); return false; } - if (!SimpleLookup(ctx, values, expr->value.str, EXPR_TYPE_INT, + if (!SimpleLookup(ctx, values, expr->ident.ident, EXPR_TYPE_INT, val_rtrn)) { log_err(ctx, "Illegal identifier %s; expected one of:\n", - xkb_atom_text(ctx, expr->value.str)); + xkb_atom_text(ctx, expr->ident.ident)); while (values && values->name) { log_err(ctx, "\t%s\n", values->name); @@ -523,29 +520,29 @@ ExprResolveMaskLookup(struct xkb_context *ctx, const ExprDef *expr, ExprDef *left, *right; const char *bogus = NULL; - switch (expr->op) { + switch (expr->expr.op) { case EXPR_VALUE: - if (expr->value_type != EXPR_TYPE_INT) { + if (expr->expr.value_type != EXPR_TYPE_INT) { log_err(ctx, "Found constant of type %s where a mask was expected\n", - expr_value_type_to_string(expr->value_type)); + expr_value_type_to_string(expr->expr.value_type)); return false; } - *val_rtrn = (unsigned int) expr->value.ival; + *val_rtrn = (unsigned int) expr->integer.ival; return true; case EXPR_IDENT: - ok = lookup(ctx, lookupPriv, expr->value.str, EXPR_TYPE_INT, + ok = lookup(ctx, lookupPriv, expr->ident.ident, EXPR_TYPE_INT, val_rtrn); if (!ok) log_err(ctx, "Identifier \"%s\" of type int is unknown\n", - xkb_atom_text(ctx, expr->value.str)); + xkb_atom_text(ctx, expr->ident.ident)); return ok; case EXPR_FIELD_REF: log_err(ctx, "Default \"%s.%s\" of type int is unknown\n", - xkb_atom_text(ctx, expr->value.field.element), - xkb_atom_text(ctx, expr->value.field.field)); + xkb_atom_text(ctx, expr->field_ref.element), + xkb_atom_text(ctx, expr->field_ref.field)); return false; case EXPR_ARRAY_REF: @@ -563,13 +560,13 @@ ExprResolveMaskLookup(struct xkb_context *ctx, const ExprDef *expr, case EXPR_SUBTRACT: case EXPR_MULTIPLY: case EXPR_DIVIDE: - left = expr->value.binary.left; - right = expr->value.binary.right; + left = expr->binary.left; + right = expr->binary.right; if (!ExprResolveMaskLookup(ctx, left, &l, lookup, lookupPriv) || !ExprResolveMaskLookup(ctx, right, &r, lookup, lookupPriv)) return false; - switch (expr->op) { + switch (expr->expr.op) { case EXPR_ADD: *val_rtrn = l | r; break; @@ -579,7 +576,7 @@ ExprResolveMaskLookup(struct xkb_context *ctx, const ExprDef *expr, case EXPR_MULTIPLY: case EXPR_DIVIDE: log_err(ctx, "Cannot %s masks; Illegal operation ignored\n", - (expr->op == EXPR_DIVIDE ? "divide" : "multiply")); + (expr->expr.op == EXPR_DIVIDE ? "divide" : "multiply")); return false; default: break; @@ -592,7 +589,7 @@ ExprResolveMaskLookup(struct xkb_context *ctx, const ExprDef *expr, break; case EXPR_INVERT: - left = expr->value.child; + left = expr->unary.child; if (!ExprResolveIntegerLookup(ctx, left, &v, lookup, lookupPriv)) return false; @@ -602,14 +599,15 @@ ExprResolveMaskLookup(struct xkb_context *ctx, const ExprDef *expr, case EXPR_UNARY_PLUS: case EXPR_NEGATE: case EXPR_NOT: - left = expr->value.child; + left = expr->unary.child; if (!ExprResolveIntegerLookup(ctx, left, &v, lookup, lookupPriv)) log_err(ctx, "The %s operator cannot be used with a mask\n", - (expr->op == EXPR_NEGATE ? "-" : "!")); + (expr->expr.op == EXPR_NEGATE ? "-" : "!")); return false; default: - log_wsgo(ctx, "Unknown operator %d in ResolveMask\n", expr->op); + log_wsgo(ctx, "Unknown operator %d in ResolveMask\n", + expr->expr.op); break; } @@ -638,9 +636,8 @@ ExprResolveKeySym(struct xkb_context *ctx, const ExprDef *expr, { int val; - if (expr->op == EXPR_IDENT) { - const char *str; - str = xkb_atom_text(ctx, expr->value.str); + if (expr->expr.op == EXPR_IDENT) { + const char *str = xkb_atom_text(ctx, expr->ident.ident); *sym_rtrn = xkb_keysym_from_name(str, 0); if (*sym_rtrn != XKB_KEY_NoSymbol) return true; @@ -652,7 +649,7 @@ ExprResolveKeySym(struct xkb_context *ctx, const ExprDef *expr, if (val < 0 || val >= 10) return false; - *sym_rtrn = ((xkb_keysym_t) val) + '0'; + *sym_rtrn = XKB_KEY_0 + (xkb_keysym_t) val; return true; } @@ -661,16 +658,17 @@ ExprResolveMod(struct xkb_keymap *keymap, const ExprDef *def, enum mod_type mod_type, xkb_mod_index_t *ndx_rtrn) { xkb_mod_index_t ndx; - xkb_atom_t name = def->value.str; + xkb_atom_t name; - if (def->op != EXPR_IDENT) { + if (def->expr.op != EXPR_IDENT) { log_err(keymap->ctx, "Cannot resolve virtual modifier: " "found %s where a virtual modifier name was expected\n", - expr_op_type_to_string(def->op)); + expr_op_type_to_string(def->expr.op)); return false; } + name = def->ident.ident; ndx = ModNameToIndex(keymap, name, mod_type); if (ndx == XKB_MOD_INVALID) { log_err(keymap->ctx, diff --git a/src/3rdparty/xkbcommon/src/xkbcomp/include.c b/src/3rdparty/xkbcommon/src/xkbcomp/include.c index b4a4014635..dc3f1e49bd 100644 --- a/src/3rdparty/xkbcommon/src/xkbcomp/include.c +++ b/src/3rdparty/xkbcommon/src/xkbcomp/include.c @@ -199,17 +199,34 @@ FindFileInXkbPath(struct xkb_context *ctx, const char *name, { unsigned int i; FILE *file = NULL; - char buf[PATH_MAX]; + char *buf = NULL; const char *typeDir; + size_t buf_size = 0, typeDirLen, name_len; typeDir = DirectoryForInclude(type); + typeDirLen = strlen(typeDir); + name_len = strlen(name); for (i = 0; i < xkb_context_num_include_paths(ctx); i++) { - int ret = snprintf(buf, sizeof(buf), "%s/%s/%s", - xkb_context_include_path_get(ctx, i), - typeDir, name); - if (ret >= (ssize_t) sizeof(buf)) { - log_err(ctx, "File name (%s/%s/%s) too long\n", + size_t new_buf_size = strlen(xkb_context_include_path_get(ctx, i)) + + typeDirLen + name_len + 3; + int ret; + if (new_buf_size > buf_size) { + void *buf_new = realloc(buf, new_buf_size); + if (buf_new) { + buf_size = new_buf_size; + buf = buf_new; + } else { + log_err(ctx, "Cannot realloc for name (%s/%s/%s)\n", + xkb_context_include_path_get(ctx, i), typeDir, name); + continue; + } + } + ret = snprintf(buf, buf_size, "%s/%s/%s", + xkb_context_include_path_get(ctx, i), + typeDir, name); + if (ret < 0) { + log_err(ctx, "snprintf error (%s/%s/%s)\n", xkb_context_include_path_get(ctx, i), typeDir, name); continue; } @@ -242,11 +259,14 @@ FindFileInXkbPath(struct xkb_context *ctx, const char *name, xkb_context_failed_include_path_get(ctx, i)); } + free(buf); return NULL; } if (pathRtrn) - *pathRtrn = strdup(buf); + *pathRtrn = buf; + else + free(buf); return file; } @@ -275,7 +295,7 @@ ProcessIncludeFile(struct xkb_context *ctx, IncludeStmt *stmt, if (xkb_file->file_type != file_type) { log_err(ctx, - "Include file wrong type (expected %s, got %s); " + "Include file of wrong type (expected %s, got %s); " "Include file \"%s\" ignored\n", xkb_file_type_to_string(file_type), xkb_file_type_to_string(xkb_file->file_type), stmt->file); diff --git a/src/3rdparty/xkbcommon/src/xkbcomp/keycodes.c b/src/3rdparty/xkbcommon/src/xkbcomp/keycodes.c index edc54c94f3..59916b7266 100644 --- a/src/3rdparty/xkbcommon/src/xkbcomp/keycodes.c +++ b/src/3rdparty/xkbcommon/src/xkbcomp/keycodes.c @@ -231,7 +231,10 @@ InitKeyNamesInfo(KeyNamesInfo *info, struct xkb_context *ctx) { memset(info, 0, sizeof(*info)); info->ctx = ctx; - info->min_key_code = XKB_KEYCODE_MAX; + info->min_key_code = XKB_KEYCODE_INVALID; +#if XKB_KEYCODE_INVALID < XKB_KEYCODE_MAX +#error "Hey, you can't be changing stuff like that." +#endif } static xkb_keycode_t @@ -604,16 +607,28 @@ CopyKeyNamesToKeymap(struct xkb_keymap *keymap, KeyNamesInfo *info) unsigned i; keymap->keycodes_section_name = strdup_safe(info->name); + XkbEscapeMapName(keymap->keycodes_section_name); - keymap->min_key_code = info->min_key_code; - keymap->max_key_code = info->max_key_code; + if (info->min_key_code != XKB_KEYCODE_INVALID) { + keymap->min_key_code = info->min_key_code; + keymap->max_key_code = info->max_key_code; + } + else { + /* + * If the keymap has no keys, let's just use the safest pair + * we know. + */ + keymap->min_key_code = 8; + keymap->max_key_code = 255; + } - /* Copy key names. */ - keymap->keys = calloc(info->max_key_code + 1, sizeof(*keymap->keys)); - for (kc = info->min_key_code; kc <= info->max_key_code; kc++) { + keymap->keys = calloc(keymap->max_key_code + 1, sizeof(*keymap->keys)); + for (kc = keymap->min_key_code; kc <= keymap->max_key_code; kc++) keymap->keys[kc].keycode = kc; + + /* Copy key names. */ + for (kc = info->min_key_code; kc <= info->max_key_code; kc++) keymap->keys[kc].name = darray_item(info->key_names, kc); - } /* * Do some sanity checking on the aliases. We can't do it before diff --git a/src/3rdparty/xkbcommon/src/xkbcomp/keymap-dump.c b/src/3rdparty/xkbcommon/src/xkbcomp/keymap-dump.c index 034a8c1af3..6b4c266ec0 100644 --- a/src/3rdparty/xkbcommon/src/xkbcomp/keymap-dump.c +++ b/src/3rdparty/xkbcommon/src/xkbcomp/keymap-dump.c @@ -157,17 +157,24 @@ write_keycodes(struct xkb_keymap *keymap, struct buf *buf) else write_buf(buf, "xkb_keycodes {\n"); + /* xkbcomp and X11 really want to see keymaps with a minimum of 8, and + * a maximum of at least 255, else XWayland really starts hating life. + * If this is a problem and people really need strictly bounded keymaps, + * we should probably control this with a flag. */ + write_buf(buf, "\tminimum = %u;\n", min(keymap->min_key_code, 8)); + write_buf(buf, "\tmaximum = %u;\n", max(keymap->max_key_code, 255)); + xkb_foreach_key(key, keymap) { if (key->name == XKB_ATOM_NONE) continue; - write_buf(buf, "\t%-20s = %d;\n", + write_buf(buf, "\t%-20s = %u;\n", KeyNameText(keymap->ctx, key->name), key->keycode); } darray_enumerate(idx, led, keymap->leds) if (led->name != XKB_ATOM_NONE) - write_buf(buf, "\tindicator %d = \"%s\";\n", + write_buf(buf, "\tindicator %u = \"%s\";\n", idx + 1, xkb_atom_text(keymap->ctx, led->name)); @@ -212,7 +219,7 @@ write_types(struct xkb_keymap *keymap, struct buf *buf) continue; str = ModMaskText(keymap, entry->mods.mods); - write_buf(buf, "\t\tmap[%s]= Level%d;\n", + write_buf(buf, "\t\tmap[%s]= Level%u;\n", str, entry->level + 1); if (entry->preserve.mods) @@ -222,7 +229,7 @@ write_types(struct xkb_keymap *keymap, struct buf *buf) for (xkb_level_index_t n = 0; n < type->num_levels; n++) if (type->level_names[n]) - write_buf(buf, "\t\tlevel_name[Level%d]= \"%s\";\n", n + 1, + write_buf(buf, "\t\tlevel_name[Level%u]= \"%s\";\n", n + 1, xkb_atom_text(keymap->ctx, type->level_names[n])); write_buf(buf, "\t};\n"); @@ -409,7 +416,6 @@ write_action(struct xkb_keymap *keymap, struct buf *buf, static bool write_compat(struct xkb_keymap *keymap, struct buf *buf) { - const struct xkb_sym_interpret *si; const struct xkb_led *led; if (keymap->compat_section_name) @@ -423,7 +429,9 @@ write_compat(struct xkb_keymap *keymap, struct buf *buf) write_buf(buf, "\tinterpret.useModMapMods= AnyLevel;\n"); write_buf(buf, "\tinterpret.repeat= False;\n"); - darray_foreach(si, keymap->sym_interprets) { + for (int i = 0; i < keymap->num_sym_interprets; i++) { + const struct xkb_sym_interpret *si = &keymap->sym_interprets[i]; + write_buf(buf, "\tinterpret %s+%s(%s) {\n", si->sym ? KeysymText(keymap->ctx, si->sym) : "Any", SIMatchText(si->match), @@ -610,7 +618,7 @@ write_symbols(struct xkb_keymap *keymap, struct buf *buf) for (group = 0; group < keymap->num_group_names; group++) if (keymap->group_names[group]) write_buf(buf, - "\tname[group%d]=\"%s\";\n", group + 1, + "\tname[group%u]=\"%s\";\n", group + 1, xkb_atom_text(keymap->ctx, keymap->group_names[group])); if (group > 0) write_buf(buf, "\n"); diff --git a/src/3rdparty/xkbcommon/src/xkbcomp/keymap.c b/src/3rdparty/xkbcommon/src/xkbcomp/keymap.c index bed3930be9..549cf05da6 100644 --- a/src/3rdparty/xkbcommon/src/xkbcomp/keymap.c +++ b/src/3rdparty/xkbcommon/src/xkbcomp/keymap.c @@ -78,7 +78,6 @@ static const struct xkb_sym_interpret * FindInterpForKey(struct xkb_keymap *keymap, const struct xkb_key *key, xkb_layout_index_t group, xkb_level_index_t level) { - const struct xkb_sym_interpret *interp; const xkb_keysym_t *syms; int num_syms; @@ -93,7 +92,9 @@ FindInterpForKey(struct xkb_keymap *keymap, const struct xkb_key *key, * sym_interprets array from the most specific to the least specific, * such that when we find a match we return immediately. */ - darray_foreach(interp, keymap->sym_interprets) { + for (int i = 0; i < keymap->num_sym_interprets; i++) { + const struct xkb_sym_interpret *interp = &keymap->sym_interprets[i]; + xkb_mod_mask_t mods; bool found = false; @@ -224,28 +225,6 @@ UpdateDerivedKeymapFields(struct xkb_keymap *keymap) return true; } -static bool -UpdateBuiltinKeymapFields(struct xkb_keymap *keymap) -{ - struct xkb_context *ctx = keymap->ctx; - - /* - * Add predefined (AKA real, core, X11) modifiers. - * The order is important! - */ - darray_appends_t(keymap->mods, struct xkb_mod, - { .name = xkb_atom_intern(ctx, "Shift"), .type = MOD_REAL }, - { .name = xkb_atom_intern(ctx, "Lock"), .type = MOD_REAL }, - { .name = xkb_atom_intern(ctx, "Control"), .type = MOD_REAL }, - { .name = xkb_atom_intern(ctx, "Mod1"), .type = MOD_REAL }, - { .name = xkb_atom_intern(ctx, "Mod2"), .type = MOD_REAL }, - { .name = xkb_atom_intern(ctx, "Mod3"), .type = MOD_REAL }, - { .name = xkb_atom_intern(ctx, "Mod4"), .type = MOD_REAL }, - { .name = xkb_atom_intern(ctx, "Mod5"), .type = MOD_REAL }); - - return true; -} - typedef bool (*compile_file_fn)(XkbFile *file, struct xkb_keymap *keymap, enum merge_mode merge); @@ -311,9 +290,6 @@ CompileKeymap(XkbFile *file, struct xkb_keymap *keymap, enum merge_mode merge) if (!ok) return false; - if (!UpdateBuiltinKeymapFields(keymap)) - return false; - /* Compile sections. */ for (type = FIRST_KEYMAP_FILE_TYPE; type <= LAST_KEYMAP_FILE_TYPE; diff --git a/src/3rdparty/xkbcommon/src/xkbcomp/keywords.c b/src/3rdparty/xkbcommon/src/xkbcomp/keywords.c new file mode 100644 index 0000000000..c19d66ffde --- /dev/null +++ b/src/3rdparty/xkbcommon/src/xkbcomp/keywords.c @@ -0,0 +1,349 @@ +/* ANSI-C code produced by gperf version 3.0.4 */ +/* Command-line: gperf */ +/* Computed positions: -k'1-2,5' */ + +#if !((' ' == 32) && ('!' == 33) && ('"' == 34) && ('#' == 35) \ + && ('%' == 37) && ('&' == 38) && ('\'' == 39) && ('(' == 40) \ + && (')' == 41) && ('*' == 42) && ('+' == 43) && (',' == 44) \ + && ('-' == 45) && ('.' == 46) && ('/' == 47) && ('0' == 48) \ + && ('1' == 49) && ('2' == 50) && ('3' == 51) && ('4' == 52) \ + && ('5' == 53) && ('6' == 54) && ('7' == 55) && ('8' == 56) \ + && ('9' == 57) && (':' == 58) && (';' == 59) && ('<' == 60) \ + && ('=' == 61) && ('>' == 62) && ('?' == 63) && ('A' == 65) \ + && ('B' == 66) && ('C' == 67) && ('D' == 68) && ('E' == 69) \ + && ('F' == 70) && ('G' == 71) && ('H' == 72) && ('I' == 73) \ + && ('J' == 74) && ('K' == 75) && ('L' == 76) && ('M' == 77) \ + && ('N' == 78) && ('O' == 79) && ('P' == 80) && ('Q' == 81) \ + && ('R' == 82) && ('S' == 83) && ('T' == 84) && ('U' == 85) \ + && ('V' == 86) && ('W' == 87) && ('X' == 88) && ('Y' == 89) \ + && ('Z' == 90) && ('[' == 91) && ('\\' == 92) && (']' == 93) \ + && ('^' == 94) && ('_' == 95) && ('a' == 97) && ('b' == 98) \ + && ('c' == 99) && ('d' == 100) && ('e' == 101) && ('f' == 102) \ + && ('g' == 103) && ('h' == 104) && ('i' == 105) && ('j' == 106) \ + && ('k' == 107) && ('l' == 108) && ('m' == 109) && ('n' == 110) \ + && ('o' == 111) && ('p' == 112) && ('q' == 113) && ('r' == 114) \ + && ('s' == 115) && ('t' == 116) && ('u' == 117) && ('v' == 118) \ + && ('w' == 119) && ('x' == 120) && ('y' == 121) && ('z' == 122) \ + && ('{' == 123) && ('|' == 124) && ('}' == 125) && ('~' == 126)) +/* The character set is not based on ISO-646. */ +#error "gperf generated tables don't work with this execution character set. Please report a bug to <bug-gnu-gperf@gnu.org>." +#endif + + +#include "xkbcomp-priv.h" +#include "parser-priv.h" + +static unsigned int +keyword_gperf_hash(const char *str, unsigned int len); + +static const struct keyword_tok * +keyword_gperf_lookup(const char *str, unsigned int len); +struct keyword_tok { int name; int tok; }; +#include <string.h> +/* maximum key range = 70, duplicates = 0 */ + +#ifndef GPERF_DOWNCASE +#define GPERF_DOWNCASE 1 +static unsigned char gperf_downcase[256] = + { + 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, + 15, 16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 26, 27, 28, 29, + 30, 31, 32, 33, 34, 35, 36, 37, 38, 39, 40, 41, 42, 43, 44, + 45, 46, 47, 48, 49, 50, 51, 52, 53, 54, 55, 56, 57, 58, 59, + 60, 61, 62, 63, 64, 97, 98, 99, 100, 101, 102, 103, 104, 105, 106, + 107, 108, 109, 110, 111, 112, 113, 114, 115, 116, 117, 118, 119, 120, 121, + 122, 91, 92, 93, 94, 95, 96, 97, 98, 99, 100, 101, 102, 103, 104, + 105, 106, 107, 108, 109, 110, 111, 112, 113, 114, 115, 116, 117, 118, 119, + 120, 121, 122, 123, 124, 125, 126, 127, 128, 129, 130, 131, 132, 133, 134, + 135, 136, 137, 138, 139, 140, 141, 142, 143, 144, 145, 146, 147, 148, 149, + 150, 151, 152, 153, 154, 155, 156, 157, 158, 159, 160, 161, 162, 163, 164, + 165, 166, 167, 168, 169, 170, 171, 172, 173, 174, 175, 176, 177, 178, 179, + 180, 181, 182, 183, 184, 185, 186, 187, 188, 189, 190, 191, 192, 193, 194, + 195, 196, 197, 198, 199, 200, 201, 202, 203, 204, 205, 206, 207, 208, 209, + 210, 211, 212, 213, 214, 215, 216, 217, 218, 219, 220, 221, 222, 223, 224, + 225, 226, 227, 228, 229, 230, 231, 232, 233, 234, 235, 236, 237, 238, 239, + 240, 241, 242, 243, 244, 245, 246, 247, 248, 249, 250, 251, 252, 253, 254, + 255 + }; +#endif + +#ifndef GPERF_CASE_STRCMP +#define GPERF_CASE_STRCMP 1 +static int +gperf_case_strcmp (register const char *s1, register const char *s2) +{ + for (;;) + { + unsigned char c1 = gperf_downcase[(unsigned char)*s1++]; + unsigned char c2 = gperf_downcase[(unsigned char)*s2++]; + if (c1 != 0 && c1 == c2) + continue; + return (int)c1 - (int)c2; + } +} +#endif + +#ifdef __GNUC__ +__inline +#else +#ifdef __cplusplus +inline +#endif +#endif +static unsigned int +keyword_gperf_hash (register const char *str, register unsigned int len) +{ + static const unsigned char asso_values[] = + { + 73, 73, 73, 73, 73, 73, 73, 73, 73, 73, + 73, 73, 73, 73, 73, 73, 73, 73, 73, 73, + 73, 73, 73, 73, 73, 73, 73, 73, 73, 73, + 73, 73, 73, 73, 73, 73, 73, 73, 73, 73, + 73, 73, 73, 73, 73, 73, 73, 73, 73, 73, + 73, 73, 73, 73, 73, 73, 73, 73, 73, 73, + 73, 73, 73, 73, 73, 0, 73, 5, 36, 0, + 10, 1, 15, 15, 73, 0, 10, 20, 35, 20, + 50, 73, 10, 10, 5, 0, 15, 73, 0, 15, + 73, 73, 73, 73, 73, 73, 73, 0, 73, 5, + 36, 0, 10, 1, 15, 15, 73, 0, 10, 20, + 35, 20, 50, 73, 10, 10, 5, 0, 15, 73, + 0, 15, 73, 73, 73, 73, 73, 73, 73, 73, + 73, 73, 73, 73, 73, 73, 73, 73, 73, 73, + 73, 73, 73, 73, 73, 73, 73, 73, 73, 73, + 73, 73, 73, 73, 73, 73, 73, 73, 73, 73, + 73, 73, 73, 73, 73, 73, 73, 73, 73, 73, + 73, 73, 73, 73, 73, 73, 73, 73, 73, 73, + 73, 73, 73, 73, 73, 73, 73, 73, 73, 73, + 73, 73, 73, 73, 73, 73, 73, 73, 73, 73, + 73, 73, 73, 73, 73, 73, 73, 73, 73, 73, + 73, 73, 73, 73, 73, 73, 73, 73, 73, 73, + 73, 73, 73, 73, 73, 73, 73, 73, 73, 73, + 73, 73, 73, 73, 73, 73, 73, 73, 73, 73, + 73, 73, 73, 73, 73, 73, 73, 73, 73, 73, + 73, 73, 73, 73, 73, 73 + }; + register int hval = len; + + switch (hval) + { + default: + hval += asso_values[(unsigned char)str[4]]; + /*FALLTHROUGH*/ + case 4: + case 3: + case 2: + hval += asso_values[(unsigned char)str[1]]; + /*FALLTHROUGH*/ + case 1: + hval += asso_values[(unsigned char)str[0]]; + break; + } + return hval; +} + +struct stringpool_t + { + char stringpool_str3[sizeof("key")]; + char stringpool_str4[sizeof("keys")]; + char stringpool_str7[sizeof("augment")]; + char stringpool_str9[sizeof("text")]; + char stringpool_str10[sizeof("xkb_keymap")]; + char stringpool_str11[sizeof("keypad_keys")]; + char stringpool_str12[sizeof("xkb_keycodes")]; + char stringpool_str13[sizeof("xkb_geometry")]; + char stringpool_str14[sizeof("xkb_types")]; + char stringpool_str15[sizeof("xkb_compat")]; + char stringpool_str17[sizeof("replace")]; + char stringpool_str19[sizeof("xkb_compat_map")]; + char stringpool_str20[sizeof("xkb_layout")]; + char stringpool_str21[sizeof("xkb_symbols")]; + char stringpool_str22[sizeof("xkb_compatibility")]; + char stringpool_str23[sizeof("xkb_semantics")]; + char stringpool_str24[sizeof("type")]; + char stringpool_str25[sizeof("alias")]; + char stringpool_str26[sizeof("xkb_compatibility_map")]; + char stringpool_str27[sizeof("alphanumeric_keys")]; + char stringpool_str28[sizeof("function_keys")]; + char stringpool_str29[sizeof("alternate")]; + char stringpool_str30[sizeof("shape")]; + char stringpool_str31[sizeof("action")]; + char stringpool_str32[sizeof("section")]; + char stringpool_str33[sizeof("row")]; + char stringpool_str34[sizeof("logo")]; + char stringpool_str35[sizeof("alternate_group")]; + char stringpool_str36[sizeof("hidden")]; + char stringpool_str37[sizeof("virtual")]; + char stringpool_str42[sizeof("outline")]; + char stringpool_str43[sizeof("default")]; + char stringpool_str46[sizeof("modmap")]; + char stringpool_str47[sizeof("virtual_modifiers")]; + char stringpool_str52[sizeof("overlay")]; + char stringpool_str53[sizeof("override")]; + char stringpool_str57[sizeof("include")]; + char stringpool_str62[sizeof("modifier_map")]; + char stringpool_str63[sizeof("modifier_keys")]; + char stringpool_str64[sizeof("indicator")]; + char stringpool_str66[sizeof("group")]; + char stringpool_str67[sizeof("mod_map")]; + char stringpool_str69[sizeof("interpret")]; + char stringpool_str71[sizeof("solid")]; + char stringpool_str72[sizeof("partial")]; + }; +static const struct stringpool_t stringpool_contents = + { + "key", + "keys", + "augment", + "text", + "xkb_keymap", + "keypad_keys", + "xkb_keycodes", + "xkb_geometry", + "xkb_types", + "xkb_compat", + "replace", + "xkb_compat_map", + "xkb_layout", + "xkb_symbols", + "xkb_compatibility", + "xkb_semantics", + "type", + "alias", + "xkb_compatibility_map", + "alphanumeric_keys", + "function_keys", + "alternate", + "shape", + "action", + "section", + "row", + "logo", + "alternate_group", + "hidden", + "virtual", + "outline", + "default", + "modmap", + "virtual_modifiers", + "overlay", + "override", + "include", + "modifier_map", + "modifier_keys", + "indicator", + "group", + "mod_map", + "interpret", + "solid", + "partial" + }; +#define stringpool ((const char *) &stringpool_contents) +#ifdef __GNUC__ +__inline +#if defined __GNUC_STDC_INLINE__ || defined __GNUC_GNU_INLINE__ +__attribute__ ((__gnu_inline__)) +#endif +#endif +const struct keyword_tok * +keyword_gperf_lookup (register const char *str, register unsigned int len) +{ + enum + { + TOTAL_KEYWORDS = 45, + MIN_WORD_LENGTH = 3, + MAX_WORD_LENGTH = 21, + MIN_HASH_VALUE = 3, + MAX_HASH_VALUE = 72 + }; + + static const struct keyword_tok wordlist[] = + { + {-1}, {-1}, {-1}, + {(int)(long)&((struct stringpool_t *)0)->stringpool_str3, KEY}, + {(int)(long)&((struct stringpool_t *)0)->stringpool_str4, KEYS}, + {-1}, {-1}, + {(int)(long)&((struct stringpool_t *)0)->stringpool_str7, AUGMENT}, + {-1}, + {(int)(long)&((struct stringpool_t *)0)->stringpool_str9, TEXT}, + {(int)(long)&((struct stringpool_t *)0)->stringpool_str10, XKB_KEYMAP}, + {(int)(long)&((struct stringpool_t *)0)->stringpool_str11, KEYPAD_KEYS}, + {(int)(long)&((struct stringpool_t *)0)->stringpool_str12, XKB_KEYCODES}, + {(int)(long)&((struct stringpool_t *)0)->stringpool_str13, XKB_GEOMETRY}, + {(int)(long)&((struct stringpool_t *)0)->stringpool_str14, XKB_TYPES}, + {(int)(long)&((struct stringpool_t *)0)->stringpool_str15, XKB_COMPATMAP}, + {-1}, + {(int)(long)&((struct stringpool_t *)0)->stringpool_str17, REPLACE}, + {-1}, + {(int)(long)&((struct stringpool_t *)0)->stringpool_str19, XKB_COMPATMAP}, + {(int)(long)&((struct stringpool_t *)0)->stringpool_str20, XKB_LAYOUT}, + {(int)(long)&((struct stringpool_t *)0)->stringpool_str21, XKB_SYMBOLS}, + {(int)(long)&((struct stringpool_t *)0)->stringpool_str22, XKB_COMPATMAP}, + {(int)(long)&((struct stringpool_t *)0)->stringpool_str23, XKB_SEMANTICS}, + {(int)(long)&((struct stringpool_t *)0)->stringpool_str24, TYPE}, + {(int)(long)&((struct stringpool_t *)0)->stringpool_str25, ALIAS}, + {(int)(long)&((struct stringpool_t *)0)->stringpool_str26, XKB_COMPATMAP}, + {(int)(long)&((struct stringpool_t *)0)->stringpool_str27, ALPHANUMERIC_KEYS}, + {(int)(long)&((struct stringpool_t *)0)->stringpool_str28, FUNCTION_KEYS}, + {(int)(long)&((struct stringpool_t *)0)->stringpool_str29, ALTERNATE}, + {(int)(long)&((struct stringpool_t *)0)->stringpool_str30, SHAPE}, + {(int)(long)&((struct stringpool_t *)0)->stringpool_str31, ACTION_TOK}, + {(int)(long)&((struct stringpool_t *)0)->stringpool_str32, SECTION}, + {(int)(long)&((struct stringpool_t *)0)->stringpool_str33, ROW}, + {(int)(long)&((struct stringpool_t *)0)->stringpool_str34, LOGO}, + {(int)(long)&((struct stringpool_t *)0)->stringpool_str35, ALTERNATE_GROUP}, + {(int)(long)&((struct stringpool_t *)0)->stringpool_str36, HIDDEN}, + {(int)(long)&((struct stringpool_t *)0)->stringpool_str37, VIRTUAL}, + {-1}, {-1}, {-1}, {-1}, + {(int)(long)&((struct stringpool_t *)0)->stringpool_str42, OUTLINE}, + {(int)(long)&((struct stringpool_t *)0)->stringpool_str43, DEFAULT}, + {-1}, {-1}, + {(int)(long)&((struct stringpool_t *)0)->stringpool_str46, MODIFIER_MAP}, + {(int)(long)&((struct stringpool_t *)0)->stringpool_str47, VIRTUAL_MODS}, + {-1}, {-1}, {-1}, {-1}, + {(int)(long)&((struct stringpool_t *)0)->stringpool_str52, OVERLAY}, + {(int)(long)&((struct stringpool_t *)0)->stringpool_str53, OVERRIDE}, + {-1}, {-1}, {-1}, + {(int)(long)&((struct stringpool_t *)0)->stringpool_str57, INCLUDE}, + {-1}, {-1}, {-1}, {-1}, + {(int)(long)&((struct stringpool_t *)0)->stringpool_str62, MODIFIER_MAP}, + {(int)(long)&((struct stringpool_t *)0)->stringpool_str63, MODIFIER_KEYS}, + {(int)(long)&((struct stringpool_t *)0)->stringpool_str64, INDICATOR}, + {-1}, + {(int)(long)&((struct stringpool_t *)0)->stringpool_str66, GROUP}, + {(int)(long)&((struct stringpool_t *)0)->stringpool_str67, MODIFIER_MAP}, + {-1}, + {(int)(long)&((struct stringpool_t *)0)->stringpool_str69, INTERPRET}, + {-1}, + {(int)(long)&((struct stringpool_t *)0)->stringpool_str71, SOLID}, + {(int)(long)&((struct stringpool_t *)0)->stringpool_str72, PARTIAL} + }; + + if (len <= MAX_WORD_LENGTH && len >= MIN_WORD_LENGTH) + { + register int key = keyword_gperf_hash (str, len); + + if (key <= MAX_HASH_VALUE && key >= 0) + { + register int o = wordlist[key].name; + if (o >= 0) + { + register const char *s = o + stringpool; + + if ((((unsigned char)*str ^ (unsigned char)*s) & ~32) == 0 && !gperf_case_strcmp (str, s)) + return &wordlist[key]; + } + } + } + return 0; +} + + +int +keyword_to_token(const char *string) +{ + const struct keyword_tok *kt; + kt = keyword_gperf_lookup(string, strlen(string)); + if (!kt) + return -1; + return kt->tok; +} diff --git a/src/3rdparty/xkbcommon/src/xkbcomp/parser-priv.h b/src/3rdparty/xkbcommon/src/xkbcomp/parser-priv.h index 2e02db66a8..05e725eb00 100644 --- a/src/3rdparty/xkbcommon/src/xkbcomp/parser-priv.h +++ b/src/3rdparty/xkbcommon/src/xkbcomp/parser-priv.h @@ -27,21 +27,24 @@ #ifndef XKBCOMP_PARSER_PRIV_H #define XKBCOMP_PARSER_PRIV_H -struct scanner_extra; +struct scanner; struct parser_param; -#pragma GCC diagnostic ignored "-Wredundant-decls" -#pragma GCC diagnostic push #include "parser.h" -#pragma GCC diagnostic pop + +int +scanner_error(struct scanner *scanner, const char *msg); void -scanner_error(YYLTYPE *loc, void *scanner, const char *msg); +scanner_warn(struct scanner *s, const char *msg); int -_xkbcommon_lex(YYSTYPE *val, YYLTYPE *loc, void *scanner); +_xkbcommon_lex(YYSTYPE *yylval, struct scanner *scanner); XkbFile * parse(struct xkb_context *ctx, void *scanner, const char *map); +int +keyword_to_token(const char *string); + #endif diff --git a/src/3rdparty/xkbcommon/src/xkbcomp/parser.c b/src/3rdparty/xkbcommon/src/xkbcomp/parser.c index e1280e9180..26bbf30be8 100644 --- a/src/3rdparty/xkbcommon/src/xkbcomp/parser.c +++ b/src/3rdparty/xkbcommon/src/xkbcomp/parser.c @@ -59,7 +59,7 @@ #define YYPULL 1 /* Using locations. */ -#define YYLSP_NEEDED 1 +#define YYLSP_NEEDED 0 /* Substitute the variable and function names. */ #define yyparse _xkbcommon_parse @@ -69,12 +69,12 @@ #define yychar _xkbcommon_char #define yydebug _xkbcommon_debug #define yynerrs _xkbcommon_nerrs -#define yylloc _xkbcommon_lloc + /* Copy the first part of user declarations. */ /* Line 268 of yacc.c */ -#line 27 "parser.y" +#line 33 "parser.y" #include "xkbcomp-priv.h" #include "ast-build.h" @@ -88,16 +88,52 @@ struct parser_param { }; static void -_xkbcommon_error(struct YYLTYPE *loc, struct parser_param *param, const char *msg) +parser_error(struct parser_param *param, const char *msg) { - scanner_error(loc, param->scanner, msg); + scanner_error(param->scanner, msg); +} + +static void +parser_warn(struct parser_param *param, const char *msg) +{ + scanner_warn(param->scanner, msg); +} + +static void +_xkbcommon_error(struct parser_param *param, const char *msg) +{ + parser_error(param, msg); +} + +static bool +resolve_keysym(const char *str, xkb_keysym_t *sym_rtrn) +{ + xkb_keysym_t sym; + + if (!str || istreq(str, "any") || istreq(str, "nosymbol")) { + *sym_rtrn = XKB_KEY_NoSymbol; + return true; + } + + if (istreq(str, "none") || istreq(str, "voidsymbol")) { + *sym_rtrn = XKB_KEY_VoidSymbol; + return true; + } + + sym = xkb_keysym_from_name(str, XKB_KEYSYM_NO_FLAGS); + if (sym != XKB_KEY_NoSymbol) { + *sym_rtrn = sym; + return true; + } + + return false; } #define scanner param->scanner /* Line 268 of yacc.c */ -#line 101 "src/xkbcomp/parser.c" +#line 137 "src/xkbcomp/parser.c" /* Enabling traces. */ #ifndef YYDEBUG @@ -262,16 +298,16 @@ typedef union YYSTYPE { /* Line 293 of yacc.c */ -#line 127 "parser.y" +#line 167 "parser.y" int ival; - unsigned uval; int64_t num; enum xkb_file_type file_type; char *str; xkb_atom_t sval; enum merge_mode merge; enum xkb_map_flags mapFlags; + xkb_keysym_t keysym; ParseCommon *any; ExprDef *expr; VarDef *var; @@ -291,32 +327,19 @@ typedef union YYSTYPE /* Line 293 of yacc.c */ -#line 295 "src/xkbcomp/parser.c" +#line 331 "src/xkbcomp/parser.c" } YYSTYPE; # define YYSTYPE_IS_TRIVIAL 1 # define yystype YYSTYPE /* obsolescent; will be withdrawn */ # define YYSTYPE_IS_DECLARED 1 #endif -#if ! defined YYLTYPE && ! defined YYLTYPE_IS_DECLARED -typedef struct YYLTYPE -{ - int first_line; - int first_column; - int last_line; - int last_column; -} YYLTYPE; -# define yyltype YYLTYPE /* obsolescent; will be withdrawn */ -# define YYLTYPE_IS_DECLARED 1 -# define YYLTYPE_IS_TRIVIAL 1 -#endif - /* Copy the second part of user declarations. */ /* Line 343 of yacc.c */ -#line 320 "src/xkbcomp/parser.c" +#line 343 "src/xkbcomp/parser.c" #ifdef short # undef short @@ -474,15 +497,13 @@ void free (void *); /* INFRINGES ON USER NAME SPACE */ #if (! defined yyoverflow \ && (! defined __cplusplus \ - || (defined YYLTYPE_IS_TRIVIAL && YYLTYPE_IS_TRIVIAL \ - && defined YYSTYPE_IS_TRIVIAL && YYSTYPE_IS_TRIVIAL))) + || (defined YYSTYPE_IS_TRIVIAL && YYSTYPE_IS_TRIVIAL))) /* A type that is properly aligned for any stack member. */ union yyalloc { yytype_int16 yyss_alloc; YYSTYPE yyvs_alloc; - YYLTYPE yyls_alloc; }; /* The size of the maximum gap between one aligned stack and the next. */ @@ -491,8 +512,8 @@ union yyalloc /* The size of an array large to enough to hold all stacks, each with N elements. */ # define YYSTACK_BYTES(N) \ - ((N) * (sizeof (yytype_int16) + sizeof (YYSTYPE) + sizeof (YYLTYPE)) \ - + 2 * YYSTACK_GAP_MAXIMUM) + ((N) * (sizeof (yytype_int16) + sizeof (YYSTYPE)) \ + + YYSTACK_GAP_MAXIMUM) # define YYCOPY_NEEDED 1 @@ -677,25 +698,25 @@ static const yytype_int16 yyrhs[] = /* YYRLINE[YYN] -- source line where rule number YYN was defined. */ static const yytype_uint16 yyrline[] = { - 0, 198, 198, 200, 202, 206, 212, 213, 214, 217, - 224, 228, 243, 244, 245, 246, 247, 250, 251, 254, - 255, 258, 259, 260, 261, 262, 263, 264, 265, 268, - 270, 273, 278, 283, 288, 293, 298, 303, 308, 313, - 318, 323, 328, 329, 330, 331, 338, 340, 342, 346, - 350, 354, 358, 360, 364, 366, 370, 376, 378, 382, - 384, 388, 394, 400, 402, 404, 407, 408, 409, 410, - 411, 414, 416, 420, 424, 428, 432, 434, 438, 440, - 444, 448, 449, 452, 454, 456, 458, 460, 464, 465, - 468, 469, 473, 474, 477, 479, 483, 487, 488, 491, - 494, 496, 500, 502, 504, 508, 510, 514, 518, 522, - 523, 524, 525, 528, 529, 532, 534, 536, 538, 540, - 542, 544, 546, 548, 550, 552, 556, 557, 560, 561, - 562, 563, 564, 574, 575, 578, 580, 584, 586, 588, - 590, 592, 594, 598, 600, 602, 604, 606, 608, 610, - 612, 616, 618, 622, 626, 633, 641, 650, 661, 668, - 675, 679, 688, 689, 692, 694, 696, 698, 702, 706, - 707, 708, 722, 723, 726, 727, 730, 733, 736, 739, - 740, 743, 746, 747, 750 + 0, 238, 238, 240, 242, 246, 252, 253, 254, 257, + 264, 268, 283, 284, 285, 286, 287, 290, 291, 294, + 295, 298, 299, 300, 301, 302, 303, 304, 305, 308, + 310, 313, 318, 323, 328, 333, 338, 343, 348, 353, + 358, 363, 368, 369, 370, 371, 378, 380, 382, 386, + 390, 394, 398, 400, 404, 406, 410, 416, 418, 422, + 424, 428, 434, 440, 442, 444, 447, 448, 449, 450, + 451, 454, 456, 460, 464, 468, 472, 474, 478, 480, + 484, 488, 489, 492, 494, 496, 498, 500, 504, 505, + 508, 509, 513, 514, 517, 519, 523, 527, 528, 531, + 534, 536, 540, 542, 544, 548, 550, 554, 558, 562, + 563, 564, 565, 568, 569, 572, 574, 576, 578, 580, + 582, 584, 586, 588, 590, 592, 596, 597, 600, 601, + 602, 603, 604, 614, 615, 618, 620, 624, 626, 628, + 630, 632, 634, 638, 640, 642, 644, 646, 648, 650, + 652, 656, 658, 662, 666, 668, 670, 672, 676, 678, + 680, 682, 686, 687, 690, 692, 694, 696, 700, 704, + 710, 711, 725, 726, 729, 730, 733, 736, 739, 742, + 743, 746, 749, 750, 753 }; #endif @@ -1148,7 +1169,7 @@ do \ } \ else \ { \ - yyerror (&yylloc, param, YY_("syntax error: cannot back up")); \ + yyerror (param, YY_("syntax error: cannot back up")); \ YYERROR; \ } \ while (YYID (0)) @@ -1184,28 +1205,19 @@ while (YYID (0)) #endif -/* YY_LOCATION_PRINT -- Print the location on the stream. - This macro was not mandated originally: define only if we know - we won't break user code: when these are the locations we know. */ +/* This macro is provided for backward compatibility. */ #ifndef YY_LOCATION_PRINT -# if defined YYLTYPE_IS_TRIVIAL && YYLTYPE_IS_TRIVIAL -# define YY_LOCATION_PRINT(File, Loc) \ - fprintf (File, "%d.%d-%d.%d", \ - (Loc).first_line, (Loc).first_column, \ - (Loc).last_line, (Loc).last_column) -# else -# define YY_LOCATION_PRINT(File, Loc) ((void) 0) -# endif +# define YY_LOCATION_PRINT(File, Loc) ((void) 0) #endif /* YYLEX -- calling `yylex' with the right arguments. */ #ifdef YYLEX_PARAM -# define YYLEX yylex (&yylval, &yylloc, YYLEX_PARAM) +# define YYLEX yylex (&yylval, YYLEX_PARAM) #else -# define YYLEX yylex (&yylval, &yylloc, scanner) +# define YYLEX yylex (&yylval, scanner) #endif /* Enable debugging if requested. */ @@ -1228,7 +1240,7 @@ do { \ { \ YYFPRINTF (stderr, "%s ", Title); \ yy_symbol_print (stderr, \ - Type, Value, Location, param); \ + Type, Value, param); \ YYFPRINTF (stderr, "\n"); \ } \ } while (YYID (0)) @@ -1242,20 +1254,18 @@ do { \ #if (defined __STDC__ || defined __C99__FUNC__ \ || defined __cplusplus || defined _MSC_VER) static void -yy_symbol_value_print (FILE *yyoutput, int yytype, YYSTYPE const * const yyvaluep, YYLTYPE const * const yylocationp, struct parser_param *param) +yy_symbol_value_print (FILE *yyoutput, int yytype, YYSTYPE const * const yyvaluep, struct parser_param *param) #else static void -yy_symbol_value_print (yyoutput, yytype, yyvaluep, yylocationp, param) +yy_symbol_value_print (yyoutput, yytype, yyvaluep, param) FILE *yyoutput; int yytype; YYSTYPE const * const yyvaluep; - YYLTYPE const * const yylocationp; struct parser_param *param; #endif { if (!yyvaluep) return; - YYUSE (yylocationp); YYUSE (param); # ifdef YYPRINT if (yytype < YYNTOKENS) @@ -1278,14 +1288,13 @@ yy_symbol_value_print (yyoutput, yytype, yyvaluep, yylocationp, param) #if (defined __STDC__ || defined __C99__FUNC__ \ || defined __cplusplus || defined _MSC_VER) static void -yy_symbol_print (FILE *yyoutput, int yytype, YYSTYPE const * const yyvaluep, YYLTYPE const * const yylocationp, struct parser_param *param) +yy_symbol_print (FILE *yyoutput, int yytype, YYSTYPE const * const yyvaluep, struct parser_param *param) #else static void -yy_symbol_print (yyoutput, yytype, yyvaluep, yylocationp, param) +yy_symbol_print (yyoutput, yytype, yyvaluep, param) FILE *yyoutput; int yytype; YYSTYPE const * const yyvaluep; - YYLTYPE const * const yylocationp; struct parser_param *param; #endif { @@ -1294,9 +1303,7 @@ yy_symbol_print (yyoutput, yytype, yyvaluep, yylocationp, param) else YYFPRINTF (yyoutput, "nterm %s (", yytname[yytype]); - YY_LOCATION_PRINT (yyoutput, *yylocationp); - YYFPRINTF (yyoutput, ": "); - yy_symbol_value_print (yyoutput, yytype, yyvaluep, yylocationp, param); + yy_symbol_value_print (yyoutput, yytype, yyvaluep, param); YYFPRINTF (yyoutput, ")"); } @@ -1339,12 +1346,11 @@ do { \ #if (defined __STDC__ || defined __C99__FUNC__ \ || defined __cplusplus || defined _MSC_VER) static void -yy_reduce_print (YYSTYPE *yyvsp, YYLTYPE *yylsp, int yyrule, struct parser_param *param) +yy_reduce_print (YYSTYPE *yyvsp, int yyrule, struct parser_param *param) #else static void -yy_reduce_print (yyvsp, yylsp, yyrule, param) +yy_reduce_print (yyvsp, yyrule, param) YYSTYPE *yyvsp; - YYLTYPE *yylsp; int yyrule; struct parser_param *param; #endif @@ -1360,7 +1366,7 @@ yy_reduce_print (yyvsp, yylsp, yyrule, param) YYFPRINTF (stderr, " $%d = ", yyi + 1); yy_symbol_print (stderr, yyrhs[yyprhs[yyrule] + yyi], &(yyvsp[(yyi + 1) - (yynrhs)]) - , &(yylsp[(yyi + 1) - (yynrhs)]) , param); + , param); YYFPRINTF (stderr, "\n"); } } @@ -1368,7 +1374,7 @@ yy_reduce_print (yyvsp, yylsp, yyrule, param) # define YY_REDUCE_PRINT(Rule) \ do { \ if (yydebug) \ - yy_reduce_print (yyvsp, yylsp, Rule, param); \ + yy_reduce_print (yyvsp, Rule, param); \ } while (YYID (0)) /* Nonzero means print parse trace. It is left uninitialized so that @@ -1645,19 +1651,17 @@ yysyntax_error (YYSIZE_T *yymsg_alloc, char **yymsg, #if (defined __STDC__ || defined __C99__FUNC__ \ || defined __cplusplus || defined _MSC_VER) static void -yydestruct (const char *yymsg, int yytype, YYSTYPE *yyvaluep, YYLTYPE *yylocationp, struct parser_param *param) +yydestruct (const char *yymsg, int yytype, YYSTYPE *yyvaluep, struct parser_param *param) #else static void -yydestruct (yymsg, yytype, yyvaluep, yylocationp, param) +yydestruct (yymsg, yytype, yyvaluep, param) const char *yymsg; int yytype; YYSTYPE *yyvaluep; - YYLTYPE *yylocationp; struct parser_param *param; #endif { YYUSE (yyvaluep); - YYUSE (yylocationp); YYUSE (param); if (!yymsg) @@ -1721,9 +1725,6 @@ int yychar; /* The semantic value of the lookahead symbol. */ YYSTYPE yylval; -/* Location data for the lookahead symbol. */ -YYLTYPE yylloc; - /* Number of syntax errors so far. */ int yynerrs; @@ -1734,7 +1735,6 @@ YYLTYPE yylloc; /* The stacks and their tools: `yyss': related to states. `yyvs': related to semantic values. - `yyls': related to locations. Refer to the stacks thru separate pointers, to allow yyoverflow to reallocate them elsewhere. */ @@ -1749,14 +1749,6 @@ YYLTYPE yylloc; YYSTYPE *yyvs; YYSTYPE *yyvsp; - /* The location stack. */ - YYLTYPE yylsa[YYINITDEPTH]; - YYLTYPE *yyls; - YYLTYPE *yylsp; - - /* The locations where the error started and ended. */ - YYLTYPE yyerror_range[3]; - YYSIZE_T yystacksize; int yyn; @@ -1766,7 +1758,6 @@ YYLTYPE yylloc; /* The variables used to return semantic value and location from the action routines. */ YYSTYPE yyval; - YYLTYPE yyloc; #if YYERROR_VERBOSE /* Buffer for error messages, and its allocated size. */ @@ -1775,7 +1766,7 @@ YYLTYPE yylloc; YYSIZE_T yymsg_alloc = sizeof yymsgbuf; #endif -#define YYPOPSTACK(N) (yyvsp -= (N), yyssp -= (N), yylsp -= (N)) +#define YYPOPSTACK(N) (yyvsp -= (N), yyssp -= (N)) /* The number of symbols on the RHS of the reduced rule. Keep to zero when no symbol should be popped. */ @@ -1784,7 +1775,6 @@ YYLTYPE yylloc; yytoken = 0; yyss = yyssa; yyvs = yyvsa; - yyls = yylsa; yystacksize = YYINITDEPTH; YYDPRINTF ((stderr, "Starting parse\n")); @@ -1800,13 +1790,6 @@ YYLTYPE yylloc; The wasted elements are never initialized. */ yyssp = yyss; yyvsp = yyvs; - yylsp = yyls; - -#if defined YYLTYPE_IS_TRIVIAL && YYLTYPE_IS_TRIVIAL - /* Initialize the default location before parsing starts. */ - yylloc.first_line = yylloc.last_line = 1; - yylloc.first_column = yylloc.last_column = 1; -#endif goto yysetstate; @@ -1833,7 +1816,6 @@ YYLTYPE yylloc; memory. */ YYSTYPE *yyvs1 = yyvs; yytype_int16 *yyss1 = yyss; - YYLTYPE *yyls1 = yyls; /* Each stack pointer address is followed by the size of the data in use in that stack, in bytes. This used to be a @@ -1842,10 +1824,8 @@ YYLTYPE yylloc; yyoverflow (YY_("memory exhausted"), &yyss1, yysize * sizeof (*yyssp), &yyvs1, yysize * sizeof (*yyvsp), - &yyls1, yysize * sizeof (*yylsp), &yystacksize); - yyls = yyls1; yyss = yyss1; yyvs = yyvs1; } @@ -1868,7 +1848,6 @@ YYLTYPE yylloc; goto yyexhaustedlab; YYSTACK_RELOCATE (yyss_alloc, yyss); YYSTACK_RELOCATE (yyvs_alloc, yyvs); - YYSTACK_RELOCATE (yyls_alloc, yyls); # undef YYSTACK_RELOCATE if (yyss1 != yyssa) YYSTACK_FREE (yyss1); @@ -1878,7 +1857,6 @@ YYLTYPE yylloc; yyssp = yyss + yysize - 1; yyvsp = yyvs + yysize - 1; - yylsp = yyls + yysize - 1; YYDPRINTF ((stderr, "Stack size increased to %lu\n", (unsigned long int) yystacksize)); @@ -1954,7 +1932,7 @@ yybackup: yystate = yyn; *++yyvsp = yylval; - *++yylsp = yylloc; + goto yynewstate; @@ -1985,64 +1963,63 @@ yyreduce: GCC warning that YYVAL may be used uninitialized. */ yyval = yyvsp[1-yylen]; - /* Default location. */ - YYLLOC_DEFAULT (yyloc, (yylsp - yylen), yylen); + YY_REDUCE_PRINT (yyn); switch (yyn) { case 2: /* Line 1806 of yacc.c */ -#line 199 "parser.y" +#line 239 "parser.y" { (yyval.file) = param->rtrn = (yyvsp[(1) - (1)].file); param->more_maps = true; } break; case 3: /* Line 1806 of yacc.c */ -#line 201 "parser.y" +#line 241 "parser.y" { (yyval.file) = param->rtrn = (yyvsp[(1) - (1)].file); param->more_maps = true; YYACCEPT; } break; case 4: /* Line 1806 of yacc.c */ -#line 203 "parser.y" +#line 243 "parser.y" { (yyval.file) = param->rtrn = NULL; param->more_maps = false; } break; case 5: /* Line 1806 of yacc.c */ -#line 209 "parser.y" +#line 249 "parser.y" { (yyval.file) = XkbFileCreate(param->ctx, (yyvsp[(2) - (7)].file_type), (yyvsp[(3) - (7)].str), &(yyvsp[(5) - (7)].file)->common, (yyvsp[(1) - (7)].mapFlags)); } break; case 6: /* Line 1806 of yacc.c */ -#line 212 "parser.y" +#line 252 "parser.y" { (yyval.file_type) = FILE_TYPE_KEYMAP; } break; case 7: /* Line 1806 of yacc.c */ -#line 213 "parser.y" +#line 253 "parser.y" { (yyval.file_type) = FILE_TYPE_KEYMAP; } break; case 8: /* Line 1806 of yacc.c */ -#line 214 "parser.y" +#line 254 "parser.y" { (yyval.file_type) = FILE_TYPE_KEYMAP; } break; case 9: /* Line 1806 of yacc.c */ -#line 218 "parser.y" +#line 258 "parser.y" { if (!(yyvsp[(2) - (2)].file)) (yyval.file) = (yyvsp[(1) - (2)].file); @@ -2054,14 +2031,14 @@ yyreduce: case 10: /* Line 1806 of yacc.c */ -#line 225 "parser.y" +#line 265 "parser.y" { (yyval.file) = (yyvsp[(1) - (1)].file); } break; case 11: /* Line 1806 of yacc.c */ -#line 231 "parser.y" +#line 271 "parser.y" { if ((yyvsp[(2) - (7)].file_type) == FILE_TYPE_GEOMETRY) { free((yyvsp[(3) - (7)].str)); @@ -2077,140 +2054,140 @@ yyreduce: case 12: /* Line 1806 of yacc.c */ -#line 243 "parser.y" +#line 283 "parser.y" { (yyval.file_type) = FILE_TYPE_KEYCODES; } break; case 13: /* Line 1806 of yacc.c */ -#line 244 "parser.y" +#line 284 "parser.y" { (yyval.file_type) = FILE_TYPE_TYPES; } break; case 14: /* Line 1806 of yacc.c */ -#line 245 "parser.y" +#line 285 "parser.y" { (yyval.file_type) = FILE_TYPE_COMPAT; } break; case 15: /* Line 1806 of yacc.c */ -#line 246 "parser.y" +#line 286 "parser.y" { (yyval.file_type) = FILE_TYPE_SYMBOLS; } break; case 16: /* Line 1806 of yacc.c */ -#line 247 "parser.y" +#line 287 "parser.y" { (yyval.file_type) = FILE_TYPE_GEOMETRY; } break; case 17: /* Line 1806 of yacc.c */ -#line 250 "parser.y" +#line 290 "parser.y" { (yyval.mapFlags) = (yyvsp[(1) - (1)].mapFlags); } break; case 18: /* Line 1806 of yacc.c */ -#line 251 "parser.y" +#line 291 "parser.y" { (yyval.mapFlags) = 0; } break; case 19: /* Line 1806 of yacc.c */ -#line 254 "parser.y" +#line 294 "parser.y" { (yyval.mapFlags) = ((yyvsp[(1) - (2)].mapFlags) | (yyvsp[(2) - (2)].mapFlags)); } break; case 20: /* Line 1806 of yacc.c */ -#line 255 "parser.y" +#line 295 "parser.y" { (yyval.mapFlags) = (yyvsp[(1) - (1)].mapFlags); } break; case 21: /* Line 1806 of yacc.c */ -#line 258 "parser.y" +#line 298 "parser.y" { (yyval.mapFlags) = MAP_IS_PARTIAL; } break; case 22: /* Line 1806 of yacc.c */ -#line 259 "parser.y" +#line 299 "parser.y" { (yyval.mapFlags) = MAP_IS_DEFAULT; } break; case 23: /* Line 1806 of yacc.c */ -#line 260 "parser.y" +#line 300 "parser.y" { (yyval.mapFlags) = MAP_IS_HIDDEN; } break; case 24: /* Line 1806 of yacc.c */ -#line 261 "parser.y" +#line 301 "parser.y" { (yyval.mapFlags) = MAP_HAS_ALPHANUMERIC; } break; case 25: /* Line 1806 of yacc.c */ -#line 262 "parser.y" +#line 302 "parser.y" { (yyval.mapFlags) = MAP_HAS_MODIFIER; } break; case 26: /* Line 1806 of yacc.c */ -#line 263 "parser.y" +#line 303 "parser.y" { (yyval.mapFlags) = MAP_HAS_KEYPAD; } break; case 27: /* Line 1806 of yacc.c */ -#line 264 "parser.y" +#line 304 "parser.y" { (yyval.mapFlags) = MAP_HAS_FN; } break; case 28: /* Line 1806 of yacc.c */ -#line 265 "parser.y" +#line 305 "parser.y" { (yyval.mapFlags) = MAP_IS_ALTGR; } break; case 29: /* Line 1806 of yacc.c */ -#line 269 "parser.y" +#line 309 "parser.y" { (yyval.any) = AppendStmt((yyvsp[(1) - (2)].any), (yyvsp[(2) - (2)].any)); } break; case 30: /* Line 1806 of yacc.c */ -#line 270 "parser.y" +#line 310 "parser.y" { (yyval.any) = NULL; } break; case 31: /* Line 1806 of yacc.c */ -#line 274 "parser.y" +#line 314 "parser.y" { (yyvsp[(2) - (2)].var)->merge = (yyvsp[(1) - (2)].merge); (yyval.any) = &(yyvsp[(2) - (2)].var)->common; @@ -2220,7 +2197,7 @@ yyreduce: case 32: /* Line 1806 of yacc.c */ -#line 279 "parser.y" +#line 319 "parser.y" { (yyvsp[(2) - (2)].vmod)->merge = (yyvsp[(1) - (2)].merge); (yyval.any) = &(yyvsp[(2) - (2)].vmod)->common; @@ -2230,7 +2207,7 @@ yyreduce: case 33: /* Line 1806 of yacc.c */ -#line 284 "parser.y" +#line 324 "parser.y" { (yyvsp[(2) - (2)].interp)->merge = (yyvsp[(1) - (2)].merge); (yyval.any) = &(yyvsp[(2) - (2)].interp)->common; @@ -2240,7 +2217,7 @@ yyreduce: case 34: /* Line 1806 of yacc.c */ -#line 289 "parser.y" +#line 329 "parser.y" { (yyvsp[(2) - (2)].keyCode)->merge = (yyvsp[(1) - (2)].merge); (yyval.any) = &(yyvsp[(2) - (2)].keyCode)->common; @@ -2250,7 +2227,7 @@ yyreduce: case 35: /* Line 1806 of yacc.c */ -#line 294 "parser.y" +#line 334 "parser.y" { (yyvsp[(2) - (2)].keyAlias)->merge = (yyvsp[(1) - (2)].merge); (yyval.any) = &(yyvsp[(2) - (2)].keyAlias)->common; @@ -2260,7 +2237,7 @@ yyreduce: case 36: /* Line 1806 of yacc.c */ -#line 299 "parser.y" +#line 339 "parser.y" { (yyvsp[(2) - (2)].keyType)->merge = (yyvsp[(1) - (2)].merge); (yyval.any) = &(yyvsp[(2) - (2)].keyType)->common; @@ -2270,7 +2247,7 @@ yyreduce: case 37: /* Line 1806 of yacc.c */ -#line 304 "parser.y" +#line 344 "parser.y" { (yyvsp[(2) - (2)].syms)->merge = (yyvsp[(1) - (2)].merge); (yyval.any) = &(yyvsp[(2) - (2)].syms)->common; @@ -2280,7 +2257,7 @@ yyreduce: case 38: /* Line 1806 of yacc.c */ -#line 309 "parser.y" +#line 349 "parser.y" { (yyvsp[(2) - (2)].modMask)->merge = (yyvsp[(1) - (2)].merge); (yyval.any) = &(yyvsp[(2) - (2)].modMask)->common; @@ -2290,7 +2267,7 @@ yyreduce: case 39: /* Line 1806 of yacc.c */ -#line 314 "parser.y" +#line 354 "parser.y" { (yyvsp[(2) - (2)].groupCompat)->merge = (yyvsp[(1) - (2)].merge); (yyval.any) = &(yyvsp[(2) - (2)].groupCompat)->common; @@ -2300,7 +2277,7 @@ yyreduce: case 40: /* Line 1806 of yacc.c */ -#line 319 "parser.y" +#line 359 "parser.y" { (yyvsp[(2) - (2)].ledMap)->merge = (yyvsp[(1) - (2)].merge); (yyval.any) = &(yyvsp[(2) - (2)].ledMap)->common; @@ -2310,7 +2287,7 @@ yyreduce: case 41: /* Line 1806 of yacc.c */ -#line 324 "parser.y" +#line 364 "parser.y" { (yyvsp[(2) - (2)].ledName)->merge = (yyvsp[(1) - (2)].merge); (yyval.any) = &(yyvsp[(2) - (2)].ledName)->common; @@ -2320,28 +2297,28 @@ yyreduce: case 42: /* Line 1806 of yacc.c */ -#line 328 "parser.y" +#line 368 "parser.y" { (yyval.any) = NULL; } break; case 43: /* Line 1806 of yacc.c */ -#line 329 "parser.y" +#line 369 "parser.y" { (yyval.any) = NULL; } break; case 44: /* Line 1806 of yacc.c */ -#line 330 "parser.y" +#line 370 "parser.y" { (yyval.any) = NULL; } break; case 45: /* Line 1806 of yacc.c */ -#line 332 "parser.y" +#line 372 "parser.y" { (yyval.any) = &IncludeCreate(param->ctx, (yyvsp[(2) - (2)].str), (yyvsp[(1) - (2)].merge))->common; free((yyvsp[(2) - (2)].str)); @@ -2351,609 +2328,609 @@ yyreduce: case 46: /* Line 1806 of yacc.c */ -#line 339 "parser.y" +#line 379 "parser.y" { (yyval.var) = VarCreate((yyvsp[(1) - (4)].expr), (yyvsp[(3) - (4)].expr)); } break; case 47: /* Line 1806 of yacc.c */ -#line 341 "parser.y" - { (yyval.var) = BoolVarCreate((yyvsp[(1) - (2)].sval), 1); } +#line 381 "parser.y" + { (yyval.var) = BoolVarCreate((yyvsp[(1) - (2)].sval), true); } break; case 48: /* Line 1806 of yacc.c */ -#line 343 "parser.y" - { (yyval.var) = BoolVarCreate((yyvsp[(2) - (3)].sval), 0); } +#line 383 "parser.y" + { (yyval.var) = BoolVarCreate((yyvsp[(2) - (3)].sval), false); } break; case 49: /* Line 1806 of yacc.c */ -#line 347 "parser.y" +#line 387 "parser.y" { (yyval.keyCode) = KeycodeCreate((yyvsp[(1) - (4)].sval), (yyvsp[(3) - (4)].num)); } break; case 50: /* Line 1806 of yacc.c */ -#line 351 "parser.y" +#line 391 "parser.y" { (yyval.keyAlias) = KeyAliasCreate((yyvsp[(2) - (5)].sval), (yyvsp[(4) - (5)].sval)); } break; case 51: /* Line 1806 of yacc.c */ -#line 355 "parser.y" +#line 395 "parser.y" { (yyval.vmod) = (yyvsp[(2) - (3)].vmod); } break; case 52: /* Line 1806 of yacc.c */ -#line 359 "parser.y" +#line 399 "parser.y" { (yyval.vmod) = (VModDef *)AppendStmt(&(yyvsp[(1) - (3)].vmod)->common, &(yyvsp[(3) - (3)].vmod)->common); } break; case 53: /* Line 1806 of yacc.c */ -#line 361 "parser.y" +#line 401 "parser.y" { (yyval.vmod) = (yyvsp[(1) - (1)].vmod); } break; case 54: /* Line 1806 of yacc.c */ -#line 365 "parser.y" +#line 405 "parser.y" { (yyval.vmod) = VModCreate((yyvsp[(1) - (1)].sval), NULL); } break; case 55: /* Line 1806 of yacc.c */ -#line 367 "parser.y" +#line 407 "parser.y" { (yyval.vmod) = VModCreate((yyvsp[(1) - (3)].sval), (yyvsp[(3) - (3)].expr)); } break; case 56: /* Line 1806 of yacc.c */ -#line 373 "parser.y" +#line 413 "parser.y" { (yyvsp[(2) - (6)].interp)->def = (yyvsp[(4) - (6)].var); (yyval.interp) = (yyvsp[(2) - (6)].interp); } break; case 57: /* Line 1806 of yacc.c */ -#line 377 "parser.y" - { (yyval.interp) = InterpCreate((yyvsp[(1) - (3)].str), (yyvsp[(3) - (3)].expr)); } +#line 417 "parser.y" + { (yyval.interp) = InterpCreate((yyvsp[(1) - (3)].keysym), (yyvsp[(3) - (3)].expr)); } break; case 58: /* Line 1806 of yacc.c */ -#line 379 "parser.y" - { (yyval.interp) = InterpCreate((yyvsp[(1) - (1)].str), NULL); } +#line 419 "parser.y" + { (yyval.interp) = InterpCreate((yyvsp[(1) - (1)].keysym), NULL); } break; case 59: /* Line 1806 of yacc.c */ -#line 383 "parser.y" +#line 423 "parser.y" { (yyval.var) = (VarDef *)AppendStmt(&(yyvsp[(1) - (2)].var)->common, &(yyvsp[(2) - (2)].var)->common); } break; case 60: /* Line 1806 of yacc.c */ -#line 385 "parser.y" +#line 425 "parser.y" { (yyval.var) = (yyvsp[(1) - (1)].var); } break; case 61: /* Line 1806 of yacc.c */ -#line 391 "parser.y" +#line 431 "parser.y" { (yyval.keyType) = KeyTypeCreate((yyvsp[(2) - (6)].sval), (yyvsp[(4) - (6)].var)); } break; case 62: /* Line 1806 of yacc.c */ -#line 397 "parser.y" - { (yyval.syms) = SymbolsCreate((yyvsp[(2) - (6)].sval), (ExprDef *)(yyvsp[(4) - (6)].var)); } +#line 437 "parser.y" + { (yyval.syms) = SymbolsCreate((yyvsp[(2) - (6)].sval), (yyvsp[(4) - (6)].var)); } break; case 63: /* Line 1806 of yacc.c */ -#line 401 "parser.y" +#line 441 "parser.y" { (yyval.var) = (VarDef *)AppendStmt(&(yyvsp[(1) - (3)].var)->common, &(yyvsp[(3) - (3)].var)->common); } break; case 64: /* Line 1806 of yacc.c */ -#line 403 "parser.y" +#line 443 "parser.y" { (yyval.var) = (yyvsp[(1) - (1)].var); } break; case 65: /* Line 1806 of yacc.c */ -#line 404 "parser.y" +#line 444 "parser.y" { (yyval.var) = NULL; } break; case 66: /* Line 1806 of yacc.c */ -#line 407 "parser.y" +#line 447 "parser.y" { (yyval.var) = VarCreate((yyvsp[(1) - (3)].expr), (yyvsp[(3) - (3)].expr)); } break; case 67: /* Line 1806 of yacc.c */ -#line 408 "parser.y" +#line 448 "parser.y" { (yyval.var) = VarCreate((yyvsp[(1) - (3)].expr), (yyvsp[(3) - (3)].expr)); } break; case 68: /* Line 1806 of yacc.c */ -#line 409 "parser.y" - { (yyval.var) = BoolVarCreate((yyvsp[(1) - (1)].sval), 1); } +#line 449 "parser.y" + { (yyval.var) = BoolVarCreate((yyvsp[(1) - (1)].sval), true); } break; case 69: /* Line 1806 of yacc.c */ -#line 410 "parser.y" - { (yyval.var) = BoolVarCreate((yyvsp[(2) - (2)].sval), 0); } +#line 450 "parser.y" + { (yyval.var) = BoolVarCreate((yyvsp[(2) - (2)].sval), false); } break; case 70: /* Line 1806 of yacc.c */ -#line 411 "parser.y" +#line 451 "parser.y" { (yyval.var) = VarCreate(NULL, (yyvsp[(1) - (1)].expr)); } break; case 71: /* Line 1806 of yacc.c */ -#line 415 "parser.y" +#line 455 "parser.y" { (yyval.expr) = (yyvsp[(2) - (3)].expr); } break; case 72: /* Line 1806 of yacc.c */ -#line 417 "parser.y" +#line 457 "parser.y" { (yyval.expr) = ExprCreateUnary(EXPR_ACTION_LIST, EXPR_TYPE_ACTION, (yyvsp[(2) - (3)].expr)); } break; case 73: /* Line 1806 of yacc.c */ -#line 421 "parser.y" +#line 461 "parser.y" { (yyval.groupCompat) = GroupCompatCreate((yyvsp[(2) - (5)].ival), (yyvsp[(4) - (5)].expr)); } break; case 74: /* Line 1806 of yacc.c */ -#line 425 "parser.y" +#line 465 "parser.y" { (yyval.modMask) = ModMapCreate((yyvsp[(2) - (6)].sval), (yyvsp[(4) - (6)].expr)); } break; case 75: /* Line 1806 of yacc.c */ -#line 429 "parser.y" +#line 469 "parser.y" { (yyval.ledMap) = LedMapCreate((yyvsp[(2) - (6)].sval), (yyvsp[(4) - (6)].var)); } break; case 76: /* Line 1806 of yacc.c */ -#line 433 "parser.y" +#line 473 "parser.y" { (yyval.ledName) = LedNameCreate((yyvsp[(2) - (5)].ival), (yyvsp[(4) - (5)].expr), false); } break; case 77: /* Line 1806 of yacc.c */ -#line 435 "parser.y" +#line 475 "parser.y" { (yyval.ledName) = LedNameCreate((yyvsp[(3) - (6)].ival), (yyvsp[(5) - (6)].expr), true); } break; case 78: /* Line 1806 of yacc.c */ -#line 439 "parser.y" +#line 479 "parser.y" { (yyval.geom) = NULL; } break; case 79: /* Line 1806 of yacc.c */ -#line 441 "parser.y" +#line 481 "parser.y" { (yyval.geom) = NULL; } break; case 80: /* Line 1806 of yacc.c */ -#line 445 "parser.y" +#line 485 "parser.y" { (yyval.geom) = NULL; } break; case 81: /* Line 1806 of yacc.c */ -#line 448 "parser.y" +#line 488 "parser.y" { (yyval.geom) = NULL;} break; case 82: /* Line 1806 of yacc.c */ -#line 449 "parser.y" +#line 489 "parser.y" { (yyval.geom) = NULL; } break; case 83: /* Line 1806 of yacc.c */ -#line 453 "parser.y" +#line 493 "parser.y" { (yyval.geom) = NULL; } break; case 84: /* Line 1806 of yacc.c */ -#line 455 "parser.y" +#line 495 "parser.y" { FreeStmt(&(yyvsp[(1) - (1)].var)->common); (yyval.geom) = NULL; } break; case 85: /* Line 1806 of yacc.c */ -#line 457 "parser.y" +#line 497 "parser.y" { (yyval.geom) = NULL; } break; case 86: /* Line 1806 of yacc.c */ -#line 459 "parser.y" +#line 499 "parser.y" { FreeStmt(&(yyvsp[(1) - (1)].ledMap)->common); (yyval.geom) = NULL; } break; case 87: /* Line 1806 of yacc.c */ -#line 461 "parser.y" +#line 501 "parser.y" { (yyval.geom) = NULL; } break; case 88: /* Line 1806 of yacc.c */ -#line 464 "parser.y" +#line 504 "parser.y" { (yyval.geom) = NULL;} break; case 89: /* Line 1806 of yacc.c */ -#line 465 "parser.y" +#line 505 "parser.y" { (yyval.geom) = NULL; } break; case 90: /* Line 1806 of yacc.c */ -#line 468 "parser.y" +#line 508 "parser.y" { (yyval.geom) = NULL; } break; case 91: /* Line 1806 of yacc.c */ -#line 470 "parser.y" +#line 510 "parser.y" { FreeStmt(&(yyvsp[(1) - (1)].var)->common); (yyval.geom) = NULL; } break; case 92: /* Line 1806 of yacc.c */ -#line 473 "parser.y" +#line 513 "parser.y" { (yyval.geom) = NULL; } break; case 93: /* Line 1806 of yacc.c */ -#line 474 "parser.y" +#line 514 "parser.y" { (yyval.geom) = NULL; } break; case 94: /* Line 1806 of yacc.c */ -#line 478 "parser.y" +#line 518 "parser.y" { (yyval.geom) = NULL; } break; case 95: /* Line 1806 of yacc.c */ -#line 480 "parser.y" +#line 520 "parser.y" { FreeStmt(&(yyvsp[(2) - (3)].expr)->common); (yyval.geom) = NULL; } break; case 96: /* Line 1806 of yacc.c */ -#line 484 "parser.y" +#line 524 "parser.y" { (yyval.geom) = NULL; } break; case 97: /* Line 1806 of yacc.c */ -#line 487 "parser.y" +#line 527 "parser.y" { (yyval.geom) = NULL; } break; case 98: /* Line 1806 of yacc.c */ -#line 488 "parser.y" +#line 528 "parser.y" { (yyval.geom) = NULL; } break; case 99: /* Line 1806 of yacc.c */ -#line 491 "parser.y" +#line 531 "parser.y" { (yyval.geom) = NULL; } break; case 100: /* Line 1806 of yacc.c */ -#line 495 "parser.y" +#line 535 "parser.y" { (yyval.geom) = NULL;} break; case 101: /* Line 1806 of yacc.c */ -#line 497 "parser.y" +#line 537 "parser.y" { (yyval.geom) = NULL; } break; case 102: /* Line 1806 of yacc.c */ -#line 501 "parser.y" +#line 541 "parser.y" { (yyval.geom) = NULL; } break; case 103: /* Line 1806 of yacc.c */ -#line 503 "parser.y" +#line 543 "parser.y" { (yyval.geom) = NULL; } break; case 104: /* Line 1806 of yacc.c */ -#line 505 "parser.y" +#line 545 "parser.y" { FreeStmt(&(yyvsp[(3) - (3)].expr)->common); (yyval.geom) = NULL; } break; case 105: /* Line 1806 of yacc.c */ -#line 509 "parser.y" +#line 549 "parser.y" { (yyval.expr) = NULL; } break; case 106: /* Line 1806 of yacc.c */ -#line 511 "parser.y" +#line 551 "parser.y" { (yyval.expr) = NULL; } break; case 107: /* Line 1806 of yacc.c */ -#line 515 "parser.y" +#line 555 "parser.y" { (yyval.expr) = NULL; } break; case 108: /* Line 1806 of yacc.c */ -#line 519 "parser.y" +#line 559 "parser.y" { FreeStmt(&(yyvsp[(4) - (6)].var)->common); (yyval.geom) = NULL; } break; case 109: /* Line 1806 of yacc.c */ -#line 522 "parser.y" - { (yyval.uval) = 0; } +#line 562 "parser.y" + { (yyval.ival) = 0; } break; case 110: /* Line 1806 of yacc.c */ -#line 523 "parser.y" - { (yyval.uval) = 0; } +#line 563 "parser.y" + { (yyval.ival) = 0; } break; case 111: /* Line 1806 of yacc.c */ -#line 524 "parser.y" - { (yyval.uval) = 0; } +#line 564 "parser.y" + { (yyval.ival) = 0; } break; case 112: /* Line 1806 of yacc.c */ -#line 525 "parser.y" - { (yyval.uval) = 0; } +#line 565 "parser.y" + { (yyval.ival) = 0; } break; case 113: /* Line 1806 of yacc.c */ -#line 528 "parser.y" +#line 568 "parser.y" { (yyval.sval) = (yyvsp[(1) - (1)].sval); } break; case 114: /* Line 1806 of yacc.c */ -#line 529 "parser.y" +#line 569 "parser.y" { (yyval.sval) = (yyvsp[(1) - (1)].sval); } break; case 115: /* Line 1806 of yacc.c */ -#line 533 "parser.y" - { (yyval.sval) = xkb_atom_intern(param->ctx, "action"); } +#line 573 "parser.y" + { (yyval.sval) = xkb_atom_intern_literal(param->ctx, "action"); } break; case 116: /* Line 1806 of yacc.c */ -#line 535 "parser.y" - { (yyval.sval) = xkb_atom_intern(param->ctx, "interpret"); } +#line 575 "parser.y" + { (yyval.sval) = xkb_atom_intern_literal(param->ctx, "interpret"); } break; case 117: /* Line 1806 of yacc.c */ -#line 537 "parser.y" - { (yyval.sval) = xkb_atom_intern(param->ctx, "type"); } +#line 577 "parser.y" + { (yyval.sval) = xkb_atom_intern_literal(param->ctx, "type"); } break; case 118: /* Line 1806 of yacc.c */ -#line 539 "parser.y" - { (yyval.sval) = xkb_atom_intern(param->ctx, "key"); } +#line 579 "parser.y" + { (yyval.sval) = xkb_atom_intern_literal(param->ctx, "key"); } break; case 119: /* Line 1806 of yacc.c */ -#line 541 "parser.y" - { (yyval.sval) = xkb_atom_intern(param->ctx, "group"); } +#line 581 "parser.y" + { (yyval.sval) = xkb_atom_intern_literal(param->ctx, "group"); } break; case 120: /* Line 1806 of yacc.c */ -#line 543 "parser.y" - {(yyval.sval) = xkb_atom_intern(param->ctx, "modifier_map");} +#line 583 "parser.y" + {(yyval.sval) = xkb_atom_intern_literal(param->ctx, "modifier_map");} break; case 121: /* Line 1806 of yacc.c */ -#line 545 "parser.y" - { (yyval.sval) = xkb_atom_intern(param->ctx, "indicator"); } +#line 585 "parser.y" + { (yyval.sval) = xkb_atom_intern_literal(param->ctx, "indicator"); } break; case 122: /* Line 1806 of yacc.c */ -#line 547 "parser.y" +#line 587 "parser.y" { (yyval.sval) = XKB_ATOM_NONE; } break; case 123: /* Line 1806 of yacc.c */ -#line 549 "parser.y" +#line 589 "parser.y" { (yyval.sval) = XKB_ATOM_NONE; } break; case 124: /* Line 1806 of yacc.c */ -#line 551 "parser.y" +#line 591 "parser.y" { (yyval.sval) = XKB_ATOM_NONE; } break; case 125: /* Line 1806 of yacc.c */ -#line 553 "parser.y" +#line 593 "parser.y" { (yyval.sval) = XKB_ATOM_NONE; } break; case 126: /* Line 1806 of yacc.c */ -#line 556 "parser.y" +#line 596 "parser.y" { (yyval.merge) = (yyvsp[(1) - (1)].merge); } break; case 127: /* Line 1806 of yacc.c */ -#line 557 "parser.y" +#line 597 "parser.y" { (yyval.merge) = MERGE_DEFAULT; } break; case 128: /* Line 1806 of yacc.c */ -#line 560 "parser.y" +#line 600 "parser.y" { (yyval.merge) = MERGE_DEFAULT; } break; case 129: /* Line 1806 of yacc.c */ -#line 561 "parser.y" +#line 601 "parser.y" { (yyval.merge) = MERGE_AUGMENT; } break; case 130: /* Line 1806 of yacc.c */ -#line 562 "parser.y" +#line 602 "parser.y" { (yyval.merge) = MERGE_OVERRIDE; } break; case 131: /* Line 1806 of yacc.c */ -#line 563 "parser.y" +#line 603 "parser.y" { (yyval.merge) = MERGE_REPLACE; } break; case 132: /* Line 1806 of yacc.c */ -#line 565 "parser.y" +#line 605 "parser.y" { /* * This used to be MERGE_ALT_FORM. This functionality was @@ -2966,324 +2943,286 @@ yyreduce: case 133: /* Line 1806 of yacc.c */ -#line 574 "parser.y" +#line 614 "parser.y" { (yyval.expr) = (yyvsp[(1) - (1)].expr); } break; case 134: /* Line 1806 of yacc.c */ -#line 575 "parser.y" +#line 615 "parser.y" { (yyval.expr) = NULL; } break; case 135: /* Line 1806 of yacc.c */ -#line 579 "parser.y" +#line 619 "parser.y" { (yyval.expr) = (ExprDef *)AppendStmt(&(yyvsp[(1) - (3)].expr)->common, &(yyvsp[(3) - (3)].expr)->common); } break; case 136: /* Line 1806 of yacc.c */ -#line 581 "parser.y" +#line 621 "parser.y" { (yyval.expr) = (yyvsp[(1) - (1)].expr); } break; case 137: /* Line 1806 of yacc.c */ -#line 585 "parser.y" +#line 625 "parser.y" { (yyval.expr) = ExprCreateBinary(EXPR_DIVIDE, (yyvsp[(1) - (3)].expr), (yyvsp[(3) - (3)].expr)); } break; case 138: /* Line 1806 of yacc.c */ -#line 587 "parser.y" +#line 627 "parser.y" { (yyval.expr) = ExprCreateBinary(EXPR_ADD, (yyvsp[(1) - (3)].expr), (yyvsp[(3) - (3)].expr)); } break; case 139: /* Line 1806 of yacc.c */ -#line 589 "parser.y" +#line 629 "parser.y" { (yyval.expr) = ExprCreateBinary(EXPR_SUBTRACT, (yyvsp[(1) - (3)].expr), (yyvsp[(3) - (3)].expr)); } break; case 140: /* Line 1806 of yacc.c */ -#line 591 "parser.y" +#line 631 "parser.y" { (yyval.expr) = ExprCreateBinary(EXPR_MULTIPLY, (yyvsp[(1) - (3)].expr), (yyvsp[(3) - (3)].expr)); } break; case 141: /* Line 1806 of yacc.c */ -#line 593 "parser.y" +#line 633 "parser.y" { (yyval.expr) = ExprCreateBinary(EXPR_ASSIGN, (yyvsp[(1) - (3)].expr), (yyvsp[(3) - (3)].expr)); } break; case 142: /* Line 1806 of yacc.c */ -#line 595 "parser.y" +#line 635 "parser.y" { (yyval.expr) = (yyvsp[(1) - (1)].expr); } break; case 143: /* Line 1806 of yacc.c */ -#line 599 "parser.y" - { (yyval.expr) = ExprCreateUnary(EXPR_NEGATE, (yyvsp[(2) - (2)].expr)->value_type, (yyvsp[(2) - (2)].expr)); } +#line 639 "parser.y" + { (yyval.expr) = ExprCreateUnary(EXPR_NEGATE, (yyvsp[(2) - (2)].expr)->expr.value_type, (yyvsp[(2) - (2)].expr)); } break; case 144: /* Line 1806 of yacc.c */ -#line 601 "parser.y" - { (yyval.expr) = ExprCreateUnary(EXPR_UNARY_PLUS, (yyvsp[(2) - (2)].expr)->value_type, (yyvsp[(2) - (2)].expr)); } +#line 641 "parser.y" + { (yyval.expr) = ExprCreateUnary(EXPR_UNARY_PLUS, (yyvsp[(2) - (2)].expr)->expr.value_type, (yyvsp[(2) - (2)].expr)); } break; case 145: /* Line 1806 of yacc.c */ -#line 603 "parser.y" +#line 643 "parser.y" { (yyval.expr) = ExprCreateUnary(EXPR_NOT, EXPR_TYPE_BOOLEAN, (yyvsp[(2) - (2)].expr)); } break; case 146: /* Line 1806 of yacc.c */ -#line 605 "parser.y" - { (yyval.expr) = ExprCreateUnary(EXPR_INVERT, (yyvsp[(2) - (2)].expr)->value_type, (yyvsp[(2) - (2)].expr)); } +#line 645 "parser.y" + { (yyval.expr) = ExprCreateUnary(EXPR_INVERT, (yyvsp[(2) - (2)].expr)->expr.value_type, (yyvsp[(2) - (2)].expr)); } break; case 147: /* Line 1806 of yacc.c */ -#line 607 "parser.y" +#line 647 "parser.y" { (yyval.expr) = (yyvsp[(1) - (1)].expr); } break; case 148: /* Line 1806 of yacc.c */ -#line 609 "parser.y" - { (yyval.expr) = ActionCreate((yyvsp[(1) - (4)].sval), (yyvsp[(3) - (4)].expr)); } +#line 649 "parser.y" + { (yyval.expr) = ExprCreateAction((yyvsp[(1) - (4)].sval), (yyvsp[(3) - (4)].expr)); } break; case 149: /* Line 1806 of yacc.c */ -#line 611 "parser.y" +#line 651 "parser.y" { (yyval.expr) = (yyvsp[(1) - (1)].expr); } break; case 150: /* Line 1806 of yacc.c */ -#line 613 "parser.y" +#line 653 "parser.y" { (yyval.expr) = (yyvsp[(2) - (3)].expr); } break; case 151: /* Line 1806 of yacc.c */ -#line 617 "parser.y" +#line 657 "parser.y" { (yyval.expr) = (ExprDef *)AppendStmt(&(yyvsp[(1) - (3)].expr)->common, &(yyvsp[(3) - (3)].expr)->common); } break; case 152: /* Line 1806 of yacc.c */ -#line 619 "parser.y" +#line 659 "parser.y" { (yyval.expr) = (yyvsp[(1) - (1)].expr); } break; case 153: /* Line 1806 of yacc.c */ -#line 623 "parser.y" - { (yyval.expr) = ActionCreate((yyvsp[(1) - (4)].sval), (yyvsp[(3) - (4)].expr)); } +#line 663 "parser.y" + { (yyval.expr) = ExprCreateAction((yyvsp[(1) - (4)].sval), (yyvsp[(3) - (4)].expr)); } break; case 154: /* Line 1806 of yacc.c */ -#line 627 "parser.y" - { - ExprDef *expr; - expr = ExprCreate(EXPR_IDENT, EXPR_TYPE_UNKNOWN); - expr->value.str = (yyvsp[(1) - (1)].sval); - (yyval.expr) = expr; - } +#line 667 "parser.y" + { (yyval.expr) = ExprCreateIdent((yyvsp[(1) - (1)].sval)); } break; case 155: /* Line 1806 of yacc.c */ -#line 634 "parser.y" - { - ExprDef *expr; - expr = ExprCreate(EXPR_FIELD_REF, EXPR_TYPE_UNKNOWN); - expr->value.field.element = (yyvsp[(1) - (3)].sval); - expr->value.field.field = (yyvsp[(3) - (3)].sval); - (yyval.expr) = expr; - } +#line 669 "parser.y" + { (yyval.expr) = ExprCreateFieldRef((yyvsp[(1) - (3)].sval), (yyvsp[(3) - (3)].sval)); } break; case 156: /* Line 1806 of yacc.c */ -#line 642 "parser.y" - { - ExprDef *expr; - expr = ExprCreate(EXPR_ARRAY_REF, EXPR_TYPE_UNKNOWN); - expr->value.array.element = XKB_ATOM_NONE; - expr->value.array.field = (yyvsp[(1) - (4)].sval); - expr->value.array.entry = (yyvsp[(3) - (4)].expr); - (yyval.expr) = expr; - } +#line 671 "parser.y" + { (yyval.expr) = ExprCreateArrayRef(XKB_ATOM_NONE, (yyvsp[(1) - (4)].sval), (yyvsp[(3) - (4)].expr)); } break; case 157: /* Line 1806 of yacc.c */ -#line 651 "parser.y" - { - ExprDef *expr; - expr = ExprCreate(EXPR_ARRAY_REF, EXPR_TYPE_UNKNOWN); - expr->value.array.element = (yyvsp[(1) - (6)].sval); - expr->value.array.field = (yyvsp[(3) - (6)].sval); - expr->value.array.entry = (yyvsp[(5) - (6)].expr); - (yyval.expr) = expr; - } +#line 673 "parser.y" + { (yyval.expr) = ExprCreateArrayRef((yyvsp[(1) - (6)].sval), (yyvsp[(3) - (6)].sval), (yyvsp[(5) - (6)].expr)); } break; case 158: /* Line 1806 of yacc.c */ -#line 662 "parser.y" - { - ExprDef *expr; - expr = ExprCreate(EXPR_VALUE, EXPR_TYPE_STRING); - expr->value.str = (yyvsp[(1) - (1)].sval); - (yyval.expr) = expr; - } +#line 677 "parser.y" + { (yyval.expr) = ExprCreateString((yyvsp[(1) - (1)].sval)); } break; case 159: /* Line 1806 of yacc.c */ -#line 669 "parser.y" - { - ExprDef *expr; - expr = ExprCreate(EXPR_VALUE, EXPR_TYPE_INT); - expr->value.ival = (yyvsp[(1) - (1)].ival); - (yyval.expr) = expr; - } +#line 679 "parser.y" + { (yyval.expr) = ExprCreateInteger((yyvsp[(1) - (1)].ival)); } break; case 160: /* Line 1806 of yacc.c */ -#line 676 "parser.y" - { - (yyval.expr) = NULL; - } +#line 681 "parser.y" + { (yyval.expr) = NULL; } break; case 161: /* Line 1806 of yacc.c */ -#line 680 "parser.y" - { - ExprDef *expr; - expr = ExprCreate(EXPR_VALUE, EXPR_TYPE_KEYNAME); - expr->value.keyName = (yyvsp[(1) - (1)].sval); - (yyval.expr) = expr; - } +#line 683 "parser.y" + { (yyval.expr) = ExprCreateKeyName((yyvsp[(1) - (1)].sval)); } break; case 162: /* Line 1806 of yacc.c */ -#line 688 "parser.y" +#line 686 "parser.y" { (yyval.expr) = (yyvsp[(1) - (1)].expr); } break; case 163: /* Line 1806 of yacc.c */ -#line 689 "parser.y" +#line 687 "parser.y" { (yyval.expr) = NULL; } break; case 164: /* Line 1806 of yacc.c */ -#line 693 "parser.y" - { (yyval.expr) = AppendKeysymList((yyvsp[(1) - (3)].expr), (yyvsp[(3) - (3)].str)); } +#line 691 "parser.y" + { (yyval.expr) = ExprAppendKeysymList((yyvsp[(1) - (3)].expr), (yyvsp[(3) - (3)].keysym)); } break; case 165: /* Line 1806 of yacc.c */ -#line 695 "parser.y" - { (yyval.expr) = AppendMultiKeysymList((yyvsp[(1) - (3)].expr), (yyvsp[(3) - (3)].expr)); } +#line 693 "parser.y" + { (yyval.expr) = ExprAppendMultiKeysymList((yyvsp[(1) - (3)].expr), (yyvsp[(3) - (3)].expr)); } break; case 166: /* Line 1806 of yacc.c */ -#line 697 "parser.y" - { (yyval.expr) = CreateKeysymList((yyvsp[(1) - (1)].str)); } +#line 695 "parser.y" + { (yyval.expr) = ExprCreateKeysymList((yyvsp[(1) - (1)].keysym)); } break; case 167: /* Line 1806 of yacc.c */ -#line 699 "parser.y" - { (yyval.expr) = CreateMultiKeysymList((yyvsp[(1) - (1)].expr)); } +#line 697 "parser.y" + { (yyval.expr) = ExprCreateMultiKeysymList((yyvsp[(1) - (1)].expr)); } break; case 168: /* Line 1806 of yacc.c */ -#line 703 "parser.y" +#line 701 "parser.y" { (yyval.expr) = (yyvsp[(2) - (3)].expr); } break; case 169: /* Line 1806 of yacc.c */ -#line 706 "parser.y" - { (yyval.str) = (yyvsp[(1) - (1)].str); } +#line 705 "parser.y" + { + if (!resolve_keysym((yyvsp[(1) - (1)].str), &(yyval.keysym))) + parser_warn(param, "unrecognized keysym"); + free((yyvsp[(1) - (1)].str)); + } break; case 170: /* Line 1806 of yacc.c */ -#line 707 "parser.y" - { (yyval.str) = strdup("section"); } +#line 710 "parser.y" + { (yyval.keysym) = XKB_KEY_section; } break; case 171: /* Line 1806 of yacc.c */ -#line 709 "parser.y" +#line 712 "parser.y" { - if ((yyvsp[(1) - (1)].ival) < 10) { /* XK_0 .. XK_9 */ - (yyval.str) = malloc(2); - (yyval.str)[0] = (yyvsp[(1) - (1)].ival) + '0'; - (yyval.str)[1] = '\0'; + if ((yyvsp[(1) - (1)].ival) < 10) { /* XKB_KEY_0 .. XKB_KEY_9 */ + (yyval.keysym) = XKB_KEY_0 + (yyvsp[(1) - (1)].ival); } else { - (yyval.str) = malloc(17); - snprintf((yyval.str), 17, "0x%x", (yyvsp[(1) - (1)].ival)); + char buf[17]; + snprintf(buf, sizeof(buf), "0x%x", (yyvsp[(1) - (1)].ival)); + if (!resolve_keysym(buf, &(yyval.keysym))) + parser_warn(param, "unrecognized keysym"); } } break; @@ -3291,98 +3230,98 @@ yyreduce: case 172: /* Line 1806 of yacc.c */ -#line 722 "parser.y" +#line 725 "parser.y" { (yyval.ival) = -(yyvsp[(2) - (2)].ival); } break; case 173: /* Line 1806 of yacc.c */ -#line 723 "parser.y" +#line 726 "parser.y" { (yyval.ival) = (yyvsp[(1) - (1)].ival); } break; case 174: /* Line 1806 of yacc.c */ -#line 726 "parser.y" +#line 729 "parser.y" { (yyval.ival) = (yyvsp[(1) - (1)].num); } break; case 175: /* Line 1806 of yacc.c */ -#line 727 "parser.y" +#line 730 "parser.y" { (yyval.ival) = (yyvsp[(1) - (1)].num); } break; case 176: /* Line 1806 of yacc.c */ -#line 730 "parser.y" +#line 733 "parser.y" { (yyval.ival) = 0; } break; case 177: /* Line 1806 of yacc.c */ -#line 733 "parser.y" +#line 736 "parser.y" { (yyval.ival) = (yyvsp[(1) - (1)].num); } break; case 178: /* Line 1806 of yacc.c */ -#line 736 "parser.y" +#line 739 "parser.y" { (yyval.num) = (yyvsp[(1) - (1)].num); } break; case 179: /* Line 1806 of yacc.c */ -#line 739 "parser.y" +#line 742 "parser.y" { (yyval.sval) = xkb_atom_steal(param->ctx, (yyvsp[(1) - (1)].str)); } break; case 180: /* Line 1806 of yacc.c */ -#line 740 "parser.y" - { (yyval.sval) = xkb_atom_intern(param->ctx, "default"); } +#line 743 "parser.y" + { (yyval.sval) = xkb_atom_intern_literal(param->ctx, "default"); } break; case 181: /* Line 1806 of yacc.c */ -#line 743 "parser.y" +#line 746 "parser.y" { (yyval.sval) = xkb_atom_steal(param->ctx, (yyvsp[(1) - (1)].str)); } break; case 182: /* Line 1806 of yacc.c */ -#line 746 "parser.y" +#line 749 "parser.y" { (yyval.str) = (yyvsp[(1) - (1)].str); } break; case 183: /* Line 1806 of yacc.c */ -#line 747 "parser.y" +#line 750 "parser.y" { (yyval.str) = NULL; } break; case 184: /* Line 1806 of yacc.c */ -#line 750 "parser.y" +#line 753 "parser.y" { (yyval.str) = (yyvsp[(1) - (1)].str); } break; /* Line 1806 of yacc.c */ -#line 3386 "src/xkbcomp/parser.c" +#line 3325 "src/xkbcomp/parser.c" default: break; } /* User semantic actions sometimes alter yychar, and that requires @@ -3403,7 +3342,6 @@ yyreduce: YY_STACK_PRINT (yyss, yyssp); *++yyvsp = yyval; - *++yylsp = yyloc; /* Now `shift' the result of the reduction. Determine what state that goes to, based on the state we popped back to and the rule @@ -3433,7 +3371,7 @@ yyerrlab: { ++yynerrs; #if ! YYERROR_VERBOSE - yyerror (&yylloc, param, YY_("syntax error")); + yyerror (param, YY_("syntax error")); #else # define YYSYNTAX_ERROR yysyntax_error (&yymsg_alloc, &yymsg, \ yyssp, yytoken) @@ -3460,7 +3398,7 @@ yyerrlab: yymsgp = yymsg; } } - yyerror (&yylloc, param, yymsgp); + yyerror (param, yymsgp); if (yysyntax_error_status == 2) goto yyexhaustedlab; } @@ -3468,7 +3406,7 @@ yyerrlab: #endif } - yyerror_range[1] = yylloc; + if (yyerrstatus == 3) { @@ -3484,7 +3422,7 @@ yyerrlab: else { yydestruct ("Error: discarding", - yytoken, &yylval, &yylloc, param); + yytoken, &yylval, param); yychar = YYEMPTY; } } @@ -3505,7 +3443,6 @@ yyerrorlab: if (/*CONSTCOND*/ 0) goto yyerrorlab; - yyerror_range[1] = yylsp[1-yylen]; /* Do not reclaim the symbols of the rule which action triggered this YYERROR. */ YYPOPSTACK (yylen); @@ -3539,9 +3476,9 @@ yyerrlab1: if (yyssp == yyss) YYABORT; - yyerror_range[1] = *yylsp; + yydestruct ("Error: popping", - yystos[yystate], yyvsp, yylsp, param); + yystos[yystate], yyvsp, param); YYPOPSTACK (1); yystate = *yyssp; YY_STACK_PRINT (yyss, yyssp); @@ -3549,11 +3486,6 @@ yyerrlab1: *++yyvsp = yylval; - yyerror_range[2] = yylloc; - /* Using YYLLOC is tempting, but would change the location of - the lookahead. YYLOC is available though. */ - YYLLOC_DEFAULT (yyloc, yyerror_range, 2); - *++yylsp = yyloc; /* Shift the error token. */ YY_SYMBOL_PRINT ("Shifting", yystos[yyn], yyvsp, yylsp); @@ -3581,7 +3513,7 @@ yyabortlab: | yyexhaustedlab -- memory exhaustion comes here. | `-------------------------------------------------*/ yyexhaustedlab: - yyerror (&yylloc, param, YY_("memory exhausted")); + yyerror (param, YY_("memory exhausted")); yyresult = 2; /* Fall through. */ #endif @@ -3593,7 +3525,7 @@ yyreturn: user semantic actions for why this is necessary. */ yytoken = YYTRANSLATE (yychar); yydestruct ("Cleanup: discarding lookahead", - yytoken, &yylval, &yylloc, param); + yytoken, &yylval, param); } /* Do not reclaim the symbols of the rule which action triggered this YYABORT or YYACCEPT. */ @@ -3602,7 +3534,7 @@ yyreturn: while (yyssp != yyss) { yydestruct ("Cleanup: popping", - yystos[*yyssp], yyvsp, yylsp, param); + yystos[*yyssp], yyvsp, param); YYPOPSTACK (1); } #ifndef yyoverflow @@ -3620,7 +3552,7 @@ yyreturn: /* Line 2067 of yacc.c */ -#line 753 "parser.y" +#line 756 "parser.y" #undef scanner @@ -3628,12 +3560,12 @@ yyreturn: XkbFile * parse(struct xkb_context *ctx, void *scanner, const char *map) { - struct parser_param param; int ret; XkbFile *first = NULL; - - param.scanner = scanner; - param.ctx = ctx; + struct parser_param param = { + .scanner = scanner, + .ctx = ctx, + }; /* * If we got a specific map, we look for it exclusively and return @@ -3672,3 +3604,5 @@ parse(struct xkb_context *ctx, void *scanner, const char *map) return first; } +#define scanner param->scanner + diff --git a/src/3rdparty/xkbcommon/src/xkbcomp/parser.h b/src/3rdparty/xkbcommon/src/xkbcomp/parser.h index fba3f4ebd0..f85a2bad85 100644 --- a/src/3rdparty/xkbcommon/src/xkbcomp/parser.h +++ b/src/3rdparty/xkbcommon/src/xkbcomp/parser.h @@ -175,16 +175,16 @@ typedef union YYSTYPE { /* Line 2068 of yacc.c */ -#line 127 "parser.y" +#line 167 "parser.y" int ival; - unsigned uval; int64_t num; enum xkb_file_type file_type; char *str; xkb_atom_t sval; enum merge_mode merge; enum xkb_map_flags mapFlags; + xkb_keysym_t keysym; ParseCommon *any; ExprDef *expr; VarDef *var; @@ -213,18 +213,4 @@ typedef union YYSTYPE -#if ! defined YYLTYPE && ! defined YYLTYPE_IS_DECLARED -typedef struct YYLTYPE -{ - int first_line; - int first_column; - int last_line; - int last_column; -} YYLTYPE; -# define yyltype YYLTYPE /* obsolescent; will be withdrawn */ -# define YYLTYPE_IS_DECLARED 1 -# define YYLTYPE_IS_TRIVIAL 1 -#endif - - diff --git a/src/3rdparty/xkbcommon/src/xkbcomp/rules.c b/src/3rdparty/xkbcommon/src/xkbcomp/rules.c index 3f717600fd..de82d96119 100644 --- a/src/3rdparty/xkbcommon/src/xkbcomp/rules.c +++ b/src/3rdparty/xkbcommon/src/xkbcomp/rules.c @@ -47,16 +47,10 @@ * DEALINGS IN THE SOFTWARE. */ -#include <ctype.h> -#include <fcntl.h> -#include <unistd.h> -#include <sys/mman.h> -#include <sys/stat.h> -#include <sys/types.h> - #include "xkbcomp-priv.h" #include "rules.h" #include "include.h" +#include "scanner-utils.h" /* * The rules file @@ -138,25 +132,6 @@ /* Scanner / Lexer */ -/* Point to some substring in the file; used to avoid copying. */ -struct sval { - const char *start; - unsigned int len; -}; -typedef darray(struct sval) darray_sval; - -static inline bool -svaleq(struct sval s1, struct sval s2) -{ - return s1.len == s2.len && strncmp(s1.start, s2.start, s1.len) == 0; -} - -static inline bool -svaleq_prefix(struct sval s1, struct sval s2) -{ - return s1.len <= s2.len && strncmp(s1.start, s2.start, s1.len) == 0; -} - /* Values returned with some tokens, like yylval. */ union lvalue { struct sval string; @@ -170,15 +145,6 @@ struct location { int line, column; }; -struct scanner { - const char *s; - size_t pos; - size_t len; - int line, column; - const char *file_name; - struct xkb_context *ctx; -}; - enum rules_token { TOK_END_OF_FILE = 0, TOK_END_OF_LINE, @@ -190,81 +156,20 @@ enum rules_token { TOK_ERROR }; -static void -scanner_init(struct scanner *s, struct xkb_context *ctx, - const char *string, size_t len, const char *file_name) -{ - s->s = string; - s->len = len; - s->pos = 0; - s->line = s->column = 1; - s->file_name = file_name; - s->ctx = ctx; -} - /* C99 is stupid. Just use the 1 variant when there are no args. */ #define scanner_error1(scanner, loc, msg) \ - log_warn(scanner->ctx, "rules/%s:%d:%d: " msg "\n", \ - scanner->file_name, loc->line, loc->column) + log_warn((scanner)->ctx, "rules/%s:%d:%d: %s\n", \ + (scanner)->file_name, (loc)->line, (loc)->column, msg) #define scanner_error(scanner, loc, fmt, ...) \ - log_warn(scanner->ctx, "rules/%s:%d:%d: " fmt "\n", \ - scanner->file_name, loc->line, loc->column, __VA_ARGS__) - -static char -peek(struct scanner *s) -{ - return s->pos < s->len ? s->s[s->pos] : '\0'; -} - -static bool -eof(struct scanner *s) -{ - return peek(s) == '\0'; -} - -static bool -eol(struct scanner *s) -{ - return peek(s) == '\n'; -} + log_warn((scanner)->ctx, "rules/%s:%d:%d: " fmt "\n", \ + (scanner)->file_name, (loc)->line, (loc)->column, __VA_ARGS__) -static char -next(struct scanner *s) +static inline bool +is_ident(char ch) { - if (eof(s)) - return '\0'; - if (eol(s)) { - s->line++; - s->column = 1; - } - else { - s->column++; - } - return s->s[s->pos++]; + return is_graph(ch) && ch != '\\'; } -static bool -chr(struct scanner *s, char ch) -{ - if (peek(s) != ch) - return false; - s->pos++; s->column++; - return true; -} - -static bool -str(struct scanner *s, const char *string, size_t len) -{ - if (s->len - s->pos < len) - return false; - if (strncasecmp(s->s + s->pos, string, len) != 0) - return false; - s->pos += len; s->column += len; - return true; -} - -#define lit(s, literal) str(s, literal, sizeof(literal) - 1) - static enum rules_token lex(struct scanner *s, union lvalue *val, struct location *loc) { @@ -310,7 +215,7 @@ skip_more_whitespace_and_comments: if (chr(s, '$')) { val->string.start = s->s + s->pos; val->string.len = 0; - while (isgraph(peek(s))) { + while (is_ident(peek(s))) { next(s); val->string.len++; } @@ -323,10 +228,10 @@ skip_more_whitespace_and_comments: } /* Identifier. */ - if (isgraph(peek(s))) { + if (is_ident(peek(s))) { val->string.start = s->s + s->pos; val->string.len = 0; - while (isgraph(peek(s))) { + while (is_ident(peek(s))) { next(s); val->string.len++; } @@ -440,8 +345,8 @@ struct matcher { static struct sval strip_spaces(struct sval v) { - while (v.len > 0 && isspace(v.start[0])) { v.len--; v.start++; } - while (v.len > 0 && isspace(v.start[v.len - 1])) v.len--; + while (v.len > 0 && is_space(v.start[0])) { v.len--; v.start++; } + while (v.len > 0 && is_space(v.start[v.len - 1])) v.len--; return v; } @@ -449,7 +354,6 @@ static darray_sval split_comma_separated_string(const char *s) { darray_sval arr = darray_new(); - struct sval val = { NULL, 0 }; /* * Make sure the array returned by this function always includes at @@ -457,12 +361,13 @@ split_comma_separated_string(const char *s) */ if (!s) { + struct sval val = { NULL, 0 }; darray_append(arr, val); return arr; } while (true) { - val.start = s; val.len = 0; + struct sval val = { s, 0 }; while (*s != '\0' && *s != ',') { s++; val.len++; } darray_append(arr, strip_spaces(val)); if (*s == '\0') break; @@ -482,7 +387,7 @@ matcher_new(struct xkb_context *ctx, m->ctx = ctx; m->rmlvo.model.start = rmlvo->model; - m->rmlvo.model.len = rmlvo->model ? strlen(rmlvo->model) : 0; + m->rmlvo.model.len = strlen_safe(rmlvo->model); m->rmlvo.layouts = split_comma_separated_string(rmlvo->layout); m->rmlvo.variants = split_comma_separated_string(rmlvo->variant); m->rmlvo.options = split_comma_separated_string(rmlvo->options); @@ -505,15 +410,10 @@ matcher_free(struct matcher *m) free(m); } -/* C99 is stupid. Just use the 1 variant when there are no args. */ #define matcher_error1(matcher, msg) \ - log_warn(matcher->ctx, "rules/%s:%d:%d: " msg "\n", \ - matcher->scanner.file_name, matcher->loc.line, \ - matcher->loc.column) + scanner_error1(&(matcher)->scanner, &(matcher)->loc, msg) #define matcher_error(matcher, fmt, ...) \ - log_warn(matcher->ctx, "rules/%s:%d:%d: " fmt "\n", \ - matcher->scanner.file_name, matcher->loc.line, \ - matcher->loc.column, __VA_ARGS__) + scanner_error(&(matcher)->scanner, &(matcher)->loc, fmt, __VA_ARGS__) static void matcher_group_start_new(struct matcher *m, struct sval name) @@ -532,10 +432,9 @@ matcher_group_add_element(struct matcher *m, struct sval element) static void matcher_mapping_start_new(struct matcher *m) { - unsigned int i; - for (i = 0; i < _MLVO_NUM_ENTRIES; i++) + for (unsigned i = 0; i < _MLVO_NUM_ENTRIES; i++) m->mapping.mlvo_at_pos[i] = -1; - for (i = 0; i < _KCCGST_NUM_ENTRIES; i++) + for (unsigned i = 0; i < _KCCGST_NUM_ENTRIES; i++) m->mapping.kccgst_at_pos[i] = -1; m->mapping.layout_idx = m->mapping.variant_idx = XKB_LAYOUT_INVALID; m->mapping.num_mlvo = m->mapping.num_kccgst = 0; @@ -551,7 +450,7 @@ extract_layout_index(const char *s, size_t max_len, xkb_layout_index_t *out) *out = XKB_LAYOUT_INVALID; if (max_len < 3) return -1; - if (s[0] != '[' || !isdigit(s[1]) || s[2] != ']') + if (s[0] != '[' || !is_digit(s[1]) || s[2] != ']') return -1; if (s[1] - '0' < 1 || s[1] - '0' > XKB_MAX_GROUPS) return -1; @@ -565,8 +464,6 @@ matcher_mapping_set_mlvo(struct matcher *m, struct sval ident) { enum rules_mlvo mlvo; struct sval mlvo_sval; - xkb_layout_index_t idx; - int consumed; for (mlvo = 0; mlvo < _MLVO_NUM_ENTRIES; mlvo++) { mlvo_sval = rules_mlvo_svals[mlvo]; @@ -596,8 +493,9 @@ matcher_mapping_set_mlvo(struct matcher *m, struct sval ident) /* If there are leftovers still, it must be an index. */ if (mlvo_sval.len < ident.len) { - consumed = extract_layout_index(ident.start + mlvo_sval.len, - ident.len - mlvo_sval.len, &idx); + xkb_layout_index_t idx; + int consumed = extract_layout_index(ident.start + mlvo_sval.len, + ident.len - mlvo_sval.len, &idx); if ((int) (ident.len - mlvo_sval.len) != consumed) { matcher_error(m, "invalid mapping:\" %.*s\" may only be followed by a valid group index; " @@ -822,14 +720,8 @@ static bool append_expanded_kccgst_value(struct matcher *m, darray_char *to, struct sval value) { - unsigned int i; - size_t original_size = darray_size(*to); + const size_t original_size = darray_size(*to); const char *s = value.start; - xkb_layout_index_t idx; - int consumed; - enum rules_mlvo mlv; - struct sval expanded; - char pfx, sfx; /* * Appending bar to foo -> foo (not an error if this happens) @@ -847,7 +739,12 @@ append_expanded_kccgst_value(struct matcher *m, darray_char *to, * Some ugly hand-lexing here, but going through the scanner is more * trouble than it's worth, and the format is ugly on its own merit. */ - for (i = 0; i < value.len; ) { + for (unsigned i = 0; i < value.len; ) { + enum rules_mlvo mlv; + xkb_layout_index_t idx; + char pfx, sfx; + struct sval expanded; + /* Check if that's a start of an expansion. */ if (s[i] != '%') { /* Just a normal character. */ @@ -876,22 +773,19 @@ append_expanded_kccgst_value(struct matcher *m, darray_char *to, /* Check for index. */ idx = XKB_LAYOUT_INVALID; - if (i < value.len) { - if (s[i] == '[') { - if (mlv != MLVO_LAYOUT && mlv != MLVO_VARIANT) { - matcher_error1(m, - "invalid index in %%-expansion; " - "may only index layout or variant"); - goto error; - } - - consumed = extract_layout_index(s + i, value.len - i, &idx); - if (consumed == -1) goto error; - i += consumed; - } - else { - idx = XKB_LAYOUT_INVALID; + if (i < value.len && s[i] == '[') { + int consumed; + + if (mlv != MLVO_LAYOUT && mlv != MLVO_VARIANT) { + matcher_error1(m, + "invalid index in %%-expansion; " + "may only index layout or variant"); + goto error; } + + consumed = extract_layout_index(s + i, value.len - i, &idx); + if (consumed == -1) goto error; + i += consumed; } /* Check for suffix, if there supposed to be one. */ @@ -959,37 +853,31 @@ matcher_rule_verify(struct matcher *m) static void matcher_rule_apply_if_matches(struct matcher *m) { - unsigned int i; - enum rules_mlvo mlvo; - enum rules_kccgst kccgst; - struct sval value, *option; - enum mlvo_match_type match_type; - bool matched = false; - xkb_layout_index_t idx; - - for (i = 0; i < m->mapping.num_mlvo; i++) { - mlvo = m->mapping.mlvo_at_pos[i]; - value = m->rule.mlvo_value_at_pos[i]; - match_type = m->rule.match_type_at_pos[i]; + for (unsigned i = 0; i < m->mapping.num_mlvo; i++) { + enum rules_mlvo mlvo = m->mapping.mlvo_at_pos[i]; + struct sval value = m->rule.mlvo_value_at_pos[i]; + enum mlvo_match_type match_type = m->rule.match_type_at_pos[i]; + bool matched = false; if (mlvo == MLVO_MODEL) { matched = match_value(m, value, m->rmlvo.model, match_type); } else if (mlvo == MLVO_LAYOUT) { - idx = m->mapping.layout_idx; + xkb_layout_index_t idx = m->mapping.layout_idx; idx = (idx == XKB_LAYOUT_INVALID ? 0 : idx); matched = match_value(m, value, darray_item(m->rmlvo.layouts, idx), match_type); } else if (mlvo == MLVO_VARIANT) { - idx = m->mapping.layout_idx; + xkb_layout_index_t idx = m->mapping.layout_idx; idx = (idx == XKB_LAYOUT_INVALID ? 0 : idx); matched = match_value(m, value, darray_item(m->rmlvo.variants, idx), match_type); } else if (mlvo == MLVO_OPTION) { + struct sval *option; darray_foreach(option, m->rmlvo.options) { matched = match_value(m, value, *option, match_type); if (matched) @@ -1001,9 +889,9 @@ matcher_rule_apply_if_matches(struct matcher *m) return; } - for (i = 0; i < m->mapping.num_kccgst; i++) { - kccgst = m->mapping.kccgst_at_pos[i]; - value = m->rule.kccgst_value_at_pos[i]; + for (unsigned i = 0; i < m->mapping.num_kccgst; i++) { + enum rules_kccgst kccgst = m->mapping.kccgst_at_pos[i]; + struct sval value = m->rule.kccgst_value_at_pos[i]; append_expanded_kccgst_value(m, &m->kccgst[kccgst], value); } @@ -1193,36 +1081,27 @@ xkb_components_from_rules(struct xkb_context *ctx, bool ret = false; FILE *file; char *path; - int fd; - struct stat stat_buf; - char *string; + const char *string; + size_t size; struct matcher *matcher; file = FindFileInXkbPath(ctx, rmlvo->rules, FILE_TYPE_RULES, &path); if (!file) goto err_out; - fd = fileno(file); - - if (fstat(fd, &stat_buf) != 0) { - log_err(ctx, "Couldn't stat rules file\n"); - goto err_file; - } - - string = mmap(NULL, stat_buf.st_size, PROT_READ, MAP_SHARED, fd, 0); - if (string == MAP_FAILED) { - log_err(ctx, "Couldn't mmap rules file (%lld bytes)\n", - (long long) stat_buf.st_size); + ret = map_file(file, &string, &size); + if (!ret) { + log_err(ctx, "Couldn't read rules file: %s\n", strerror(errno)); goto err_file; } matcher = matcher_new(ctx, rmlvo); - ret = matcher_match(matcher, string, stat_buf.st_size, rmlvo->rules, out); + ret = matcher_match(matcher, string, size, rmlvo->rules, out); if (!ret) log_err(ctx, "No components returned from XKB rules \"%s\"\n", path); matcher_free(matcher); - munmap(string, stat_buf.st_size); + unmap_file(string, size); err_file: free(path); fclose(file); diff --git a/src/3rdparty/xkbcommon/src/xkbcomp/scanner-utils.h b/src/3rdparty/xkbcommon/src/xkbcomp/scanner-utils.h new file mode 100644 index 0000000000..7e21b00662 --- /dev/null +++ b/src/3rdparty/xkbcommon/src/xkbcomp/scanner-utils.h @@ -0,0 +1,145 @@ +/* + * Copyright © 2012 Ran Benita <ran234@gmail.com> + * + * Permission is hereby granted, free of charge, to any person obtaining a + * copy of this software and associated documentation files (the "Software"), + * to deal in the Software without restriction, including without limitation + * the rights to use, copy, modify, merge, publish, distribute, sublicense, + * and/or sell copies of the Software, and to permit persons to whom the + * Software is furnished to do so, subject to the following conditions: + * + * The above copyright notice and this permission notice (including the next + * paragraph) shall be included in all copies or substantial portions of the + * Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, + * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL + * THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER + * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING + * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER + * DEALINGS IN THE SOFTWARE. + */ + +#ifndef XKBCOMP_SCANNER_UTILS_H +#define XKBCOMP_SCANNER_UTILS_H + +/* Point to some substring in the file; used to avoid copying. */ +struct sval { + const char *start; + unsigned int len; +}; +typedef darray(struct sval) darray_sval; + +static inline bool +svaleq(struct sval s1, struct sval s2) +{ + return s1.len == s2.len && strncmp(s1.start, s2.start, s1.len) == 0; +} + +static inline bool +svaleq_prefix(struct sval s1, struct sval s2) +{ + return s1.len <= s2.len && strncmp(s1.start, s2.start, s1.len) == 0; +} + +struct scanner { + const char *s; + size_t pos; + size_t len; + char buf[1024]; + size_t buf_pos; + int line, column; + /* The line/column of the start of the current token. */ + int token_line, token_column; + const char *file_name; + struct xkb_context *ctx; +}; + +static inline void +scanner_init(struct scanner *s, struct xkb_context *ctx, + const char *string, size_t len, const char *file_name) +{ + s->s = string; + s->len = len; + s->pos = 0; + s->line = s->column = 1; + s->token_line = s->token_column = 1; + s->file_name = file_name; + s->ctx = ctx; +} + +static inline char +peek(struct scanner *s) +{ + return s->pos < s->len ? s->s[s->pos] : '\0'; +} + +static inline bool +eof(struct scanner *s) +{ + return s->pos >= s->len; +} + +static inline bool +eol(struct scanner *s) +{ + return peek(s) == '\n'; +} + +static inline char +next(struct scanner *s) +{ + if (eof(s)) + return '\0'; + if (eol(s)) { + s->line++; + s->column = 1; + } + else { + s->column++; + } + return s->s[s->pos++]; +} + +static inline bool +chr(struct scanner *s, char ch) +{ + if (peek(s) != ch) + return false; + s->pos++; s->column++; + return true; +} + +static inline bool +str(struct scanner *s, const char *string, size_t len) +{ + if (s->len - s->pos < len) + return false; + if (strncasecmp(s->s + s->pos, string, len) != 0) + return false; + s->pos += len; s->column += len; + return true; +} + +#define lit(s, literal) str(s, literal, sizeof(literal) - 1) + +static inline bool +buf_append(struct scanner *s, char ch) +{ + if (s->buf_pos + 1 >= sizeof(s->buf)) + return false; + s->buf[s->buf_pos++] = ch; + return true; +} + +static inline bool +oct(struct scanner *s, uint8_t *out) +{ + int i; + for (i = 0, *out = 0; peek(s) >= '0' && peek(s) <= '7' && i < 3; i++) + *out = *out * 8 + next(s) - '0'; + return i > 0; +} + +#endif diff --git a/src/3rdparty/xkbcommon/src/xkbcomp/scanner.c b/src/3rdparty/xkbcommon/src/xkbcomp/scanner.c index 4731107b85..48df488547 100644 --- a/src/3rdparty/xkbcommon/src/xkbcomp/scanner.c +++ b/src/3rdparty/xkbcommon/src/xkbcomp/scanner.c @@ -1,2861 +1,219 @@ -#line 2 "src/xkbcomp/scanner.c" - -#line 4 "src/xkbcomp/scanner.c" - -#define YY_INT_ALIGNED short int - -/* A lexical scanner generated by flex */ - -#define FLEX_SCANNER -#define YY_FLEX_MAJOR_VERSION 2 -#define YY_FLEX_MINOR_VERSION 5 -#define YY_FLEX_SUBMINOR_VERSION 35 -#if YY_FLEX_SUBMINOR_VERSION > 0 -#define FLEX_BETA -#endif - -/* First, we deal with platform-specific or compiler-specific issues. */ - -/* begin standard C headers. */ -#include <stdio.h> -#include <string.h> -#include <errno.h> -#include <stdlib.h> - -/* end standard C headers. */ - -/* flex integer type definitions */ - -#ifndef FLEXINT_H -#define FLEXINT_H - -/* C99 systems have <inttypes.h>. Non-C99 systems may or may not. */ - -#if defined (__STDC_VERSION__) && __STDC_VERSION__ >= 199901L - -/* C99 says to define __STDC_LIMIT_MACROS before including stdint.h, - * if you want the limit (max/min) macros for int types. - */ -#ifndef __STDC_LIMIT_MACROS -#define __STDC_LIMIT_MACROS 1 -#endif - -#include <inttypes.h> -typedef int8_t flex_int8_t; -typedef uint8_t flex_uint8_t; -typedef int16_t flex_int16_t; -typedef uint16_t flex_uint16_t; -typedef int32_t flex_int32_t; -typedef uint32_t flex_uint32_t; -#else -typedef signed char flex_int8_t; -typedef short int flex_int16_t; -typedef int flex_int32_t; -typedef unsigned char flex_uint8_t; -typedef unsigned short int flex_uint16_t; -typedef unsigned int flex_uint32_t; - -/* Limits of integral types. */ -#ifndef INT8_MIN -#define INT8_MIN (-128) -#endif -#ifndef INT16_MIN -#define INT16_MIN (-32767-1) -#endif -#ifndef INT32_MIN -#define INT32_MIN (-2147483647-1) -#endif -#ifndef INT8_MAX -#define INT8_MAX (127) -#endif -#ifndef INT16_MAX -#define INT16_MAX (32767) -#endif -#ifndef INT32_MAX -#define INT32_MAX (2147483647) -#endif -#ifndef UINT8_MAX -#define UINT8_MAX (255U) -#endif -#ifndef UINT16_MAX -#define UINT16_MAX (65535U) -#endif -#ifndef UINT32_MAX -#define UINT32_MAX (4294967295U) -#endif - -#endif /* ! C99 */ - -#endif /* ! FLEXINT_H */ - -#ifdef __cplusplus - -/* The "const" storage-class-modifier is valid. */ -#define YY_USE_CONST - -#else /* ! __cplusplus */ - -/* C99 requires __STDC__ to be defined as 1. */ -#if defined (__STDC__) - -#define YY_USE_CONST - -#endif /* defined (__STDC__) */ -#endif /* ! __cplusplus */ - -#ifdef YY_USE_CONST -#define yyconst const -#else -#define yyconst -#endif - -/* Returned upon end-of-file. */ -#define YY_NULL 0 - -/* Promotes a possibly negative, possibly signed char to an unsigned - * integer for use as an array index. If the signed char is negative, - * we want to instead treat it as an 8-bit unsigned char, hence the - * double cast. - */ -#define YY_SC_TO_UI(c) ((unsigned int) (unsigned char) c) - -/* An opaque pointer. */ -#ifndef YY_TYPEDEF_YY_SCANNER_T -#define YY_TYPEDEF_YY_SCANNER_T -typedef void* yyscan_t; -#endif - -/* For convenience, these vars (plus the bison vars far below) - are macros in the reentrant scanner. */ -#define yyin yyg->yyin_r -#define yyout yyg->yyout_r -#define yyextra yyg->yyextra_r -#define yyleng yyg->yyleng_r -#define yytext yyg->yytext_r -#define yylineno (YY_CURRENT_BUFFER_LVALUE->yy_bs_lineno) -#define yycolumn (YY_CURRENT_BUFFER_LVALUE->yy_bs_column) -#define yy_flex_debug yyg->yy_flex_debug_r - -/* Enter a start condition. This macro really ought to take a parameter, - * but we do it the disgusting crufty way forced on us by the ()-less - * definition of BEGIN. - */ -#define BEGIN yyg->yy_start = 1 + 2 * - -/* Translate the current start state into a value that can be later handed - * to BEGIN to return to the state. The YYSTATE alias is for lex - * compatibility. - */ -#define YY_START ((yyg->yy_start - 1) / 2) -#define YYSTATE YY_START - -/* Action number for EOF rule of a given start state. */ -#define YY_STATE_EOF(state) (YY_END_OF_BUFFER + state + 1) - -/* Special action meaning "start processing a new file". */ -#define YY_NEW_FILE _xkbcommon_restart(yyin ,yyscanner ) - -#define YY_END_OF_BUFFER_CHAR 0 - -/* Size of default input buffer. */ -#ifndef YY_BUF_SIZE -#ifdef __ia64__ -/* On IA-64, the buffer size is 16k, not 8k. - * Moreover, YY_BUF_SIZE is 2*YY_READ_BUF_SIZE in the general case. - * Ditto for the __ia64__ case accordingly. - */ -#define YY_BUF_SIZE 32768 -#else -#define YY_BUF_SIZE 16384 -#endif /* __ia64__ */ -#endif - -/* The state buf must be large enough to hold one state per character in the main buffer. - */ -#define YY_STATE_BUF_SIZE ((YY_BUF_SIZE + 2) * sizeof(yy_state_type)) - -#ifndef YY_TYPEDEF_YY_BUFFER_STATE -#define YY_TYPEDEF_YY_BUFFER_STATE -typedef struct yy_buffer_state *YY_BUFFER_STATE; -#endif - -#define EOB_ACT_CONTINUE_SCAN 0 -#define EOB_ACT_END_OF_FILE 1 -#define EOB_ACT_LAST_MATCH 2 - - /* Note: We specifically omit the test for yy_rule_can_match_eol because it requires - * access to the local variable yy_act. Since yyless() is a macro, it would break - * existing scanners that call yyless() from OUTSIDE _xkbcommon_lex. - * One obvious solution it to make yy_act a global. I tried that, and saw - * a 5% performance hit in a non-yylineno scanner, because yy_act is - * normally declared as a register variable-- so it is not worth it. - */ - #define YY_LESS_LINENO(n) \ - do { \ - int yyl;\ - for ( yyl = n; yyl < yyleng; ++yyl )\ - if ( yytext[yyl] == '\n' )\ - --yylineno;\ - }while(0) - -/* Return all but the first "n" matched characters back to the input stream. */ -#define yyless(n) \ - do \ - { \ - /* Undo effects of setting up yytext. */ \ - int yyless_macro_arg = (n); \ - YY_LESS_LINENO(yyless_macro_arg);\ - *yy_cp = yyg->yy_hold_char; \ - YY_RESTORE_YY_MORE_OFFSET \ - yyg->yy_c_buf_p = yy_cp = yy_bp + yyless_macro_arg - YY_MORE_ADJ; \ - YY_DO_BEFORE_ACTION; /* set up yytext again */ \ - } \ - while ( 0 ) - -#define unput(c) yyunput( c, yyg->yytext_ptr , yyscanner ) - -#ifndef YY_TYPEDEF_YY_SIZE_T -#define YY_TYPEDEF_YY_SIZE_T -typedef size_t yy_size_t; -#endif - -#ifndef YY_STRUCT_YY_BUFFER_STATE -#define YY_STRUCT_YY_BUFFER_STATE -struct yy_buffer_state - { - FILE *yy_input_file; - - char *yy_ch_buf; /* input buffer */ - char *yy_buf_pos; /* current position in input buffer */ - - /* Size of input buffer in bytes, not including room for EOB - * characters. - */ - yy_size_t yy_buf_size; - - /* Number of characters read into yy_ch_buf, not including EOB - * characters. - */ - int yy_n_chars; - - /* Whether we "own" the buffer - i.e., we know we created it, - * and can realloc() it to grow it, and should free() it to - * delete it. - */ - int yy_is_our_buffer; - - /* Whether this is an "interactive" input source; if so, and - * if we're using stdio for input, then we want to use getc() - * instead of fread(), to make sure we stop fetching input after - * each newline. - */ - int yy_is_interactive; - - /* Whether we're considered to be at the beginning of a line. - * If so, '^' rules will be active on the next match, otherwise - * not. - */ - int yy_at_bol; - - int yy_bs_lineno; /**< The line count. */ - int yy_bs_column; /**< The column count. */ - - /* Whether to try to fill the input buffer when we reach the - * end of it. - */ - int yy_fill_buffer; - - int yy_buffer_status; - -#define YY_BUFFER_NEW 0 -#define YY_BUFFER_NORMAL 1 - /* When an EOF's been seen but there's still some text to process - * then we mark the buffer as YY_EOF_PENDING, to indicate that we - * shouldn't try reading from the input source any more. We might - * still have a bunch of tokens to match, though, because of - * possible backing-up. - * - * When we actually see the EOF, we change the status to "new" - * (via _xkbcommon_restart()), so that the user can continue scanning by - * just pointing yyin at a new input file. - */ -#define YY_BUFFER_EOF_PENDING 2 - - }; -#endif /* !YY_STRUCT_YY_BUFFER_STATE */ - -/* We provide macros for accessing buffer states in case in the - * future we want to put the buffer states in a more general - * "scanner state". +/* + * Copyright © 2012 Ran Benita <ran234@gmail.com> * - * Returns the top of the stack, or NULL. - */ -#define YY_CURRENT_BUFFER ( yyg->yy_buffer_stack \ - ? yyg->yy_buffer_stack[yyg->yy_buffer_stack_top] \ - : NULL) - -/* Same as previous macro, but useful when we know that the buffer stack is not - * NULL or when we need an lvalue. For internal use only. - */ -#define YY_CURRENT_BUFFER_LVALUE yyg->yy_buffer_stack[yyg->yy_buffer_stack_top] - -void _xkbcommon_restart (FILE *input_file ,yyscan_t yyscanner ); -void _xkbcommon__switch_to_buffer (YY_BUFFER_STATE new_buffer ,yyscan_t yyscanner ); -YY_BUFFER_STATE _xkbcommon__create_buffer (FILE *file,int size ,yyscan_t yyscanner ); -void _xkbcommon__delete_buffer (YY_BUFFER_STATE b ,yyscan_t yyscanner ); -void _xkbcommon__flush_buffer (YY_BUFFER_STATE b ,yyscan_t yyscanner ); -void _xkbcommon_push_buffer_state (YY_BUFFER_STATE new_buffer ,yyscan_t yyscanner ); -void _xkbcommon_pop_buffer_state (yyscan_t yyscanner ); - -static void _xkbcommon_ensure_buffer_stack (yyscan_t yyscanner ); -static void _xkbcommon__load_buffer_state (yyscan_t yyscanner ); -static void _xkbcommon__init_buffer (YY_BUFFER_STATE b,FILE *file ,yyscan_t yyscanner ); - -#define YY_FLUSH_BUFFER _xkbcommon__flush_buffer(YY_CURRENT_BUFFER ,yyscanner) - -YY_BUFFER_STATE _xkbcommon__scan_buffer (char *base,yy_size_t size ,yyscan_t yyscanner ); -YY_BUFFER_STATE _xkbcommon__scan_string (yyconst char *yy_str ,yyscan_t yyscanner ); -YY_BUFFER_STATE _xkbcommon__scan_bytes (yyconst char *bytes,int len ,yyscan_t yyscanner ); - -void *_xkbcommon_alloc (yy_size_t ,yyscan_t yyscanner ); -void *_xkbcommon_realloc (void *,yy_size_t ,yyscan_t yyscanner ); -void _xkbcommon_free (void * ,yyscan_t yyscanner ); - -#define yy_new_buffer _xkbcommon__create_buffer - -#define yy_set_interactive(is_interactive) \ - { \ - if ( ! YY_CURRENT_BUFFER ){ \ - _xkbcommon_ensure_buffer_stack (yyscanner); \ - YY_CURRENT_BUFFER_LVALUE = \ - _xkbcommon__create_buffer(yyin,YY_BUF_SIZE ,yyscanner); \ - } \ - YY_CURRENT_BUFFER_LVALUE->yy_is_interactive = is_interactive; \ - } - -#define yy_set_bol(at_bol) \ - { \ - if ( ! YY_CURRENT_BUFFER ){\ - _xkbcommon_ensure_buffer_stack (yyscanner); \ - YY_CURRENT_BUFFER_LVALUE = \ - _xkbcommon__create_buffer(yyin,YY_BUF_SIZE ,yyscanner); \ - } \ - YY_CURRENT_BUFFER_LVALUE->yy_at_bol = at_bol; \ - } - -#define YY_AT_BOL() (YY_CURRENT_BUFFER_LVALUE->yy_at_bol) - -/* Begin user sect3 */ - -#define _xkbcommon_wrap(n) 1 -#define YY_SKIP_YYWRAP - -typedef unsigned char YY_CHAR; - -typedef int yy_state_type; - -#define yytext_ptr yytext_r - -static yy_state_type yy_get_previous_state (yyscan_t yyscanner ); -static yy_state_type yy_try_NUL_trans (yy_state_type current_state ,yyscan_t yyscanner); -static int yy_get_next_buffer (yyscan_t yyscanner ); -static void yy_fatal_error (yyconst char msg[] ,yyscan_t yyscanner ); - -/* Done after the current pattern has been matched and before the - * corresponding action - sets up yytext. - */ -#define YY_DO_BEFORE_ACTION \ - yyg->yytext_ptr = yy_bp; \ - yyleng = (size_t) (yy_cp - yy_bp); \ - yyg->yy_hold_char = *yy_cp; \ - *yy_cp = '\0'; \ - yyg->yy_c_buf_p = yy_cp; - -#define YY_NUM_RULES 83 -#define YY_END_OF_BUFFER 84 -/* This struct is not used in this scanner, - but its presence is necessary. */ -struct yy_trans_info - { - flex_int32_t yy_verify; - flex_int32_t yy_nxt; - }; -static yyconst flex_int16_t yy_accept[336] = - { 0, - 0, 0, 0, 0, 84, 82, 81, 81, 79, 3, - 2, 72, 73, 69, 66, 77, 67, 76, 68, 63, - 63, 78, 82, 65, 61, 61, 61, 61, 61, 61, - 61, 61, 61, 61, 61, 61, 61, 61, 61, 61, - 61, 74, 75, 70, 71, 80, 14, 83, 4, 14, - 81, 2, 1, 0, 63, 0, 0, 61, 61, 61, - 61, 61, 61, 61, 61, 61, 61, 61, 61, 61, - 61, 61, 61, 61, 61, 61, 61, 61, 61, 61, - 61, 5, 6, 10, 13, 11, 7, 9, 8, 12, - 1, 64, 62, 15, 61, 61, 61, 61, 61, 61, - - 61, 61, 61, 61, 61, 61, 39, 61, 61, 61, - 61, 61, 61, 47, 61, 61, 61, 61, 61, 61, - 61, 5, 61, 61, 61, 61, 61, 61, 61, 61, - 61, 61, 61, 61, 61, 48, 54, 61, 61, 61, - 61, 61, 61, 61, 61, 61, 61, 51, 36, 61, - 61, 5, 61, 40, 61, 61, 61, 61, 61, 41, - 61, 61, 61, 61, 61, 61, 61, 61, 61, 61, - 61, 61, 61, 61, 46, 53, 61, 61, 61, 61, - 61, 61, 61, 38, 61, 61, 61, 61, 61, 34, - 61, 61, 61, 61, 61, 42, 61, 61, 61, 61, - - 61, 61, 61, 61, 61, 61, 61, 61, 61, 61, - 61, 61, 61, 29, 33, 61, 27, 61, 61, 61, - 61, 43, 52, 50, 61, 32, 30, 49, 55, 61, - 61, 61, 61, 61, 61, 61, 61, 61, 61, 61, - 61, 61, 61, 28, 61, 61, 61, 61, 61, 61, - 61, 61, 61, 61, 31, 61, 45, 37, 61, 61, - 61, 61, 61, 61, 61, 61, 61, 61, 18, 61, - 61, 61, 61, 61, 61, 61, 20, 61, 61, 16, - 26, 61, 61, 61, 61, 61, 58, 61, 61, 61, - 61, 61, 61, 61, 61, 19, 61, 61, 61, 61, - - 44, 61, 61, 61, 24, 17, 61, 61, 61, 59, - 57, 61, 61, 61, 25, 61, 61, 61, 61, 21, - 61, 60, 61, 61, 61, 61, 61, 56, 35, 22, - 61, 61, 61, 23, 0 - } ; - -static yyconst flex_int32_t yy_ec[256] = - { 0, - 1, 1, 1, 1, 1, 1, 1, 1, 2, 3, - 2, 1, 2, 1, 1, 1, 1, 1, 1, 1, - 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, - 1, 2, 4, 5, 6, 1, 1, 1, 1, 7, - 8, 9, 10, 11, 12, 13, 14, 15, 16, 16, - 16, 16, 16, 16, 16, 17, 17, 1, 18, 19, - 20, 21, 1, 1, 22, 23, 24, 25, 26, 27, - 28, 29, 30, 31, 32, 33, 34, 35, 36, 37, - 31, 38, 39, 40, 41, 42, 43, 44, 45, 31, - 46, 47, 48, 1, 49, 1, 50, 51, 52, 53, - - 54, 55, 56, 57, 58, 31, 59, 60, 61, 62, - 63, 64, 31, 65, 66, 67, 68, 69, 70, 71, - 72, 31, 73, 1, 74, 75, 1, 1, 1, 1, - 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, - 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, - 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, - 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, - 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, - 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, - 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, - - 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, - 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, - 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, - 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, - 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, - 1, 1, 1, 1, 1 - } ; - -static yyconst flex_int32_t yy_meta[76] = - { 0, - 1, 1, 2, 1, 1, 1, 1, 1, 1, 3, - 1, 3, 1, 1, 4, 4, 4, 1, 1, 1, - 1, 4, 4, 4, 4, 4, 4, 5, 5, 5, - 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, - 5, 5, 5, 5, 5, 1, 1, 1, 5, 4, - 4, 4, 4, 4, 4, 5, 5, 5, 5, 5, - 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, - 5, 5, 1, 1, 1 - } ; - -static yyconst flex_int16_t yy_base[342] = - { 0, - 0, 0, 73, 74, 263, 695, 78, 80, 695, 695, - 0, 695, 695, 695, 695, 695, 695, 695, 203, 71, - 76, 695, 0, 695, 66, 0, 59, 54, 58, 67, - 65, 75, 67, 68, 64, 86, 83, 109, 98, 81, - 82, 695, 695, 695, 695, 695, 695, 695, 695, 158, - 114, 0, 0, 132, 138, 0, 158, 0, 100, 128, - 100, 123, 109, 124, 136, 166, 131, 141, 152, 140, - 156, 150, 157, 156, 159, 179, 171, 164, 177, 178, - 179, 221, 229, 695, 695, 695, 695, 695, 695, 695, - 0, 232, 0, 695, 192, 202, 199, 206, 200, 217, - - 216, 201, 226, 220, 224, 229, 220, 222, 232, 231, - 227, 230, 238, 0, 232, 236, 244, 236, 251, 247, - 115, 279, 252, 250, 256, 263, 278, 266, 268, 272, - 284, 271, 289, 279, 296, 0, 0, 292, 298, 288, - 293, 292, 296, 305, 301, 307, 312, 0, 0, 288, - 342, 347, 305, 0, 307, 310, 315, 320, 313, 0, - 323, 335, 346, 336, 351, 348, 346, 357, 349, 364, - 357, 367, 366, 356, 0, 0, 371, 359, 371, 373, - 381, 379, 367, 0, 372, 394, 380, 383, 390, 0, - 402, 390, 394, 113, 408, 0, 399, 411, 396, 413, - - 409, 417, 410, 413, 414, 413, 407, 409, 421, 424, - 423, 427, 424, 0, 0, 432, 0, 434, 448, 445, - 440, 0, 0, 0, 454, 0, 0, 0, 110, 446, - 450, 462, 453, 468, 469, 467, 472, 473, 108, 457, - 461, 477, 63, 0, 472, 485, 483, 476, 491, 474, - 482, 483, 485, 487, 61, 497, 0, 0, 485, 500, - 500, 498, 500, 518, 508, 507, 508, 516, 0, 520, - 525, 528, 519, 529, 538, 537, 538, 526, 540, 0, - 0, 539, 534, 546, 539, 534, 0, 535, 547, 556, - 566, 558, 548, 556, 575, 0, 53, 565, 563, 564, - - 0, 578, 578, 587, 0, 0, 573, 581, 574, 0, - 0, 580, 583, 581, 0, 595, 586, 598, 595, 0, - 586, 0, 594, 594, 596, 602, 599, 0, 0, 49, - 612, 604, 610, 0, 695, 674, 679, 682, 684, 689, - 90 - } ; - -static yyconst flex_int16_t yy_def[342] = - { 0, - 335, 1, 336, 336, 335, 335, 335, 335, 335, 335, - 337, 335, 335, 335, 335, 335, 335, 335, 335, 335, - 335, 335, 338, 335, 339, 339, 339, 339, 339, 339, - 339, 339, 339, 339, 339, 339, 339, 339, 339, 339, - 339, 335, 335, 335, 335, 335, 335, 335, 335, 335, - 335, 337, 340, 335, 335, 341, 338, 339, 339, 339, - 339, 339, 339, 339, 339, 339, 339, 339, 339, 339, - 339, 339, 339, 339, 339, 339, 339, 339, 339, 339, - 339, 335, 335, 335, 335, 335, 335, 335, 335, 335, - 340, 335, 341, 335, 339, 339, 339, 339, 339, 339, - - 339, 339, 339, 339, 339, 339, 339, 339, 339, 339, - 339, 339, 339, 339, 339, 339, 339, 339, 339, 339, - 339, 335, 339, 339, 339, 339, 339, 339, 339, 339, - 339, 339, 339, 339, 339, 339, 339, 339, 339, 339, - 339, 339, 339, 339, 339, 339, 339, 339, 339, 339, - 339, 335, 339, 339, 339, 339, 339, 339, 339, 339, - 339, 339, 339, 339, 339, 339, 339, 339, 339, 339, - 339, 339, 339, 339, 339, 339, 339, 339, 339, 339, - 339, 339, 339, 339, 339, 339, 339, 339, 339, 339, - 339, 339, 339, 339, 339, 339, 339, 339, 339, 339, - - 339, 339, 339, 339, 339, 339, 339, 339, 339, 339, - 339, 339, 339, 339, 339, 339, 339, 339, 339, 339, - 339, 339, 339, 339, 339, 339, 339, 339, 339, 339, - 339, 339, 339, 339, 339, 339, 339, 339, 339, 339, - 339, 339, 339, 339, 339, 339, 339, 339, 339, 339, - 339, 339, 339, 339, 339, 339, 339, 339, 339, 339, - 339, 339, 339, 339, 339, 339, 339, 339, 339, 339, - 339, 339, 339, 339, 339, 339, 339, 339, 339, 339, - 339, 339, 339, 339, 339, 339, 339, 339, 339, 339, - 339, 339, 339, 339, 339, 339, 339, 339, 339, 339, - - 339, 339, 339, 339, 339, 339, 339, 339, 339, 339, - 339, 339, 339, 339, 339, 339, 339, 339, 339, 339, - 339, 339, 339, 339, 339, 339, 339, 339, 339, 339, - 339, 339, 339, 339, 0, 335, 335, 335, 335, 335, - 335 - } ; - -static yyconst flex_int16_t yy_nxt[771] = - { 0, - 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, - 16, 17, 18, 19, 20, 21, 21, 22, 23, 24, - 6, 25, 26, 26, 27, 26, 28, 29, 30, 31, - 26, 32, 33, 34, 26, 35, 36, 37, 38, 39, - 26, 40, 26, 41, 26, 42, 6, 43, 26, 25, - 26, 26, 27, 26, 28, 29, 30, 31, 32, 33, - 34, 26, 35, 36, 37, 38, 39, 26, 40, 26, - 41, 26, 44, 45, 46, 48, 48, 49, 49, 51, - 51, 51, 51, 54, 62, 55, 55, 55, 54, 59, - 55, 55, 55, 93, 63, 64, 65, 331, 60, 66, - - 67, 308, 68, 69, 70, 71, 61, 72, 73, 271, - 80, 260, 62, 81, 56, 51, 51, 59, 74, 50, - 50, 63, 64, 78, 65, 60, 66, 99, 67, 68, - 69, 70, 71, 61, 75, 72, 73, 76, 80, 95, - 81, 56, 79, 101, 77, 74, 92, 92, 92, 100, - 54, 78, 55, 55, 55, 99, 256, 96, 245, 102, - 103, 220, 75, 151, 97, 76, 95, 98, 108, 79, - 101, 77, 82, 82, 83, 107, 109, 100, 94, 110, - 84, 111, 115, 85, 86, 96, 102, 112, 103, 104, - 105, 97, 87, 113, 98, 88, 108, 89, 114, 90, - - 116, 121, 107, 117, 109, 106, 110, 118, 84, 111, - 115, 85, 86, 119, 112, 120, 53, 104, 105, 87, - 113, 123, 88, 124, 89, 114, 90, 125, 116, 121, - 117, 126, 106, 127, 118, 122, 122, 83, 128, 129, - 119, 130, 120, 83, 83, 83, 92, 92, 92, 123, - 131, 124, 132, 133, 134, 125, 135, 137, 136, 126, - 127, 138, 335, 141, 142, 139, 128, 129, 130, 143, - 144, 145, 146, 147, 335, 148, 149, 155, 131, 132, - 140, 133, 134, 135, 137, 136, 150, 153, 154, 138, - 141, 142, 139, 152, 152, 83, 143, 144, 145, 146, - - 156, 147, 148, 157, 149, 155, 158, 159, 160, 161, - 335, 162, 163, 150, 153, 154, 164, 165, 166, 167, - 335, 168, 169, 335, 170, 172, 173, 156, 177, 171, - 174, 157, 175, 158, 159, 160, 176, 161, 162, 184, - 163, 185, 189, 164, 186, 165, 166, 167, 168, 187, - 169, 170, 188, 172, 173, 177, 171, 190, 174, 191, - 175, 83, 83, 83, 176, 178, 184, 192, 185, 179, - 189, 186, 193, 180, 181, 194, 187, 195, 197, 188, - 182, 183, 196, 198, 190, 199, 200, 191, 201, 202, - 335, 203, 204, 178, 205, 192, 206, 179, 207, 193, - - 180, 181, 208, 194, 209, 195, 197, 182, 183, 196, - 198, 211, 212, 199, 200, 213, 201, 202, 203, 214, - 204, 205, 215, 210, 206, 216, 207, 217, 335, 218, - 208, 219, 209, 221, 335, 222, 223, 225, 211, 212, - 224, 226, 227, 213, 228, 229, 214, 230, 231, 215, - 210, 232, 216, 233, 234, 217, 218, 235, 219, 236, - 237, 221, 222, 238, 223, 225, 239, 224, 226, 240, - 227, 228, 229, 241, 230, 231, 242, 243, 232, 244, - 233, 234, 246, 247, 235, 248, 236, 237, 250, 251, - 238, 252, 253, 239, 257, 249, 240, 254, 255, 335, - - 258, 241, 259, 242, 243, 261, 262, 244, 263, 246, - 247, 264, 265, 248, 266, 250, 267, 251, 268, 252, - 253, 257, 249, 269, 270, 254, 255, 258, 272, 273, - 259, 274, 261, 275, 262, 276, 263, 277, 264, 278, - 265, 266, 279, 267, 280, 268, 281, 282, 283, 284, - 269, 270, 285, 286, 288, 272, 273, 287, 274, 289, - 275, 290, 276, 293, 277, 294, 278, 291, 295, 297, - 279, 280, 296, 281, 282, 283, 298, 284, 299, 300, - 285, 286, 288, 301, 287, 302, 292, 289, 303, 290, - 293, 304, 305, 294, 306, 291, 295, 297, 307, 296, - - 309, 310, 311, 298, 312, 299, 300, 313, 314, 318, - 301, 315, 316, 302, 317, 319, 303, 320, 304, 305, - 321, 306, 322, 323, 324, 333, 307, 309, 310, 311, - 325, 326, 312, 327, 328, 313, 314, 318, 315, 316, - 329, 317, 319, 330, 320, 332, 334, 335, 321, 322, - 335, 323, 324, 333, 335, 335, 335, 325, 326, 335, - 327, 328, 335, 335, 335, 335, 335, 329, 335, 335, - 330, 335, 332, 334, 47, 47, 47, 47, 47, 52, - 335, 52, 52, 52, 57, 57, 57, 58, 58, 91, - 335, 91, 91, 91, 5, 335, 335, 335, 335, 335, - - 335, 335, 335, 335, 335, 335, 335, 335, 335, 335, - 335, 335, 335, 335, 335, 335, 335, 335, 335, 335, - 335, 335, 335, 335, 335, 335, 335, 335, 335, 335, - 335, 335, 335, 335, 335, 335, 335, 335, 335, 335, - 335, 335, 335, 335, 335, 335, 335, 335, 335, 335, - 335, 335, 335, 335, 335, 335, 335, 335, 335, 335, - 335, 335, 335, 335, 335, 335, 335, 335, 335, 335 - } ; - -static yyconst flex_int16_t yy_chk[771] = - { 0, - 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, - 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, - 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, - 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, - 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, - 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, - 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, - 1, 1, 1, 1, 1, 3, 4, 3, 4, 7, - 7, 8, 8, 20, 27, 20, 20, 20, 21, 25, - 21, 21, 21, 341, 28, 29, 30, 330, 25, 31, - - 32, 297, 33, 34, 35, 35, 25, 36, 37, 255, - 40, 243, 27, 41, 20, 51, 51, 25, 37, 3, - 4, 28, 29, 39, 30, 25, 31, 61, 32, 33, - 34, 35, 35, 25, 38, 36, 37, 38, 40, 59, - 41, 20, 39, 63, 38, 37, 54, 54, 54, 62, - 55, 39, 55, 55, 55, 61, 239, 60, 229, 64, - 65, 194, 38, 121, 60, 38, 59, 60, 68, 39, - 63, 38, 50, 50, 50, 67, 69, 62, 57, 70, - 50, 71, 75, 50, 50, 60, 64, 72, 65, 66, - 66, 60, 50, 73, 60, 50, 68, 50, 74, 50, - - 76, 81, 67, 77, 69, 66, 70, 78, 50, 71, - 75, 50, 50, 79, 72, 80, 19, 66, 66, 50, - 73, 95, 50, 96, 50, 74, 50, 97, 76, 81, - 77, 98, 66, 99, 78, 82, 82, 82, 100, 101, - 79, 102, 80, 83, 83, 83, 92, 92, 92, 95, - 103, 96, 104, 105, 106, 97, 107, 108, 107, 98, - 99, 109, 5, 110, 111, 109, 100, 101, 102, 112, - 113, 115, 116, 117, 0, 118, 119, 125, 103, 104, - 109, 105, 106, 107, 108, 107, 120, 123, 124, 109, - 110, 111, 109, 122, 122, 122, 112, 113, 115, 116, - - 126, 117, 118, 127, 119, 125, 128, 129, 130, 131, - 0, 132, 133, 120, 123, 124, 134, 135, 138, 139, - 0, 140, 141, 0, 142, 143, 144, 126, 150, 142, - 145, 127, 146, 128, 129, 130, 147, 131, 132, 153, - 133, 155, 159, 134, 156, 135, 138, 139, 140, 157, - 141, 142, 158, 143, 144, 150, 142, 161, 145, 162, - 146, 152, 152, 152, 147, 151, 153, 163, 155, 151, - 159, 156, 164, 151, 151, 165, 157, 166, 168, 158, - 151, 151, 167, 169, 161, 170, 171, 162, 172, 173, - 0, 174, 177, 151, 178, 163, 179, 151, 180, 164, - - 151, 151, 181, 165, 182, 166, 168, 151, 151, 167, - 169, 183, 185, 170, 171, 186, 172, 173, 174, 187, - 177, 178, 188, 182, 179, 189, 180, 191, 0, 192, - 181, 193, 182, 195, 0, 197, 198, 200, 183, 185, - 199, 201, 202, 186, 203, 204, 187, 205, 206, 188, - 182, 207, 189, 208, 209, 191, 192, 210, 193, 211, - 212, 195, 197, 213, 198, 200, 216, 199, 201, 218, - 202, 203, 204, 219, 205, 206, 220, 221, 207, 225, - 208, 209, 230, 231, 210, 232, 211, 212, 233, 234, - 213, 235, 236, 216, 240, 232, 218, 237, 238, 0, - - 241, 219, 242, 220, 221, 245, 246, 225, 247, 230, - 231, 248, 249, 232, 250, 233, 251, 234, 252, 235, - 236, 240, 232, 253, 254, 237, 238, 241, 256, 259, - 242, 260, 245, 260, 246, 261, 247, 262, 248, 263, - 249, 250, 264, 251, 265, 252, 266, 267, 268, 270, - 253, 254, 271, 272, 274, 256, 259, 273, 260, 275, - 260, 276, 261, 278, 262, 279, 263, 277, 282, 284, - 264, 265, 283, 266, 267, 268, 285, 270, 286, 288, - 271, 272, 274, 289, 273, 290, 277, 275, 291, 276, - 278, 292, 293, 279, 294, 277, 282, 284, 295, 283, - - 298, 299, 300, 285, 302, 286, 288, 303, 304, 312, - 289, 307, 308, 290, 309, 313, 291, 314, 292, 293, - 316, 294, 317, 318, 319, 332, 295, 298, 299, 300, - 321, 323, 302, 324, 325, 303, 304, 312, 307, 308, - 326, 309, 313, 327, 314, 331, 333, 0, 316, 317, - 0, 318, 319, 332, 0, 0, 0, 321, 323, 0, - 324, 325, 0, 0, 0, 0, 0, 326, 0, 0, - 327, 0, 331, 333, 336, 336, 336, 336, 336, 337, - 0, 337, 337, 337, 338, 338, 338, 339, 339, 340, - 0, 340, 340, 340, 335, 335, 335, 335, 335, 335, - - 335, 335, 335, 335, 335, 335, 335, 335, 335, 335, - 335, 335, 335, 335, 335, 335, 335, 335, 335, 335, - 335, 335, 335, 335, 335, 335, 335, 335, 335, 335, - 335, 335, 335, 335, 335, 335, 335, 335, 335, 335, - 335, 335, 335, 335, 335, 335, 335, 335, 335, 335, - 335, 335, 335, 335, 335, 335, 335, 335, 335, 335, - 335, 335, 335, 335, 335, 335, 335, 335, 335, 335 - } ; - -/* Table of booleans, true if rule could match eol. */ -static yyconst flex_int32_t yy_rule_can_match_eol[84] = - { 0, -0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 1, 0, 0, }; - -/* The intent behind this definition is that it'll catch - * any uses of REJECT which flex missed. + * Permission is hereby granted, free of charge, to any person obtaining a + * copy of this software and associated documentation files (the "Software"), + * to deal in the Software without restriction, including without limitation + * the rights to use, copy, modify, merge, publish, distribute, sublicense, + * and/or sell copies of the Software, and to permit persons to whom the + * Software is furnished to do so, subject to the following conditions: + * + * The above copyright notice and this permission notice (including the next + * paragraph) shall be included in all copies or substantial portions of the + * Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, + * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL + * THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER + * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING + * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER + * DEALINGS IN THE SOFTWARE. */ -#define REJECT reject_used_but_not_detected -#define yymore() yymore_used_but_not_detected -#define YY_MORE_ADJ 0 -#define YY_RESTORE_YY_MORE_OFFSET -#line 1 "scanner.l" -/************************************************************ - Copyright (c) 1994 by Silicon Graphics Computer Systems, Inc. - - Permission to use, copy, modify, and distribute this - software and its documentation for any purpose and without - fee is hereby granted, provided that the above copyright - notice appear in all copies and that both that copyright - notice and this permission notice appear in supporting - documentation, and that the name of Silicon Graphics not be - used in advertising or publicity pertaining to distribution - of the software without specific prior written permission. - Silicon Graphics makes no representation about the suitability - of this software for any purpose. It is provided "as is" - without any express or implied warranty. - - SILICON GRAPHICS DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS - SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY - AND FITNESS FOR A PARTICULAR PURPOSE. IN NO EVENT SHALL SILICON - GRAPHICS BE LIABLE FOR ANY SPECIAL, INDIRECT OR CONSEQUENTIAL - DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, - DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE - OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH - THE USE OR PERFORMANCE OF THIS SOFTWARE. - ********************************************************/ -#line 28 "scanner.l" #include "xkbcomp-priv.h" #include "parser-priv.h" - -#pragma GCC diagnostic ignored "-Wmissing-noreturn" -#pragma GCC diagnostic ignored "-Wredundant-decls" -#pragma GCC diagnostic push - -struct scanner_extra { - struct xkb_context *ctx; - const char *file_name; - char scanBuf[1024]; - char *s; -}; +#include "scanner-utils.h" static void -scanner_error_extra(struct YYLTYPE *loc, struct scanner_extra *extra, - const char *msg); - -#define YY_USER_ACTION { \ - yylloc->first_line = yylineno; \ - yylloc->last_line = yylineno; \ -} - -#define APPEND_S(ch) do { \ - if (yyextra->s - yyextra->scanBuf >= sizeof(yyextra->scanBuf) - 1) \ - return ERROR_TOK; \ - *yyextra->s++ = ch; \ -} while (0) -#define YY_NO_UNISTD_H 1 -#define YY_NO_INPUT 1 - -#line 803 "src/xkbcomp/scanner.c" - -#define INITIAL 0 -#define S_STR 1 - -#ifndef YY_NO_UNISTD_H -/* Special case for "unistd.h", since it is non-ANSI. We include it way - * down here because we want the user's section 1 to have been scanned first. - * The user has a chance to override it with an option. - */ -#include <unistd.h> -#endif - -#define YY_EXTRA_TYPE struct scanner_extra * - -/* Holds the entire state of the reentrant scanner. */ -struct yyguts_t - { - - /* User-defined. Not touched by flex. */ - YY_EXTRA_TYPE yyextra_r; - - /* The rest are the same as the globals declared in the non-reentrant scanner. */ - FILE *yyin_r, *yyout_r; - size_t yy_buffer_stack_top; /**< index of top of stack. */ - size_t yy_buffer_stack_max; /**< capacity of stack. */ - YY_BUFFER_STATE * yy_buffer_stack; /**< Stack as an array. */ - char yy_hold_char; - int yy_n_chars; - int yyleng_r; - char *yy_c_buf_p; - int yy_init; - int yy_start; - int yy_did_buffer_switch_on_eof; - int yy_start_stack_ptr; - int yy_start_stack_depth; - int *yy_start_stack; - yy_state_type yy_last_accepting_state; - char* yy_last_accepting_cpos; - - int yylineno_r; - int yy_flex_debug_r; - - char *yytext_r; - int yy_more_flag; - int yy_more_len; - - YYSTYPE * yylval_r; - - YYLTYPE * yylloc_r; - - }; /* end struct yyguts_t */ - -static int yy_init_globals (yyscan_t yyscanner ); - - /* This must go here because YYSTYPE and YYLTYPE are included - * from bison output in section 1.*/ - # define yylval yyg->yylval_r - - # define yylloc yyg->yylloc_r - -int _xkbcommon_lex_init (yyscan_t* scanner); - -int _xkbcommon_lex_init_extra (YY_EXTRA_TYPE user_defined,yyscan_t* scanner); - -/* Accessor methods to globals. - These are made visible to non-reentrant scanners for convenience. */ - -int _xkbcommon_lex_destroy (yyscan_t yyscanner ); - -int _xkbcommon_get_debug (yyscan_t yyscanner ); - -void _xkbcommon_set_debug (int debug_flag ,yyscan_t yyscanner ); - -YY_EXTRA_TYPE _xkbcommon_get_extra (yyscan_t yyscanner ); - -void _xkbcommon_set_extra (YY_EXTRA_TYPE user_defined ,yyscan_t yyscanner ); - -FILE *_xkbcommon_get_in (yyscan_t yyscanner ); - -void _xkbcommon_set_in (FILE * in_str ,yyscan_t yyscanner ); - -FILE *_xkbcommon_get_out (yyscan_t yyscanner ); - -void _xkbcommon_set_out (FILE * out_str ,yyscan_t yyscanner ); - -int _xkbcommon_get_leng (yyscan_t yyscanner ); - -char *_xkbcommon_get_text (yyscan_t yyscanner ); - -int _xkbcommon_get_lineno (yyscan_t yyscanner ); - -void _xkbcommon_set_lineno (int line_number ,yyscan_t yyscanner ); - -YYSTYPE * _xkbcommon_get_lval (yyscan_t yyscanner ); - -void _xkbcommon_set_lval (YYSTYPE * yylval_param ,yyscan_t yyscanner ); - - YYLTYPE *_xkbcommon_get_lloc (yyscan_t yyscanner ); - - void _xkbcommon_set_lloc (YYLTYPE * yylloc_param ,yyscan_t yyscanner ); - -/* Macros after this point can all be overridden by user definitions in - * section 1. - */ - -#ifndef YY_SKIP_YYWRAP -#ifdef __cplusplus -extern "C" int _xkbcommon_wrap (yyscan_t yyscanner ); -#else -extern int _xkbcommon_wrap (yyscan_t yyscanner ); -#endif -#endif - -#ifndef yytext_ptr -static void yy_flex_strncpy (char *,yyconst char *,int ,yyscan_t yyscanner); -#endif - -#ifdef YY_NEED_STRLEN -static int yy_flex_strlen (yyconst char * ,yyscan_t yyscanner); -#endif - -#ifndef YY_NO_INPUT - -#ifdef __cplusplus -static int yyinput (yyscan_t yyscanner ); -#else -static int input (yyscan_t yyscanner ); -#endif - -#endif - -/* Amount of stuff to slurp up with each read. */ -#ifndef YY_READ_BUF_SIZE -#ifdef __ia64__ -/* On IA-64, the buffer size is 16k, not 8k */ -#define YY_READ_BUF_SIZE 16384 -#else -#define YY_READ_BUF_SIZE 8192 -#endif /* __ia64__ */ -#endif - -/* Copy whatever the last rule matched to the standard output. */ -#ifndef ECHO -/* This used to be an fputs(), but since the string might contain NUL's, - * we now use fwrite(). - */ -#define ECHO do { if (fwrite( yytext, yyleng, 1, yyout )) {} } while (0) -#endif - -/* Gets input and stuffs it into "buf". number of characters read, or YY_NULL, - * is returned in "result". - */ -#ifndef YY_INPUT -#define YY_INPUT(buf,result,max_size) \ - if ( YY_CURRENT_BUFFER_LVALUE->yy_is_interactive ) \ - { \ - int c = '*'; \ - size_t n; \ - for ( n = 0; n < max_size && \ - (c = getc( yyin )) != EOF && c != '\n'; ++n ) \ - buf[n] = (char) c; \ - if ( c == '\n' ) \ - buf[n++] = (char) c; \ - if ( c == EOF && ferror( yyin ) ) \ - YY_FATAL_ERROR( "input in flex scanner failed" ); \ - result = n; \ - } \ - else \ - { \ - errno=0; \ - while ( (result = fread(buf, 1, max_size, yyin))==0 && ferror(yyin)) \ - { \ - if( errno != EINTR) \ - { \ - YY_FATAL_ERROR( "input in flex scanner failed" ); \ - break; \ - } \ - errno=0; \ - clearerr(yyin); \ - } \ - }\ -\ - -#endif - -/* No semi-colon after return; correct usage is to write "yyterminate();" - - * we don't want an extra ';' after the "return" because that will cause - * some compilers to complain about unreachable statements. - */ -#ifndef yyterminate -#define yyterminate() return YY_NULL -#endif - -/* Number of entries by which start-condition stack grows. */ -#ifndef YY_START_STACK_INCR -#define YY_START_STACK_INCR 25 -#endif - -/* Report a fatal error. */ -#ifndef YY_FATAL_ERROR -#define YY_FATAL_ERROR(msg) yy_fatal_error( msg , yyscanner) -#endif - -/* end tables serialization structures and prototypes */ - -/* Default declaration of generated scanner - a define so the user can - * easily add parameters. - */ -#ifndef YY_DECL -#define YY_DECL_IS_OURS 1 - -extern int _xkbcommon_lex \ - (YYSTYPE * yylval_param,YYLTYPE * yylloc_param ,yyscan_t yyscanner); - -#define YY_DECL int _xkbcommon_lex \ - (YYSTYPE * yylval_param, YYLTYPE * yylloc_param , yyscan_t yyscanner) -#endif /* !YY_DECL */ - -/* Code executed at the beginning of each rule, after yytext and yyleng - * have been set up. - */ -#ifndef YY_USER_ACTION -#define YY_USER_ACTION -#endif - -/* Code executed at the end of each rule. */ -#ifndef YY_BREAK -#define YY_BREAK break; -#endif - -#define YY_RULE_SETUP \ - YY_USER_ACTION - -/** The main scanner function which does all the work. - */ -YY_DECL -{ - register yy_state_type yy_current_state; - register char *yy_cp, *yy_bp; - register int yy_act; - struct yyguts_t * yyg = (struct yyguts_t*)yyscanner; - -#line 69 "scanner.l" - - -#line 1049 "src/xkbcomp/scanner.c" - - yylval = yylval_param; - - yylloc = yylloc_param; - - if ( !yyg->yy_init ) - { - yyg->yy_init = 1; - -#ifdef YY_USER_INIT - YY_USER_INIT; -#endif - - if ( ! yyg->yy_start ) - yyg->yy_start = 1; /* first start state */ - - if ( ! yyin ) - yyin = stdin; - - if ( ! yyout ) - yyout = stdout; - - if ( ! YY_CURRENT_BUFFER ) { - _xkbcommon_ensure_buffer_stack (yyscanner); - YY_CURRENT_BUFFER_LVALUE = - _xkbcommon__create_buffer(yyin,YY_BUF_SIZE ,yyscanner); - } - - _xkbcommon__load_buffer_state(yyscanner ); - } - - while ( 1 ) /* loops until end-of-file is reached */ - { - yy_cp = yyg->yy_c_buf_p; - - /* Support of yytext. */ - *yy_cp = yyg->yy_hold_char; - - /* yy_bp points to the position in yy_ch_buf of the start of - * the current run. - */ - yy_bp = yy_cp; - - yy_current_state = yyg->yy_start; -yy_match: - do - { - register YY_CHAR yy_c = yy_ec[YY_SC_TO_UI(*yy_cp)]; - if ( yy_accept[yy_current_state] ) - { - yyg->yy_last_accepting_state = yy_current_state; - yyg->yy_last_accepting_cpos = yy_cp; - } - while ( yy_chk[yy_base[yy_current_state] + yy_c] != yy_current_state ) - { - yy_current_state = (int) yy_def[yy_current_state]; - if ( yy_current_state >= 336 ) - yy_c = yy_meta[(unsigned int) yy_c]; - } - yy_current_state = yy_nxt[yy_base[yy_current_state] + (unsigned int) yy_c]; - ++yy_cp; - } - while ( yy_current_state != 335 ); - yy_cp = yyg->yy_last_accepting_cpos; - yy_current_state = yyg->yy_last_accepting_state; - -yy_find_action: - yy_act = yy_accept[yy_current_state]; - - YY_DO_BEFORE_ACTION; - - if ( yy_act != YY_END_OF_BUFFER && yy_rule_can_match_eol[yy_act] ) - { - int yyl; - for ( yyl = 0; yyl < yyleng; ++yyl ) - if ( yytext[yyl] == '\n' ) - - do{ yylineno++; - yycolumn=0; - }while(0) -; - } - -do_action: /* This label is used only to access EOF actions. */ - - switch ( yy_act ) - { /* beginning of action switch */ - case 0: /* must back up */ - /* undo the effects of YY_DO_BEFORE_ACTION */ - *yy_cp = yyg->yy_hold_char; - yy_cp = yyg->yy_last_accepting_cpos; - yy_current_state = yyg->yy_last_accepting_state; - goto yy_find_action; - -case 1: -YY_RULE_SETUP -#line 71 "scanner.l" - - YY_BREAK -case 2: -YY_RULE_SETUP -#line 72 "scanner.l" - - YY_BREAK -case 3: -YY_RULE_SETUP -#line 74 "scanner.l" -yyextra->s = yyextra->scanBuf; BEGIN(S_STR); - YY_BREAK -case 4: -YY_RULE_SETUP -#line 76 "scanner.l" -{ - BEGIN(INITIAL); - *yyextra->s = '\0'; - yylval->str = strdup(yyextra->scanBuf); - return STRING; - } - YY_BREAK -case 5: -YY_RULE_SETUP -#line 83 "scanner.l" -{ - /* octal escape sequence */ - unsigned int result; - - (void) sscanf( yytext + 1, "%o", &result ); - - if (result > 0xff) { - scanner_error_extra(yylloc, yyextra, - "Illegal octal escape"); - return ERROR_TOK; - } - - APPEND_S(result); - } - YY_BREAK -case 6: -YY_RULE_SETUP -#line 98 "scanner.l" -{ - scanner_error_extra(yylloc, yyextra, - "Illegal octal escape"); - return ERROR_TOK; - } - YY_BREAK -case 7: -YY_RULE_SETUP -#line 104 "scanner.l" -APPEND_S('\n'); - YY_BREAK -case 8: -YY_RULE_SETUP -#line 105 "scanner.l" -APPEND_S('\t'); - YY_BREAK -case 9: -YY_RULE_SETUP -#line 106 "scanner.l" -APPEND_S('\r'); - YY_BREAK -case 10: -YY_RULE_SETUP -#line 107 "scanner.l" -APPEND_S('\b'); - YY_BREAK -case 11: -YY_RULE_SETUP -#line 108 "scanner.l" -APPEND_S('\f'); - YY_BREAK -case 12: -YY_RULE_SETUP -#line 109 "scanner.l" -APPEND_S('\v'); - YY_BREAK -case 13: -YY_RULE_SETUP -#line 110 "scanner.l" -APPEND_S('\033'); - YY_BREAK -case 14: -YY_RULE_SETUP -#line 112 "scanner.l" -APPEND_S(yytext[0]); - YY_BREAK -case 15: -YY_RULE_SETUP -#line 114 "scanner.l" -{ - /* We don't want the brackets. */ - yytext[yyleng - 1] = '\0'; - yytext++; - yylval->sval = xkb_atom_intern(yyextra->ctx, yytext); - return KEYNAME; - } - YY_BREAK -case 16: -YY_RULE_SETUP -#line 122 "scanner.l" -return XKB_KEYMAP; - YY_BREAK -case 17: -YY_RULE_SETUP -#line 123 "scanner.l" -return XKB_KEYCODES; - YY_BREAK -case 18: -YY_RULE_SETUP -#line 124 "scanner.l" -return XKB_TYPES; - YY_BREAK -case 19: -YY_RULE_SETUP -#line 125 "scanner.l" -return XKB_SYMBOLS; - YY_BREAK -case 20: -YY_RULE_SETUP -#line 126 "scanner.l" -return XKB_COMPATMAP; - YY_BREAK -case 21: -YY_RULE_SETUP -#line 127 "scanner.l" -return XKB_COMPATMAP; - YY_BREAK -case 22: -YY_RULE_SETUP -#line 128 "scanner.l" -return XKB_COMPATMAP; - YY_BREAK -case 23: -YY_RULE_SETUP -#line 129 "scanner.l" -return XKB_COMPATMAP; - YY_BREAK -case 24: -YY_RULE_SETUP -#line 130 "scanner.l" -return XKB_GEOMETRY; - YY_BREAK -case 25: -YY_RULE_SETUP -#line 131 "scanner.l" -return XKB_SEMANTICS; - YY_BREAK -case 26: -YY_RULE_SETUP -#line 132 "scanner.l" -return XKB_LAYOUT; - YY_BREAK -case 27: -YY_RULE_SETUP -#line 133 "scanner.l" -return INCLUDE; - YY_BREAK -case 28: -YY_RULE_SETUP -#line 134 "scanner.l" -return OVERRIDE; - YY_BREAK -case 29: -YY_RULE_SETUP -#line 135 "scanner.l" -return AUGMENT; - YY_BREAK -case 30: -YY_RULE_SETUP -#line 136 "scanner.l" -return REPLACE; - YY_BREAK -case 31: -YY_RULE_SETUP -#line 137 "scanner.l" -return ALTERNATE; - YY_BREAK -case 32: -YY_RULE_SETUP -#line 138 "scanner.l" -return PARTIAL; - YY_BREAK -case 33: -YY_RULE_SETUP -#line 139 "scanner.l" -return DEFAULT; - YY_BREAK -case 34: -YY_RULE_SETUP -#line 140 "scanner.l" -return HIDDEN; - YY_BREAK -case 35: -YY_RULE_SETUP -#line 141 "scanner.l" -return VIRTUAL_MODS; - YY_BREAK -case 36: -YY_RULE_SETUP -#line 142 "scanner.l" -return TYPE; - YY_BREAK -case 37: -YY_RULE_SETUP -#line 143 "scanner.l" -return INTERPRET; - YY_BREAK -case 38: -YY_RULE_SETUP -#line 144 "scanner.l" -return ACTION_TOK; - YY_BREAK -case 39: -YY_RULE_SETUP -#line 145 "scanner.l" -return KEY; - YY_BREAK -case 40: -YY_RULE_SETUP -#line 146 "scanner.l" -return ALIAS; - YY_BREAK -case 41: -YY_RULE_SETUP -#line 147 "scanner.l" -return GROUP; - YY_BREAK -case 42: -YY_RULE_SETUP -#line 148 "scanner.l" -return MODIFIER_MAP; - YY_BREAK -case 43: -YY_RULE_SETUP -#line 149 "scanner.l" -return MODIFIER_MAP; - YY_BREAK -case 44: -YY_RULE_SETUP -#line 150 "scanner.l" -return MODIFIER_MAP; - YY_BREAK -case 45: -YY_RULE_SETUP -#line 151 "scanner.l" -return INDICATOR; - YY_BREAK -case 46: -YY_RULE_SETUP -#line 152 "scanner.l" -return SHAPE; - YY_BREAK -case 47: -YY_RULE_SETUP -#line 153 "scanner.l" -return ROW; - YY_BREAK -case 48: -YY_RULE_SETUP -#line 154 "scanner.l" -return KEYS; - YY_BREAK -case 49: -YY_RULE_SETUP -#line 155 "scanner.l" -return SECTION; - YY_BREAK -case 50: -YY_RULE_SETUP -#line 156 "scanner.l" -return OVERLAY; - YY_BREAK -case 51: -YY_RULE_SETUP -#line 157 "scanner.l" -return TEXT; - YY_BREAK -case 52: -YY_RULE_SETUP -#line 158 "scanner.l" -return OUTLINE; - YY_BREAK -case 53: -YY_RULE_SETUP -#line 159 "scanner.l" -return SOLID; - YY_BREAK -case 54: -YY_RULE_SETUP -#line 160 "scanner.l" -return LOGO; - YY_BREAK -case 55: -YY_RULE_SETUP -#line 161 "scanner.l" -return VIRTUAL; - YY_BREAK -case 56: -YY_RULE_SETUP -#line 162 "scanner.l" -return ALPHANUMERIC_KEYS; - YY_BREAK -case 57: -YY_RULE_SETUP -#line 163 "scanner.l" -return MODIFIER_KEYS; - YY_BREAK -case 58: -YY_RULE_SETUP -#line 164 "scanner.l" -return KEYPAD_KEYS; - YY_BREAK -case 59: -YY_RULE_SETUP -#line 165 "scanner.l" -return FUNCTION_KEYS; - YY_BREAK -case 60: -YY_RULE_SETUP -#line 166 "scanner.l" -return ALTERNATE_GROUP; - YY_BREAK -case 61: -YY_RULE_SETUP -#line 168 "scanner.l" -yylval->str = strdup(yytext); return IDENT; - YY_BREAK -case 62: -#line 171 "scanner.l" -case 63: -YY_RULE_SETUP -#line 171 "scanner.l" -{ - char *end; - yylval->num = strtoul(yytext, &end, 0); - - return INTEGER; - } - YY_BREAK -case 64: -YY_RULE_SETUP -#line 177 "scanner.l" -{ - char *end; - yylval->num = strtod(yytext, &end); - - return FLOAT; - } - YY_BREAK -case 65: -YY_RULE_SETUP -#line 184 "scanner.l" -return EQUALS; - YY_BREAK -case 66: -YY_RULE_SETUP -#line 185 "scanner.l" -return PLUS; - YY_BREAK -case 67: -YY_RULE_SETUP -#line 186 "scanner.l" -return MINUS; - YY_BREAK -case 68: -YY_RULE_SETUP -#line 187 "scanner.l" -return DIVIDE; - YY_BREAK -case 69: -YY_RULE_SETUP -#line 188 "scanner.l" -return TIMES; - YY_BREAK -case 70: -YY_RULE_SETUP -#line 189 "scanner.l" -return OBRACE; - YY_BREAK -case 71: -YY_RULE_SETUP -#line 190 "scanner.l" -return CBRACE; - YY_BREAK -case 72: -YY_RULE_SETUP -#line 191 "scanner.l" -return OPAREN; - YY_BREAK -case 73: -YY_RULE_SETUP -#line 192 "scanner.l" -return CPAREN; - YY_BREAK -case 74: -YY_RULE_SETUP -#line 193 "scanner.l" -return OBRACKET; - YY_BREAK -case 75: -YY_RULE_SETUP -#line 194 "scanner.l" -return CBRACKET; - YY_BREAK -case 76: -YY_RULE_SETUP -#line 195 "scanner.l" -return DOT; - YY_BREAK -case 77: -YY_RULE_SETUP -#line 196 "scanner.l" -return COMMA; - YY_BREAK -case 78: -YY_RULE_SETUP -#line 197 "scanner.l" -return SEMI; - YY_BREAK -case 79: -YY_RULE_SETUP -#line 198 "scanner.l" -return EXCLAM; - YY_BREAK -case 80: -YY_RULE_SETUP -#line 199 "scanner.l" -return INVERT; - YY_BREAK -case 81: -/* rule 81 can match eol */ -YY_RULE_SETUP -#line 201 "scanner.l" - - YY_BREAK -case YY_STATE_EOF(INITIAL): -case YY_STATE_EOF(S_STR): -#line 203 "scanner.l" -return END_OF_FILE; - YY_BREAK -case 82: -YY_RULE_SETUP -#line 205 "scanner.l" -return ERROR_TOK; - YY_BREAK -case 83: -YY_RULE_SETUP -#line 207 "scanner.l" -ECHO; - YY_BREAK -#line 1600 "src/xkbcomp/scanner.c" - - case YY_END_OF_BUFFER: - { - /* Amount of text matched not including the EOB char. */ - int yy_amount_of_matched_text = (int) (yy_cp - yyg->yytext_ptr) - 1; - - /* Undo the effects of YY_DO_BEFORE_ACTION. */ - *yy_cp = yyg->yy_hold_char; - YY_RESTORE_YY_MORE_OFFSET - - if ( YY_CURRENT_BUFFER_LVALUE->yy_buffer_status == YY_BUFFER_NEW ) - { - /* We're scanning a new file or input source. It's - * possible that this happened because the user - * just pointed yyin at a new source and called - * _xkbcommon_lex(). If so, then we have to assure - * consistency between YY_CURRENT_BUFFER and our - * globals. Here is the right place to do so, because - * this is the first action (other than possibly a - * back-up) that will match for the new input source. - */ - yyg->yy_n_chars = YY_CURRENT_BUFFER_LVALUE->yy_n_chars; - YY_CURRENT_BUFFER_LVALUE->yy_input_file = yyin; - YY_CURRENT_BUFFER_LVALUE->yy_buffer_status = YY_BUFFER_NORMAL; - } - - /* Note that here we test for yy_c_buf_p "<=" to the position - * of the first EOB in the buffer, since yy_c_buf_p will - * already have been incremented past the NUL character - * (since all states make transitions on EOB to the - * end-of-buffer state). Contrast this with the test - * in input(). - */ - if ( yyg->yy_c_buf_p <= &YY_CURRENT_BUFFER_LVALUE->yy_ch_buf[yyg->yy_n_chars] ) - { /* This was really a NUL. */ - yy_state_type yy_next_state; - - yyg->yy_c_buf_p = yyg->yytext_ptr + yy_amount_of_matched_text; - - yy_current_state = yy_get_previous_state( yyscanner ); - - /* Okay, we're now positioned to make the NUL - * transition. We couldn't have - * yy_get_previous_state() go ahead and do it - * for us because it doesn't know how to deal - * with the possibility of jamming (and we don't - * want to build jamming into it because then it - * will run more slowly). - */ - - yy_next_state = yy_try_NUL_trans( yy_current_state , yyscanner); - - yy_bp = yyg->yytext_ptr + YY_MORE_ADJ; - - if ( yy_next_state ) - { - /* Consume the NUL. */ - yy_cp = ++yyg->yy_c_buf_p; - yy_current_state = yy_next_state; - goto yy_match; - } - - else - { - yy_cp = yyg->yy_last_accepting_cpos; - yy_current_state = yyg->yy_last_accepting_state; - goto yy_find_action; - } - } - - else switch ( yy_get_next_buffer( yyscanner ) ) - { - case EOB_ACT_END_OF_FILE: - { - yyg->yy_did_buffer_switch_on_eof = 0; - - if ( _xkbcommon_wrap(yyscanner ) ) - { - /* Note: because we've taken care in - * yy_get_next_buffer() to have set up - * yytext, we can now set up - * yy_c_buf_p so that if some total - * hoser (like flex itself) wants to - * call the scanner after we return the - * YY_NULL, it'll still work - another - * YY_NULL will get returned. - */ - yyg->yy_c_buf_p = yyg->yytext_ptr + YY_MORE_ADJ; - - yy_act = YY_STATE_EOF(YY_START); - goto do_action; - } - - else - { - if ( ! yyg->yy_did_buffer_switch_on_eof ) - YY_NEW_FILE; - } - break; - } - - case EOB_ACT_CONTINUE_SCAN: - yyg->yy_c_buf_p = - yyg->yytext_ptr + yy_amount_of_matched_text; - - yy_current_state = yy_get_previous_state( yyscanner ); - - yy_cp = yyg->yy_c_buf_p; - yy_bp = yyg->yytext_ptr + YY_MORE_ADJ; - goto yy_match; - - case EOB_ACT_LAST_MATCH: - yyg->yy_c_buf_p = - &YY_CURRENT_BUFFER_LVALUE->yy_ch_buf[yyg->yy_n_chars]; - - yy_current_state = yy_get_previous_state( yyscanner ); - - yy_cp = yyg->yy_c_buf_p; - yy_bp = yyg->yytext_ptr + YY_MORE_ADJ; - goto yy_find_action; - } - break; - } - - default: - YY_FATAL_ERROR( - "fatal flex scanner internal error--no action found" ); - } /* end of action switch */ - } /* end of scanning one token */ -} /* end of _xkbcommon_lex */ - -/* yy_get_next_buffer - try to read in a new buffer - * - * Returns a code representing an action: - * EOB_ACT_LAST_MATCH - - * EOB_ACT_CONTINUE_SCAN - continue scanning from current position - * EOB_ACT_END_OF_FILE - end of file - */ -static int yy_get_next_buffer (yyscan_t yyscanner) -{ - struct yyguts_t * yyg = (struct yyguts_t*)yyscanner; - register char *dest = YY_CURRENT_BUFFER_LVALUE->yy_ch_buf; - register char *source = yyg->yytext_ptr; - register int number_to_move, i; - int ret_val; - - if ( yyg->yy_c_buf_p > &YY_CURRENT_BUFFER_LVALUE->yy_ch_buf[yyg->yy_n_chars + 1] ) - YY_FATAL_ERROR( - "fatal flex scanner internal error--end of buffer missed" ); - - if ( YY_CURRENT_BUFFER_LVALUE->yy_fill_buffer == 0 ) - { /* Don't try to fill the buffer, so this is an EOF. */ - if ( yyg->yy_c_buf_p - yyg->yytext_ptr - YY_MORE_ADJ == 1 ) - { - /* We matched a single character, the EOB, so - * treat this as a final EOF. - */ - return EOB_ACT_END_OF_FILE; - } - - else - { - /* We matched some text prior to the EOB, first - * process it. - */ - return EOB_ACT_LAST_MATCH; - } - } - - /* Try to read more data. */ - - /* First move last chars to start of buffer. */ - number_to_move = (int) (yyg->yy_c_buf_p - yyg->yytext_ptr) - 1; - - for ( i = 0; i < number_to_move; ++i ) - *(dest++) = *(source++); - - if ( YY_CURRENT_BUFFER_LVALUE->yy_buffer_status == YY_BUFFER_EOF_PENDING ) - /* don't do the read, it's not guaranteed to return an EOF, - * just force an EOF - */ - YY_CURRENT_BUFFER_LVALUE->yy_n_chars = yyg->yy_n_chars = 0; - - else - { - int num_to_read = - YY_CURRENT_BUFFER_LVALUE->yy_buf_size - number_to_move - 1; - - while ( num_to_read <= 0 ) - { /* Not enough room in the buffer - grow it. */ - - /* just a shorter name for the current buffer */ - YY_BUFFER_STATE b = YY_CURRENT_BUFFER; - - int yy_c_buf_p_offset = - (int) (yyg->yy_c_buf_p - b->yy_ch_buf); - - if ( b->yy_is_our_buffer ) - { - int new_size = b->yy_buf_size * 2; - - if ( new_size <= 0 ) - b->yy_buf_size += b->yy_buf_size / 8; - else - b->yy_buf_size *= 2; - - b->yy_ch_buf = (char *) - /* Include room in for 2 EOB chars. */ - _xkbcommon_realloc((void *) b->yy_ch_buf,b->yy_buf_size + 2 ,yyscanner ); - } - else - /* Can't grow it, we don't own it. */ - b->yy_ch_buf = 0; - - if ( ! b->yy_ch_buf ) - YY_FATAL_ERROR( - "fatal error - scanner input buffer overflow" ); - - yyg->yy_c_buf_p = &b->yy_ch_buf[yy_c_buf_p_offset]; - - num_to_read = YY_CURRENT_BUFFER_LVALUE->yy_buf_size - - number_to_move - 1; - - } - - if ( num_to_read > YY_READ_BUF_SIZE ) - num_to_read = YY_READ_BUF_SIZE; - - /* Read in more data. */ - YY_INPUT( (&YY_CURRENT_BUFFER_LVALUE->yy_ch_buf[number_to_move]), - yyg->yy_n_chars, (size_t) num_to_read ); - - YY_CURRENT_BUFFER_LVALUE->yy_n_chars = yyg->yy_n_chars; - } - - if ( yyg->yy_n_chars == 0 ) - { - if ( number_to_move == YY_MORE_ADJ ) - { - ret_val = EOB_ACT_END_OF_FILE; - _xkbcommon_restart(yyin ,yyscanner); - } - - else - { - ret_val = EOB_ACT_LAST_MATCH; - YY_CURRENT_BUFFER_LVALUE->yy_buffer_status = - YY_BUFFER_EOF_PENDING; - } - } - - else - ret_val = EOB_ACT_CONTINUE_SCAN; - - if ((yy_size_t) (yyg->yy_n_chars + number_to_move) > YY_CURRENT_BUFFER_LVALUE->yy_buf_size) { - /* Extend the array by 50%, plus the number we really need. */ - yy_size_t new_size = yyg->yy_n_chars + number_to_move + (yyg->yy_n_chars >> 1); - YY_CURRENT_BUFFER_LVALUE->yy_ch_buf = (char *) _xkbcommon_realloc((void *) YY_CURRENT_BUFFER_LVALUE->yy_ch_buf,new_size ,yyscanner ); - if ( ! YY_CURRENT_BUFFER_LVALUE->yy_ch_buf ) - YY_FATAL_ERROR( "out of dynamic memory in yy_get_next_buffer()" ); - } - - yyg->yy_n_chars += number_to_move; - YY_CURRENT_BUFFER_LVALUE->yy_ch_buf[yyg->yy_n_chars] = YY_END_OF_BUFFER_CHAR; - YY_CURRENT_BUFFER_LVALUE->yy_ch_buf[yyg->yy_n_chars + 1] = YY_END_OF_BUFFER_CHAR; - - yyg->yytext_ptr = &YY_CURRENT_BUFFER_LVALUE->yy_ch_buf[0]; - - return ret_val; -} - -/* yy_get_previous_state - get the state just before the EOB char was reached */ - - static yy_state_type yy_get_previous_state (yyscan_t yyscanner) -{ - register yy_state_type yy_current_state; - register char *yy_cp; - struct yyguts_t * yyg = (struct yyguts_t*)yyscanner; - - yy_current_state = yyg->yy_start; - - for ( yy_cp = yyg->yytext_ptr + YY_MORE_ADJ; yy_cp < yyg->yy_c_buf_p; ++yy_cp ) - { - register YY_CHAR yy_c = (*yy_cp ? yy_ec[YY_SC_TO_UI(*yy_cp)] : 1); - if ( yy_accept[yy_current_state] ) - { - yyg->yy_last_accepting_state = yy_current_state; - yyg->yy_last_accepting_cpos = yy_cp; - } - while ( yy_chk[yy_base[yy_current_state] + yy_c] != yy_current_state ) - { - yy_current_state = (int) yy_def[yy_current_state]; - if ( yy_current_state >= 336 ) - yy_c = yy_meta[(unsigned int) yy_c]; - } - yy_current_state = yy_nxt[yy_base[yy_current_state] + (unsigned int) yy_c]; - } - - return yy_current_state; -} - -/* yy_try_NUL_trans - try to make a transition on the NUL character - * - * synopsis - * next_state = yy_try_NUL_trans( current_state ); - */ - static yy_state_type yy_try_NUL_trans (yy_state_type yy_current_state , yyscan_t yyscanner) -{ - register int yy_is_jam; - struct yyguts_t * yyg = (struct yyguts_t*)yyscanner; /* This var may be unused depending upon options. */ - register char *yy_cp = yyg->yy_c_buf_p; - - register YY_CHAR yy_c = 1; - if ( yy_accept[yy_current_state] ) - { - yyg->yy_last_accepting_state = yy_current_state; - yyg->yy_last_accepting_cpos = yy_cp; - } - while ( yy_chk[yy_base[yy_current_state] + yy_c] != yy_current_state ) - { - yy_current_state = (int) yy_def[yy_current_state]; - if ( yy_current_state >= 336 ) - yy_c = yy_meta[(unsigned int) yy_c]; - } - yy_current_state = yy_nxt[yy_base[yy_current_state] + (unsigned int) yy_c]; - yy_is_jam = (yy_current_state == 335); - - return yy_is_jam ? 0 : yy_current_state; -} - -#ifndef YY_NO_INPUT -#ifdef __cplusplus - static int yyinput (yyscan_t yyscanner) -#else - static int input (yyscan_t yyscanner) -#endif - -{ - int c; - struct yyguts_t * yyg = (struct yyguts_t*)yyscanner; - - *yyg->yy_c_buf_p = yyg->yy_hold_char; - - if ( *yyg->yy_c_buf_p == YY_END_OF_BUFFER_CHAR ) - { - /* yy_c_buf_p now points to the character we want to return. - * If this occurs *before* the EOB characters, then it's a - * valid NUL; if not, then we've hit the end of the buffer. - */ - if ( yyg->yy_c_buf_p < &YY_CURRENT_BUFFER_LVALUE->yy_ch_buf[yyg->yy_n_chars] ) - /* This was really a NUL. */ - *yyg->yy_c_buf_p = '\0'; - - else - { /* need more input */ - int offset = yyg->yy_c_buf_p - yyg->yytext_ptr; - ++yyg->yy_c_buf_p; - - switch ( yy_get_next_buffer( yyscanner ) ) - { - case EOB_ACT_LAST_MATCH: - /* This happens because yy_g_n_b() - * sees that we've accumulated a - * token and flags that we need to - * try matching the token before - * proceeding. But for input(), - * there's no matching to consider. - * So convert the EOB_ACT_LAST_MATCH - * to EOB_ACT_END_OF_FILE. - */ - - /* Reset buffer status. */ - _xkbcommon_restart(yyin ,yyscanner); - - /*FALLTHROUGH*/ - - case EOB_ACT_END_OF_FILE: - { - if ( _xkbcommon_wrap(yyscanner ) ) - return EOF; - - if ( ! yyg->yy_did_buffer_switch_on_eof ) - YY_NEW_FILE; -#ifdef __cplusplus - return yyinput(yyscanner); -#else - return input(yyscanner); -#endif - } - - case EOB_ACT_CONTINUE_SCAN: - yyg->yy_c_buf_p = yyg->yytext_ptr + offset; - break; - } - } - } - - c = *(unsigned char *) yyg->yy_c_buf_p; /* cast for 8-bit char's */ - *yyg->yy_c_buf_p = '\0'; /* preserve yytext */ - yyg->yy_hold_char = *++yyg->yy_c_buf_p; - - if ( c == '\n' ) - - do{ yylineno++; - yycolumn=0; - }while(0) -; - - return c; -} -#endif /* ifndef YY_NO_INPUT */ - -/** Immediately switch to a different input stream. - * @param input_file A readable stream. - * @param yyscanner The scanner object. - * @note This function does not reset the start condition to @c INITIAL . - */ - void _xkbcommon_restart (FILE * input_file , yyscan_t yyscanner) -{ - struct yyguts_t * yyg = (struct yyguts_t*)yyscanner; - - if ( ! YY_CURRENT_BUFFER ){ - _xkbcommon_ensure_buffer_stack (yyscanner); - YY_CURRENT_BUFFER_LVALUE = - _xkbcommon__create_buffer(yyin,YY_BUF_SIZE ,yyscanner); - } - - _xkbcommon__init_buffer(YY_CURRENT_BUFFER,input_file ,yyscanner); - _xkbcommon__load_buffer_state(yyscanner ); -} - -/** Switch to a different input buffer. - * @param new_buffer The new input buffer. - * @param yyscanner The scanner object. - */ - void _xkbcommon__switch_to_buffer (YY_BUFFER_STATE new_buffer , yyscan_t yyscanner) +scanner_log(enum xkb_log_level level, struct scanner *s, const char *msg) { - struct yyguts_t * yyg = (struct yyguts_t*)yyscanner; - - /* TODO. We should be able to replace this entire function body - * with - * _xkbcommon_pop_buffer_state(); - * _xkbcommon_push_buffer_state(new_buffer); - */ - _xkbcommon_ensure_buffer_stack (yyscanner); - if ( YY_CURRENT_BUFFER == new_buffer ) - return; - - if ( YY_CURRENT_BUFFER ) - { - /* Flush out information for old buffer. */ - *yyg->yy_c_buf_p = yyg->yy_hold_char; - YY_CURRENT_BUFFER_LVALUE->yy_buf_pos = yyg->yy_c_buf_p; - YY_CURRENT_BUFFER_LVALUE->yy_n_chars = yyg->yy_n_chars; - } - - YY_CURRENT_BUFFER_LVALUE = new_buffer; - _xkbcommon__load_buffer_state(yyscanner ); - - /* We don't actually know whether we did this switch during - * EOF (_xkbcommon_wrap()) processing, but the only time this flag - * is looked at is after _xkbcommon_wrap() is called, so it's safe - * to go ahead and always set it. - */ - yyg->yy_did_buffer_switch_on_eof = 1; + xkb_log(s->ctx, level, 0, "%s:%d:%d: %s\n", s->file_name, + s->token_line, s->token_column, msg); } -static void _xkbcommon__load_buffer_state (yyscan_t yyscanner) +int +scanner_error(struct scanner *s, const char *msg) { - struct yyguts_t * yyg = (struct yyguts_t*)yyscanner; - yyg->yy_n_chars = YY_CURRENT_BUFFER_LVALUE->yy_n_chars; - yyg->yytext_ptr = yyg->yy_c_buf_p = YY_CURRENT_BUFFER_LVALUE->yy_buf_pos; - yyin = YY_CURRENT_BUFFER_LVALUE->yy_input_file; - yyg->yy_hold_char = *yyg->yy_c_buf_p; + scanner_log(XKB_LOG_LEVEL_ERROR, s, msg); + return ERROR_TOK; } -/** Allocate and initialize an input buffer state. - * @param file A readable stream. - * @param size The character buffer size in bytes. When in doubt, use @c YY_BUF_SIZE. - * @param yyscanner The scanner object. - * @return the allocated buffer state. - */ - YY_BUFFER_STATE _xkbcommon__create_buffer (FILE * file, int size , yyscan_t yyscanner) -{ - YY_BUFFER_STATE b; - - b = (YY_BUFFER_STATE) _xkbcommon_alloc(sizeof( struct yy_buffer_state ) ,yyscanner ); - if ( ! b ) - YY_FATAL_ERROR( "out of dynamic memory in _xkbcommon__create_buffer()" ); - - b->yy_buf_size = size; - - /* yy_ch_buf has to be 2 characters longer than the size given because - * we need to put in 2 end-of-buffer characters. - */ - b->yy_ch_buf = (char *) _xkbcommon_alloc(b->yy_buf_size + 2 ,yyscanner ); - if ( ! b->yy_ch_buf ) - YY_FATAL_ERROR( "out of dynamic memory in _xkbcommon__create_buffer()" ); - - b->yy_is_our_buffer = 1; - - _xkbcommon__init_buffer(b,file ,yyscanner); - - return b; -} - -/** Destroy the buffer. - * @param b a buffer created with _xkbcommon__create_buffer() - * @param yyscanner The scanner object. - */ - void _xkbcommon__delete_buffer (YY_BUFFER_STATE b , yyscan_t yyscanner) +void +scanner_warn(struct scanner *s, const char *msg) { - struct yyguts_t * yyg = (struct yyguts_t*)yyscanner; - - if ( ! b ) - return; - - if ( b == YY_CURRENT_BUFFER ) /* Not sure if we should pop here. */ - YY_CURRENT_BUFFER_LVALUE = (YY_BUFFER_STATE) 0; - - if ( b->yy_is_our_buffer ) - _xkbcommon_free((void *) b->yy_ch_buf ,yyscanner ); - - _xkbcommon_free((void *) b ,yyscanner ); + scanner_log(XKB_LOG_LEVEL_WARNING, s, msg); } -/* Initializes or reinitializes a buffer. - * This function is sometimes called more than once on the same buffer, - * such as during a _xkbcommon_restart() or at EOF. - */ - static void _xkbcommon__init_buffer (YY_BUFFER_STATE b, FILE * file , yyscan_t yyscanner) - +static bool +number(struct scanner *s, int64_t *out, int *out_tok) { - int oerrno = errno; - struct yyguts_t * yyg = (struct yyguts_t*)yyscanner; - - _xkbcommon__flush_buffer(b ,yyscanner); + bool is_float = false, is_hex = false; + const char *start = s->s + s->pos; + char *end; - b->yy_input_file = file; - b->yy_fill_buffer = 1; - - /* If b is the current buffer, then _xkbcommon__init_buffer was _probably_ - * called from _xkbcommon_restart() or through yy_get_next_buffer. - * In that case, we don't want to reset the lineno or column. - */ - if (b != YY_CURRENT_BUFFER){ - b->yy_bs_lineno = 1; - b->yy_bs_column = 0; + if (lit(s, "0x")) { + while (is_xdigit(peek(s))) next(s); + is_hex = true; } + else { + while (is_digit(peek(s))) next(s); + is_float = chr(s, '.'); + while (is_digit(peek(s))) next(s); + } + if (s->s + s->pos == start) + return false; - b->yy_is_interactive = 0; - - errno = oerrno; -} - -/** Discard all buffered characters. On the next scan, YY_INPUT will be called. - * @param b the buffer state to be flushed, usually @c YY_CURRENT_BUFFER. - * @param yyscanner The scanner object. - */ - void _xkbcommon__flush_buffer (YY_BUFFER_STATE b , yyscan_t yyscanner) -{ - struct yyguts_t * yyg = (struct yyguts_t*)yyscanner; - if ( ! b ) - return; - - b->yy_n_chars = 0; - - /* We always need two end-of-buffer characters. The first causes - * a transition to the end-of-buffer state. The second causes - * a jam in that state. - */ - b->yy_ch_buf[0] = YY_END_OF_BUFFER_CHAR; - b->yy_ch_buf[1] = YY_END_OF_BUFFER_CHAR; - - b->yy_buf_pos = &b->yy_ch_buf[0]; - - b->yy_at_bol = 1; - b->yy_buffer_status = YY_BUFFER_NEW; - - if ( b == YY_CURRENT_BUFFER ) - _xkbcommon__load_buffer_state(yyscanner ); -} - -/** Pushes the new state onto the stack. The new state becomes - * the current state. This function will allocate the stack - * if necessary. - * @param new_buffer The new state. - * @param yyscanner The scanner object. - */ -void _xkbcommon_push_buffer_state (YY_BUFFER_STATE new_buffer , yyscan_t yyscanner) -{ - struct yyguts_t * yyg = (struct yyguts_t*)yyscanner; - if (new_buffer == NULL) - return; - - _xkbcommon_ensure_buffer_stack(yyscanner); - - /* This block is copied from _xkbcommon__switch_to_buffer. */ - if ( YY_CURRENT_BUFFER ) - { - /* Flush out information for old buffer. */ - *yyg->yy_c_buf_p = yyg->yy_hold_char; - YY_CURRENT_BUFFER_LVALUE->yy_buf_pos = yyg->yy_c_buf_p; - YY_CURRENT_BUFFER_LVALUE->yy_n_chars = yyg->yy_n_chars; - } - - /* Only push if top exists. Otherwise, replace top. */ - if (YY_CURRENT_BUFFER) - yyg->yy_buffer_stack_top++; - YY_CURRENT_BUFFER_LVALUE = new_buffer; - - /* copied from _xkbcommon__switch_to_buffer. */ - _xkbcommon__load_buffer_state(yyscanner ); - yyg->yy_did_buffer_switch_on_eof = 1; -} - -/** Removes and deletes the top of the stack, if present. - * The next element becomes the new top. - * @param yyscanner The scanner object. - */ -void _xkbcommon_pop_buffer_state (yyscan_t yyscanner) -{ - struct yyguts_t * yyg = (struct yyguts_t*)yyscanner; - if (!YY_CURRENT_BUFFER) - return; - - _xkbcommon__delete_buffer(YY_CURRENT_BUFFER ,yyscanner); - YY_CURRENT_BUFFER_LVALUE = NULL; - if (yyg->yy_buffer_stack_top > 0) - --yyg->yy_buffer_stack_top; - - if (YY_CURRENT_BUFFER) { - _xkbcommon__load_buffer_state(yyscanner ); - yyg->yy_did_buffer_switch_on_eof = 1; - } -} - -/* Allocates the stack if it does not exist. - * Guarantees space for at least one push. - */ -static void _xkbcommon_ensure_buffer_stack (yyscan_t yyscanner) -{ - int num_to_alloc; - struct yyguts_t * yyg = (struct yyguts_t*)yyscanner; - - if (!yyg->yy_buffer_stack) { - - /* First allocation is just for 2 elements, since we don't know if this - * scanner will even need a stack. We use 2 instead of 1 to avoid an - * immediate realloc on the next call. - */ - num_to_alloc = 1; - yyg->yy_buffer_stack = (struct yy_buffer_state**)_xkbcommon_alloc - (num_to_alloc * sizeof(struct yy_buffer_state*) - , yyscanner); - if ( ! yyg->yy_buffer_stack ) - YY_FATAL_ERROR( "out of dynamic memory in _xkbcommon_ensure_buffer_stack()" ); - - memset(yyg->yy_buffer_stack, 0, num_to_alloc * sizeof(struct yy_buffer_state*)); - - yyg->yy_buffer_stack_max = num_to_alloc; - yyg->yy_buffer_stack_top = 0; - return; - } - - if (yyg->yy_buffer_stack_top >= (yyg->yy_buffer_stack_max) - 1){ - - /* Increase the buffer to prepare for a possible push. */ - int grow_size = 8 /* arbitrary grow size */; - - num_to_alloc = yyg->yy_buffer_stack_max + grow_size; - yyg->yy_buffer_stack = (struct yy_buffer_state**)_xkbcommon_realloc - (yyg->yy_buffer_stack, - num_to_alloc * sizeof(struct yy_buffer_state*) - , yyscanner); - if ( ! yyg->yy_buffer_stack ) - YY_FATAL_ERROR( "out of dynamic memory in _xkbcommon_ensure_buffer_stack()" ); - - /* zero only the new slots.*/ - memset(yyg->yy_buffer_stack + yyg->yy_buffer_stack_max, 0, grow_size * sizeof(struct yy_buffer_state*)); - yyg->yy_buffer_stack_max = num_to_alloc; - } -} - -/** Setup the input buffer state to scan directly from a user-specified character buffer. - * @param base the character buffer - * @param size the size in bytes of the character buffer - * @param yyscanner The scanner object. - * @return the newly allocated buffer state object. - */ -YY_BUFFER_STATE _xkbcommon__scan_buffer (char * base, yy_size_t size , yyscan_t yyscanner) -{ - YY_BUFFER_STATE b; - - if ( size < 2 || - base[size-2] != YY_END_OF_BUFFER_CHAR || - base[size-1] != YY_END_OF_BUFFER_CHAR ) - /* They forgot to leave room for the EOB's. */ - return 0; - - b = (YY_BUFFER_STATE) _xkbcommon_alloc(sizeof( struct yy_buffer_state ) ,yyscanner ); - if ( ! b ) - YY_FATAL_ERROR( "out of dynamic memory in _xkbcommon__scan_buffer()" ); - - b->yy_buf_size = size - 2; /* "- 2" to take care of EOB's */ - b->yy_buf_pos = b->yy_ch_buf = base; - b->yy_is_our_buffer = 0; - b->yy_input_file = 0; - b->yy_n_chars = b->yy_buf_size; - b->yy_is_interactive = 0; - b->yy_at_bol = 1; - b->yy_fill_buffer = 0; - b->yy_buffer_status = YY_BUFFER_NEW; - - _xkbcommon__switch_to_buffer(b ,yyscanner ); - - return b; -} - -/** Setup the input buffer state to scan a string. The next call to _xkbcommon_lex() will - * scan from a @e copy of @a str. - * @param yystr a NUL-terminated string to scan - * @param yyscanner The scanner object. - * @return the newly allocated buffer state object. - * @note If you want to scan bytes that may contain NUL values, then use - * _xkbcommon__scan_bytes() instead. - */ -YY_BUFFER_STATE _xkbcommon__scan_string (yyconst char * yystr , yyscan_t yyscanner) -{ - - return _xkbcommon__scan_bytes(yystr,strlen(yystr) ,yyscanner); -} - -/** Setup the input buffer state to scan the given bytes. The next call to _xkbcommon_lex() will - * scan from a @e copy of @a bytes. - * @param yybytes the byte buffer to scan - * @param _yybytes_len the number of bytes in the buffer pointed to by @a bytes. - * @param yyscanner The scanner object. - * @return the newly allocated buffer state object. - */ -YY_BUFFER_STATE _xkbcommon__scan_bytes (yyconst char * yybytes, int _yybytes_len , yyscan_t yyscanner) -{ - YY_BUFFER_STATE b; - char *buf; - yy_size_t n; - int i; - - /* Get memory for full buffer, including space for trailing EOB's. */ - n = _yybytes_len + 2; - buf = (char *) _xkbcommon_alloc(n ,yyscanner ); - if ( ! buf ) - YY_FATAL_ERROR( "out of dynamic memory in _xkbcommon__scan_bytes()" ); - - for ( i = 0; i < _yybytes_len; ++i ) - buf[i] = yybytes[i]; - - buf[_yybytes_len] = buf[_yybytes_len+1] = YY_END_OF_BUFFER_CHAR; - - b = _xkbcommon__scan_buffer(buf,n ,yyscanner); - if ( ! b ) - YY_FATAL_ERROR( "bad buffer in _xkbcommon__scan_bytes()" ); - - /* It's okay to grow etc. this buffer, and we should throw it - * away when we're done. - */ - b->yy_is_our_buffer = 1; - - return b; -} - -#ifndef YY_EXIT_FAILURE -#define YY_EXIT_FAILURE 2 -#endif - -static void yy_fatal_error (yyconst char* msg , yyscan_t yyscanner) -{ - (void) fprintf( stderr, "%s\n", msg ); - exit( YY_EXIT_FAILURE ); -} - -/* Redefine yyless() so it works in section 3 code. */ - -#undef yyless -#define yyless(n) \ - do \ - { \ - /* Undo effects of setting up yytext. */ \ - int yyless_macro_arg = (n); \ - YY_LESS_LINENO(yyless_macro_arg);\ - yytext[yyleng] = yyg->yy_hold_char; \ - yyg->yy_c_buf_p = yytext + yyless_macro_arg; \ - yyg->yy_hold_char = *yyg->yy_c_buf_p; \ - *yyg->yy_c_buf_p = '\0'; \ - yyleng = yyless_macro_arg; \ - } \ - while ( 0 ) - -/* Accessor methods (get/set functions) to struct members. */ - -/** Get the user-defined data for this scanner. - * @param yyscanner The scanner object. - */ -YY_EXTRA_TYPE _xkbcommon_get_extra (yyscan_t yyscanner) -{ - struct yyguts_t * yyg = (struct yyguts_t*)yyscanner; - return yyextra; -} - -/** Get the current line number. - * @param yyscanner The scanner object. - */ -int _xkbcommon_get_lineno (yyscan_t yyscanner) -{ - struct yyguts_t * yyg = (struct yyguts_t*)yyscanner; - - if (! YY_CURRENT_BUFFER) - return 0; - - return yylineno; -} - -/** Get the current column number. - * @param yyscanner The scanner object. - */ -int _xkbcommon_get_column (yyscan_t yyscanner) -{ - struct yyguts_t * yyg = (struct yyguts_t*)yyscanner; - - if (! YY_CURRENT_BUFFER) - return 0; - - return yycolumn; -} - -/** Get the input stream. - * @param yyscanner The scanner object. - */ -FILE *_xkbcommon_get_in (yyscan_t yyscanner) -{ - struct yyguts_t * yyg = (struct yyguts_t*)yyscanner; - return yyin; -} - -/** Get the output stream. - * @param yyscanner The scanner object. - */ -FILE *_xkbcommon_get_out (yyscan_t yyscanner) -{ - struct yyguts_t * yyg = (struct yyguts_t*)yyscanner; - return yyout; -} - -/** Get the length of the current token. - * @param yyscanner The scanner object. - */ -int _xkbcommon_get_leng (yyscan_t yyscanner) -{ - struct yyguts_t * yyg = (struct yyguts_t*)yyscanner; - return yyleng; -} - -/** Get the current token. - * @param yyscanner The scanner object. - */ - -char *_xkbcommon_get_text (yyscan_t yyscanner) -{ - struct yyguts_t * yyg = (struct yyguts_t*)yyscanner; - return yytext; -} - -/** Set the user-defined data. This data is never touched by the scanner. - * @param user_defined The data to be associated with this scanner. - * @param yyscanner The scanner object. - */ -void _xkbcommon_set_extra (YY_EXTRA_TYPE user_defined , yyscan_t yyscanner) -{ - struct yyguts_t * yyg = (struct yyguts_t*)yyscanner; - yyextra = user_defined ; -} - -/** Set the current line number. - * @param line_number - * @param yyscanner The scanner object. - */ -void _xkbcommon_set_lineno (int line_number , yyscan_t yyscanner) -{ - struct yyguts_t * yyg = (struct yyguts_t*)yyscanner; - - /* lineno is only valid if an input buffer exists. */ - if (! YY_CURRENT_BUFFER ) - yy_fatal_error( "_xkbcommon_set_lineno called with no buffer" , yyscanner); - - yylineno = line_number; -} - -/** Set the current column. - * @param line_number - * @param yyscanner The scanner object. - */ -void _xkbcommon_set_column (int column_no , yyscan_t yyscanner) -{ - struct yyguts_t * yyg = (struct yyguts_t*)yyscanner; - - /* column is only valid if an input buffer exists. */ - if (! YY_CURRENT_BUFFER ) - yy_fatal_error( "_xkbcommon_set_column called with no buffer" , yyscanner); - - yycolumn = column_no; -} - -/** Set the input stream. This does not discard the current - * input buffer. - * @param in_str A readable stream. - * @param yyscanner The scanner object. - * @see _xkbcommon__switch_to_buffer - */ -void _xkbcommon_set_in (FILE * in_str , yyscan_t yyscanner) -{ - struct yyguts_t * yyg = (struct yyguts_t*)yyscanner; - yyin = in_str ; -} - -void _xkbcommon_set_out (FILE * out_str , yyscan_t yyscanner) -{ - struct yyguts_t * yyg = (struct yyguts_t*)yyscanner; - yyout = out_str ; -} - -int _xkbcommon_get_debug (yyscan_t yyscanner) -{ - struct yyguts_t * yyg = (struct yyguts_t*)yyscanner; - return yy_flex_debug; -} - -void _xkbcommon_set_debug (int bdebug , yyscan_t yyscanner) -{ - struct yyguts_t * yyg = (struct yyguts_t*)yyscanner; - yy_flex_debug = bdebug ; -} - -/* Accessor methods for yylval and yylloc */ - -YYSTYPE * _xkbcommon_get_lval (yyscan_t yyscanner) -{ - struct yyguts_t * yyg = (struct yyguts_t*)yyscanner; - return yylval; -} - -void _xkbcommon_set_lval (YYSTYPE * yylval_param , yyscan_t yyscanner) -{ - struct yyguts_t * yyg = (struct yyguts_t*)yyscanner; - yylval = yylval_param; + errno = 0; + if (is_hex) + *out = strtoul(start, &end, 16); + else if (is_float) + *out = strtod(start, &end); + else + *out = strtoul(start, &end, 10); + if (errno != 0 || s->s + s->pos != end) + *out_tok = ERROR_TOK; + else + *out_tok = (is_float ? FLOAT : INTEGER); + return true; } -YYLTYPE *_xkbcommon_get_lloc (yyscan_t yyscanner) +int +_xkbcommon_lex(YYSTYPE *yylval, struct scanner *s) { - struct yyguts_t * yyg = (struct yyguts_t*)yyscanner; - return yylloc; -} - -void _xkbcommon_set_lloc (YYLTYPE * yylloc_param , yyscan_t yyscanner) -{ - struct yyguts_t * yyg = (struct yyguts_t*)yyscanner; - yylloc = yylloc_param; -} - -/* User-visible API */ + int tok; -/* _xkbcommon_lex_init is special because it creates the scanner itself, so it is - * the ONLY reentrant function that doesn't take the scanner as the last argument. - * That's why we explicitly handle the declaration, instead of using our macros. - */ - -int _xkbcommon_lex_init(yyscan_t* ptr_yy_globals) +skip_more_whitespace_and_comments: + /* Skip spaces. */ + while (is_space(peek(s))) next(s); -{ - if (ptr_yy_globals == NULL){ - errno = EINVAL; - return 1; + /* Skip comments. */ + if (lit(s, "//") || chr(s, '#')) { + while (!eof(s) && !eol(s)) next(s); + goto skip_more_whitespace_and_comments; } - *ptr_yy_globals = (yyscan_t) _xkbcommon_alloc ( sizeof( struct yyguts_t ), NULL ); - - if (*ptr_yy_globals == NULL){ - errno = ENOMEM; - return 1; + /* See if we're done. */ + if (eof(s)) return END_OF_FILE; + + /* New token. */ + s->token_line = s->line; + s->token_column = s->column; + s->buf_pos = 0; + + /* String literal. */ + if (chr(s, '\"')) { + while (!eof(s) && !eol(s) && peek(s) != '\"') { + if (chr(s, '\\')) { + uint8_t o; + if (chr(s, '\\')) buf_append(s, '\\'); + else if (chr(s, 'n')) buf_append(s, '\n'); + else if (chr(s, 't')) buf_append(s, '\t'); + else if (chr(s, 'r')) buf_append(s, '\r'); + else if (chr(s, 'b')) buf_append(s, '\b'); + else if (chr(s, 'f')) buf_append(s, '\f'); + else if (chr(s, 'v')) buf_append(s, '\v'); + else if (chr(s, 'e')) buf_append(s, '\033'); + else if (oct(s, &o)) buf_append(s, (char) o); + else { + scanner_warn(s, "unknown escape sequence in string literal"); + /* Ignore. */ + } + } else { + buf_append(s, next(s)); + } + } + if (!buf_append(s, '\0') || !chr(s, '\"')) + return scanner_error(s, "unterminated string literal"); + yylval->str = strdup(s->buf); + if (!yylval->str) + return scanner_error(s, "scanner out of memory"); + return STRING; } - /* By setting to 0xAA, we expose bugs in yy_init_globals. Leave at 0x00 for releases. */ - memset(*ptr_yy_globals,0x00,sizeof(struct yyguts_t)); - - return yy_init_globals ( *ptr_yy_globals ); -} - -/* _xkbcommon_lex_init_extra has the same functionality as _xkbcommon_lex_init, but follows the - * convention of taking the scanner as the last argument. Note however, that - * this is a *pointer* to a scanner, as it will be allocated by this call (and - * is the reason, too, why this function also must handle its own declaration). - * The user defined value in the first argument will be available to _xkbcommon_alloc in - * the yyextra field. - */ - -int _xkbcommon_lex_init_extra(YY_EXTRA_TYPE yy_user_defined,yyscan_t* ptr_yy_globals ) - -{ - struct yyguts_t dummy_yyguts; - - _xkbcommon_set_extra (yy_user_defined, &dummy_yyguts); - - if (ptr_yy_globals == NULL){ - errno = EINVAL; - return 1; + /* Key name literal. */ + if (chr(s, '<')) { + while (is_graph(peek(s)) && peek(s) != '>') + buf_append(s, next(s)); + if (!buf_append(s, '\0') || !chr(s, '>')) + return scanner_error(s, "unterminated key name literal"); + /* Empty key name literals are allowed. */ + yylval->sval = xkb_atom_intern(s->ctx, s->buf, s->buf_pos - 1); + return KEYNAME; } - - *ptr_yy_globals = (yyscan_t) _xkbcommon_alloc ( sizeof( struct yyguts_t ), &dummy_yyguts ); - - if (*ptr_yy_globals == NULL){ - errno = ENOMEM; - return 1; - } - - /* By setting to 0xAA, we expose bugs in - yy_init_globals. Leave at 0x00 for releases. */ - memset(*ptr_yy_globals,0x00,sizeof(struct yyguts_t)); - - _xkbcommon_set_extra (yy_user_defined, *ptr_yy_globals); - - return yy_init_globals ( *ptr_yy_globals ); -} - -static int yy_init_globals (yyscan_t yyscanner) -{ - struct yyguts_t * yyg = (struct yyguts_t*)yyscanner; - /* Initialization is the same as for the non-reentrant scanner. - * This function is called from _xkbcommon_lex_destroy(), so don't allocate here. - */ - - yyg->yy_buffer_stack = 0; - yyg->yy_buffer_stack_top = 0; - yyg->yy_buffer_stack_max = 0; - yyg->yy_c_buf_p = (char *) 0; - yyg->yy_init = 0; - yyg->yy_start = 0; - - yyg->yy_start_stack_ptr = 0; - yyg->yy_start_stack_depth = 0; - yyg->yy_start_stack = NULL; - -/* Defined in main.c */ -#ifdef YY_STDINIT - yyin = stdin; - yyout = stdout; -#else - yyin = (FILE *) 0; - yyout = (FILE *) 0; -#endif - - /* For future reference: Set errno on error, since we are called by - * _xkbcommon_lex_init() - */ - return 0; -} - -/* _xkbcommon_lex_destroy is for both reentrant and non-reentrant scanners. */ -int _xkbcommon_lex_destroy (yyscan_t yyscanner) -{ - struct yyguts_t * yyg = (struct yyguts_t*)yyscanner; - - /* Pop the buffer stack, destroying each element. */ - while(YY_CURRENT_BUFFER){ - _xkbcommon__delete_buffer(YY_CURRENT_BUFFER ,yyscanner ); - YY_CURRENT_BUFFER_LVALUE = NULL; - _xkbcommon_pop_buffer_state(yyscanner); - } - - /* Destroy the stack itself. */ - _xkbcommon_free(yyg->yy_buffer_stack ,yyscanner); - yyg->yy_buffer_stack = NULL; - - /* Destroy the start condition stack. */ - _xkbcommon_free(yyg->yy_start_stack ,yyscanner ); - yyg->yy_start_stack = NULL; - - /* Reset the globals. This is important in a non-reentrant scanner so the next time - * _xkbcommon_lex() is called, initialization will occur. */ - yy_init_globals( yyscanner); - - /* Destroy the main struct (reentrant only). */ - _xkbcommon_free ( yyscanner , yyscanner ); - yyscanner = NULL; - return 0; -} -/* - * Internal utility routines. - */ - -#ifndef yytext_ptr -static void yy_flex_strncpy (char* s1, yyconst char * s2, int n , yyscan_t yyscanner) -{ - register int i; - for ( i = 0; i < n; ++i ) - s1[i] = s2[i]; -} -#endif - -#ifdef YY_NEED_STRLEN -static int yy_flex_strlen (yyconst char * s , yyscan_t yyscanner) -{ - register int n; - for ( n = 0; s[n]; ++n ) - ; - - return n; -} -#endif - -void *_xkbcommon_alloc (yy_size_t size , yyscan_t yyscanner) -{ - return (void *) malloc( size ); -} - -void *_xkbcommon_realloc (void * ptr, yy_size_t size , yyscan_t yyscanner) -{ - /* The cast to (char *) in the following accommodates both - * implementations that use char* generic pointers, and those - * that use void* generic pointers. It works with the latter - * because both ANSI C and C++ allow castless assignment from - * any pointer type to void*, and deal with argument conversions - * as though doing an assignment. - */ - return (void *) realloc( (char *) ptr, size ); -} - -void _xkbcommon_free (void * ptr , yyscan_t yyscanner) -{ - free( (char *) ptr ); /* see _xkbcommon_realloc() for (char *) cast */ -} - -#define YYTABLES_NAME "yytables" - -#line 207 "scanner.l" - - - -#pragma GCC diagnostic pop - -static void -scanner_error_extra(struct YYLTYPE *loc, struct scanner_extra *extra, - const char *msg) -{ - log_err(extra->ctx, "%s: line %d of %s\n", msg, - loc->first_line, - extra->file_name ? extra->file_name : "(unknown)"); -} - -void -scanner_error(struct YYLTYPE *loc, void *scanner, const char *msg) -{ - struct scanner_extra *extra = _xkbcommon_get_extra(scanner); - scanner_error_extra(loc, extra, msg); -} - -static bool -init_scanner(yyscan_t *scanner, struct scanner_extra *extra, - struct xkb_context *ctx, const char *file_name) -{ - memset(extra, 0, sizeof(*extra)); - - if (_xkbcommon_lex_init_extra(extra,scanner) != 0) - return false; - - extra->ctx = ctx; - extra->file_name = file_name; - - return true; -} - -static void -clear_scanner(yyscan_t scanner) -{ - _xkbcommon_lex_destroy(scanner); -} - -XkbFile * -XkbParseString(struct xkb_context *ctx, const char *string, - const char *file_name) -{ - yyscan_t scanner; - struct scanner_extra extra; - YY_BUFFER_STATE state; - XkbFile *xkb_file; - - if (!init_scanner(&scanner, &extra, ctx, file_name)) - return NULL; - - state = _xkbcommon__scan_string(string,scanner); - - xkb_file = parse(ctx, scanner, NULL); + /* Operators and punctuation. */ + if (chr(s, ';')) return SEMI; + if (chr(s, '{')) return OBRACE; + if (chr(s, '}')) return CBRACE; + if (chr(s, '=')) return EQUALS; + if (chr(s, '[')) return OBRACKET; + if (chr(s, ']')) return CBRACKET; + if (chr(s, '(')) return OPAREN; + if (chr(s, ')')) return CPAREN; + if (chr(s, '.')) return DOT; + if (chr(s, ',')) return COMMA; + if (chr(s, '+')) return PLUS; + if (chr(s, '-')) return MINUS; + if (chr(s, '*')) return TIMES; + if (chr(s, '/')) return DIVIDE; + if (chr(s, '!')) return EXCLAM; + if (chr(s, '~')) return INVERT; + + /* Identifier. */ + if (is_alpha(peek(s)) || peek(s) == '_') { + s->buf_pos = 0; + while (is_alnum(peek(s)) || peek(s) == '_') + buf_append(s, next(s)); + if (!buf_append(s, '\0')) + return scanner_error(s, "identifier too long"); + + /* Keyword. */ + tok = keyword_to_token(s->buf); + if (tok != -1) return tok; + + yylval->str = strdup(s->buf); + if (!yylval->str) + return scanner_error(s, "scanner out of memory"); + return IDENT; + } - _xkbcommon__delete_buffer(state,scanner); - clear_scanner(scanner); + /* Number literal (hexadecimal / decimal / float). */ + if (number(s, &yylval->num, &tok)) { + if (tok == ERROR_TOK) + return scanner_error(s, "malformed number literal"); + return tok; + } - return xkb_file; + return scanner_error(s, "unrecognized token"); } -/* - * _xkbcommon__scan_buffer() requires the last two bytes of \buf to be 0. These two bytes - * are not scanned. Other zero bytes in the buffer are scanned normally, though. - * Due to these terminating zeroes, \length must be greater than 2. - * Furthermore, the buffer must be writable and you cannot make any assumptions - * about it after the scanner finished. - * All this must be guaranteed by the caller of this function! - */ XkbFile * -XkbParseBuffer(struct xkb_context *ctx, char *buf, size_t length, - const char *file_name) +XkbParseString(struct xkb_context *ctx, const char *string, size_t len, + const char *file_name, const char *map) { - yyscan_t scanner; - struct scanner_extra extra; - YY_BUFFER_STATE state; - XkbFile *xkb_file; - - if (!init_scanner(&scanner, &extra, ctx, file_name)) - return NULL; - - xkb_file = NULL; - state = _xkbcommon__scan_buffer(buf,length,scanner); - if (state) { - xkb_file = parse(ctx, scanner, NULL); - _xkbcommon__delete_buffer(state,scanner); - } - - clear_scanner(scanner); - - return xkb_file; + struct scanner scanner; + scanner_init(&scanner, ctx, string, len, file_name); + return parse(ctx, &scanner, map); } XkbFile * XkbParseFile(struct xkb_context *ctx, FILE *file, const char *file_name, const char *map) { - yyscan_t scanner; - struct scanner_extra extra; - YY_BUFFER_STATE state; + bool ok; XkbFile *xkb_file; + const char *string; + size_t size; - if (!init_scanner(&scanner, &extra, ctx, file_name)) + ok = map_file(file, &string, &size); + if (!ok) { + log_err(ctx, "Couldn't read XKB file %s: %s\n", + file_name, strerror(errno)); return NULL; + } - state = _xkbcommon__create_buffer(file,YY_BUF_SIZE,scanner); - _xkbcommon__switch_to_buffer(state,scanner); - - xkb_file = parse(ctx, scanner, map); - - _xkbcommon__delete_buffer(state,scanner); - clear_scanner(scanner); - + xkb_file = XkbParseString(ctx, string, size, file_name, map); + unmap_file(string, size); return xkb_file; } - diff --git a/src/3rdparty/xkbcommon/src/xkbcomp/symbols.c b/src/3rdparty/xkbcommon/src/xkbcomp/symbols.c index a2970f5004..56cce431da 100644 --- a/src/3rdparty/xkbcommon/src/xkbcomp/symbols.c +++ b/src/3rdparty/xkbcommon/src/xkbcomp/symbols.c @@ -143,7 +143,7 @@ InitKeyInfo(struct xkb_context *ctx, KeyInfo *keyi) { memset(keyi, 0, sizeof(*keyi)); keyi->merge = MERGE_OVERRIDE; - keyi->name = xkb_atom_intern(ctx, "*"); + keyi->name = xkb_atom_intern_literal(ctx, "*"); keyi->out_of_range_group_action = RANGE_WRAP; } @@ -177,7 +177,7 @@ typedef struct { KeyInfo default_key; ActionsInfo *actions; darray(xkb_atom_t) group_names; - darray(ModMapEntry) modMaps; + darray(ModMapEntry) modmaps; struct xkb_keymap *keymap; } SymbolsInfo; @@ -203,7 +203,7 @@ ClearSymbolsInfo(SymbolsInfo *info) ClearKeyInfo(keyi); darray_free(info->keys); darray_free(info->group_names); - darray_free(info->modMaps); + darray_free(info->modmaps); ClearKeyInfo(&info->default_key); } @@ -437,7 +437,7 @@ AddModMapEntry(SymbolsInfo *info, ModMapEntry *new) ModMapEntry *old; bool clobber = (new->merge != MERGE_AUGMENT); - darray_foreach(old, info->modMaps) { + darray_foreach(old, info->modmaps) { xkb_mod_index_t use, ignore; if ((new->haveSymbol != old->haveSymbol) || @@ -470,7 +470,7 @@ AddModMapEntry(SymbolsInfo *info, ModMapEntry *new) return true; } - darray_append(info->modMaps, *new); + darray_append(info->modmaps, *new); return true; } @@ -517,7 +517,7 @@ MergeIncludedSymbols(SymbolsInfo *into, SymbolsInfo *from, into->errorCount++; } - darray_foreach(mm, from->modMaps) { + darray_foreach(mm, from->modmaps) { mm->merge = (merge == MERGE_DEFAULT ? mm->merge : merge); if (!AddModMapEntry(into, mm)) into->errorCount++; @@ -626,30 +626,6 @@ GetGroupIndex(SymbolsInfo *info, KeyInfo *keyi, ExprDef *arrayNdx, return true; } -bool -LookupKeysym(const char *str, xkb_keysym_t *sym_rtrn) -{ - xkb_keysym_t sym; - - if (!str || istreq(str, "any") || istreq(str, "nosymbol")) { - *sym_rtrn = XKB_KEY_NoSymbol; - return 1; - } - - if (istreq(str, "none") || istreq(str, "voidsymbol")) { - *sym_rtrn = XKB_KEY_VoidSymbol; - return 1; - } - - sym = xkb_keysym_from_name(str, 0); - if (sym != XKB_KEY_NoSymbol) { - *sym_rtrn = sym; - return 1; - } - - return 0; -} - static bool AddSymbolsToKey(SymbolsInfo *info, KeyInfo *keyi, ExprDef *arrayNdx, ExprDef *value) @@ -670,11 +646,11 @@ AddSymbolsToKey(SymbolsInfo *info, KeyInfo *keyi, ExprDef *arrayNdx, return true; } - if (value->op != EXPR_KEYSYM_LIST) { + if (value->expr.op != EXPR_KEYSYM_LIST) { log_err(info->keymap->ctx, "Expected a list of symbols, found %s; " "Ignoring symbols for group %u of %s\n", - expr_op_type_to_string(value->op), ndx + 1, + expr_op_type_to_string(value->expr.op), ndx + 1, KeyInfoText(info, keyi)); return false; } @@ -687,7 +663,7 @@ AddSymbolsToKey(SymbolsInfo *info, KeyInfo *keyi, ExprDef *arrayNdx, return false; } - nLevels = darray_size(value->value.list.symsMapIndex); + nLevels = darray_size(value->keysym_list.symsMapIndex); if (darray_size(groupi->levels) < nLevels) darray_resize0(groupi->levels, nLevels); @@ -697,34 +673,14 @@ AddSymbolsToKey(SymbolsInfo *info, KeyInfo *keyi, ExprDef *arrayNdx, unsigned int sym_index; struct xkb_level *leveli = &darray_item(groupi->levels, i); - sym_index = darray_item(value->value.list.symsMapIndex, i); - leveli->num_syms = darray_item(value->value.list.symsNumEntries, i); + sym_index = darray_item(value->keysym_list.symsMapIndex, i); + leveli->num_syms = darray_item(value->keysym_list.symsNumEntries, i); if (leveli->num_syms > 1) leveli->u.syms = calloc(leveli->num_syms, sizeof(*leveli->u.syms)); for (j = 0; j < leveli->num_syms; j++) { - char *sym_name = darray_item(value->value.list.syms, - sym_index + j); - xkb_keysym_t keysym; - - if (!LookupKeysym(sym_name, &keysym)) { - const char *group_name = "unnamed"; - - if (ndx < darray_size(info->group_names) && - darray_item(info->group_names, ndx)) - group_name = xkb_atom_text(info->keymap->ctx, - darray_item(info->group_names, - ndx)); - - log_warn(info->keymap->ctx, - "Could not resolve keysym %s for key %s, group %u (%s), level %u\n", - sym_name, KeyInfoText(info, keyi), ndx + 1, - group_name, i); - - ClearLevelInfo(leveli); - leveli->num_syms = 0; - break; - } + xkb_keysym_t keysym = darray_item(value->keysym_list.syms, + sym_index + j); if (leveli->num_syms == 1) { if (keysym == XKB_KEY_NoSymbol) @@ -750,7 +706,6 @@ AddActionsToKey(SymbolsInfo *info, KeyInfo *keyi, ExprDef *arrayNdx, GroupInfo *groupi; unsigned int nActs; ExprDef *act; - union xkb_action *toAct; if (!GetGroupIndex(info, keyi, arrayNdx, ACTIONS, &ndx)) return false; @@ -762,11 +717,11 @@ AddActionsToKey(SymbolsInfo *info, KeyInfo *keyi, ExprDef *arrayNdx, return true; } - if (value->op != EXPR_ACTION_LIST) { + if (value->expr.op != EXPR_ACTION_LIST) { log_wsgo(info->keymap->ctx, "Bad expression type (%d) for action list value; " "Ignoring actions for group %u of %s\n", - value->op, ndx, KeyInfoText(info, keyi)); + value->expr.op, ndx, KeyInfoText(info, keyi)); return false; } @@ -778,7 +733,7 @@ AddActionsToKey(SymbolsInfo *info, KeyInfo *keyi, ExprDef *arrayNdx, } nActs = 0; - for (act = value->value.child; act; act = (ExprDef *) act->common.next) + for (act = value->unary.child; act; act = (ExprDef *) act->common.next) nActs++; if (darray_size(groupi->levels) < nActs) @@ -786,9 +741,9 @@ AddActionsToKey(SymbolsInfo *info, KeyInfo *keyi, ExprDef *arrayNdx, groupi->defined |= GROUP_FIELD_ACTS; - act = value->value.child; + act = value->unary.child; for (i = 0; i < nActs; i++) { - toAct = &darray_item(groupi->levels, i).action; + union xkb_action *toAct = &darray_item(groupi->levels, i).action; if (!HandleActionDef(act, info->keymap, toAct, info->actions)) log_err(info->keymap->ctx, @@ -866,7 +821,7 @@ SetSymbolsField(SymbolsInfo *info, KeyInfo *keyi, const char *field, log_err(info->keymap->ctx, "Expected a virtual modifier mask, found %s; " "Ignoring virtual modifiers definition for key %s\n", - expr_op_type_to_string(value->op), + expr_op_type_to_string(value->expr.op), KeyInfoText(info, keyi)); } } @@ -1082,7 +1037,7 @@ HandleSymbolsBody(SymbolsInfo *info, VarDef *def, KeyInfo *keyi) ExprDef *arrayNdx; for (; def; def = (VarDef *) def->common.next) { - if (def->name && def->name->op == EXPR_FIELD_REF) { + if (def->name && def->name->expr.op == EXPR_FIELD_REF) { log_err(info->keymap->ctx, "Cannot set a global default value from within a key statement; " "Move statements to the global file scope\n"); @@ -1090,7 +1045,7 @@ HandleSymbolsBody(SymbolsInfo *info, VarDef *def, KeyInfo *keyi) } if (!def->name) { - if (!def->value || def->value->op == EXPR_KEYSYM_LIST) + if (!def->value || def->value->expr.op == EXPR_KEYSYM_LIST) field = "symbols"; else field = "actions"; @@ -1158,7 +1113,7 @@ HandleSymbolsDef(SymbolsInfo *info, SymbolsDef *stmt) keyi.merge = stmt->merge; keyi.name = stmt->keyName; - if (!HandleSymbolsBody(info, (VarDef *) stmt->symbols, &keyi)) { + if (!HandleSymbolsBody(info, stmt->symbols, &keyi)) { info->errorCount++; return false; } @@ -1196,13 +1151,15 @@ HandleModMapDef(SymbolsInfo *info, ModMapDef *def) ok = true; tmp.modifier = ndx; + tmp.merge = def->merge; for (key = def->keys; key != NULL; key = (ExprDef *) key->common.next) { xkb_keysym_t sym; - if (key->op == EXPR_VALUE && key->value_type == EXPR_TYPE_KEYNAME) { + if (key->expr.op == EXPR_VALUE && + key->expr.value_type == EXPR_TYPE_KEYNAME) { tmp.haveSymbol = false; - tmp.u.keyName = key->value.keyName; + tmp.u.keyName = key->key_name.key_name; } else if (ExprResolveKeySym(ctx, key, &sym)) { tmp.haveSymbol = true; @@ -1248,7 +1205,7 @@ HandleSymbolsFile(SymbolsInfo *info, XkbFile *file, enum merge_mode merge) break; default: log_err(info->keymap->ctx, - "Interpretation files may not include other types; " + "Symbols files may not include other types; " "Ignoring %s\n", stmt_type_to_string(stmt->type)); ok = false; break; @@ -1339,19 +1296,19 @@ FindAutomaticType(struct xkb_context *ctx, GroupInfo *groupi) darray_item(groupi->levels, level).u.syms[0]) if (width == 1 || width <= 0) - return xkb_atom_intern(ctx, "ONE_LEVEL"); + return xkb_atom_intern_literal(ctx, "ONE_LEVEL"); sym0 = GET_SYM(0); sym1 = GET_SYM(1); if (width == 2) { if (xkb_keysym_is_lower(sym0) && xkb_keysym_is_upper(sym1)) - return xkb_atom_intern(ctx, "ALPHABETIC"); + return xkb_atom_intern_literal(ctx, "ALPHABETIC"); if (xkb_keysym_is_keypad(sym0) || xkb_keysym_is_keypad(sym1)) - return xkb_atom_intern(ctx, "KEYPAD"); + return xkb_atom_intern_literal(ctx, "KEYPAD"); - return xkb_atom_intern(ctx, "TWO_LEVEL"); + return xkb_atom_intern_literal(ctx, "TWO_LEVEL"); } if (width <= 4) { @@ -1360,15 +1317,15 @@ FindAutomaticType(struct xkb_context *ctx, GroupInfo *groupi) sym3 = (width == 4 ? GET_SYM(3) : XKB_KEY_NoSymbol); if (xkb_keysym_is_lower(sym2) && xkb_keysym_is_upper(sym3)) - return xkb_atom_intern(ctx, "FOUR_LEVEL_ALPHABETIC"); + return xkb_atom_intern_literal(ctx, "FOUR_LEVEL_ALPHABETIC"); - return xkb_atom_intern(ctx, "FOUR_LEVEL_SEMIALPHABETIC"); + return xkb_atom_intern_literal(ctx, "FOUR_LEVEL_SEMIALPHABETIC"); } if (xkb_keysym_is_keypad(sym0) || xkb_keysym_is_keypad(sym1)) - return xkb_atom_intern(ctx, "FOUR_LEVEL_KEYPAD"); + return xkb_atom_intern_literal(ctx, "FOUR_LEVEL_KEYPAD"); - return xkb_atom_intern(ctx, "FOUR_LEVEL"); + return xkb_atom_intern_literal(ctx, "FOUR_LEVEL"); } return XKB_ATOM_NONE; @@ -1570,9 +1527,9 @@ CopySymbolsToKeymap(struct xkb_keymap *keymap, SymbolsInfo *info) { KeyInfo *keyi; ModMapEntry *mm; - struct xkb_key *key; keymap->symbols_section_name = strdup_safe(info->name); + XkbEscapeMapName(keymap->symbols_section_name); keymap->num_group_names = darray_size(info->group_names); keymap->group_names = darray_mem(info->group_names, 0); @@ -1583,6 +1540,8 @@ CopySymbolsToKeymap(struct xkb_keymap *keymap, SymbolsInfo *info) info->errorCount++; if (xkb_context_get_log_verbosity(keymap->ctx) > 3) { + struct xkb_key *key; + xkb_foreach_key(key, keymap) { if (key->name == XKB_ATOM_NONE) continue; @@ -1594,7 +1553,7 @@ CopySymbolsToKeymap(struct xkb_keymap *keymap, SymbolsInfo *info) } } - darray_foreach(mm, info->modMaps) + darray_foreach(mm, info->modmaps) if (!CopyModMapDef(info, mm)) info->errorCount++; @@ -1618,9 +1577,6 @@ CompileSymbols(XkbFile *file, struct xkb_keymap *keymap, HandleSymbolsFile(&info, file, merge); - if (darray_empty(info.keys)) - goto err_info; - if (info.errorCount != 0) goto err_info; diff --git a/src/3rdparty/xkbcommon/src/xkbcomp/types.c b/src/3rdparty/xkbcommon/src/xkbcomp/types.c index 1eb1b73205..5b7ccbb4db 100644 --- a/src/3rdparty/xkbcommon/src/xkbcomp/types.c +++ b/src/3rdparty/xkbcommon/src/xkbcomp/types.c @@ -197,16 +197,6 @@ ReportTypeBadType(KeyTypesInfo *info, KeyTypeInfo *type, TypeTxt(info, type), wanted); } -static inline bool -ReportTypeBadWidth(KeyTypesInfo *info, const char *type, int has, int needs) -{ - log_err(info->keymap->ctx, - "Key type \"%s\" has %d levels, must have %d; " - "Illegal type definition ignored\n", - type, has, needs); - return false; -} - /***====================================================================***/ static void @@ -775,6 +765,7 @@ static bool CopyKeyTypesToKeymap(struct xkb_keymap *keymap, KeyTypesInfo *info) { keymap->types_section_name = strdup_safe(info->name); + XkbEscapeMapName(keymap->types_section_name); keymap->num_types = darray_size(info->types); if (keymap->num_types == 0) @@ -793,7 +784,7 @@ CopyKeyTypesToKeymap(struct xkb_keymap *keymap, KeyTypesInfo *info) type->num_levels = 1; type->entries = NULL; type->num_entries = 0; - type->name = xkb_atom_intern(keymap->ctx, "default"); + type->name = xkb_atom_intern_literal(keymap->ctx, "default"); type->level_names = NULL; return true; diff --git a/src/3rdparty/xkbcommon/src/xkbcomp/xkbcomp-priv.h b/src/3rdparty/xkbcommon/src/xkbcomp/xkbcomp-priv.h index 4d421b5f2f..6cb774da17 100644 --- a/src/3rdparty/xkbcommon/src/xkbcomp/xkbcomp-priv.h +++ b/src/3rdparty/xkbcommon/src/xkbcomp/xkbcomp-priv.h @@ -45,12 +45,9 @@ XkbParseFile(struct xkb_context *ctx, FILE *file, const char *file_name, const char *map); XkbFile * -XkbParseString(struct xkb_context *ctx, const char *string, - const char *file_name); - -XkbFile * -XkbParseBuffer(struct xkb_context *ctx, char *buf, size_t length, - const char *file_name); +XkbParseString(struct xkb_context *ctx, + const char *string, size_t len, + const char *file_name, const char *map); void FreeXkbFile(XkbFile *file); @@ -79,9 +76,6 @@ bool CompileKeymap(XkbFile *file, struct xkb_keymap *keymap, enum merge_mode merge); -bool -LookupKeysym(const char *str, xkb_keysym_t *sym_rtrn); - /***====================================================================***/ static inline bool diff --git a/src/3rdparty/xkbcommon/src/xkbcomp/xkbcomp.c b/src/3rdparty/xkbcommon/src/xkbcomp/xkbcomp.c index b9a1b5ffa6..007e3f73e8 100644 --- a/src/3rdparty/xkbcommon/src/xkbcomp/xkbcomp.c +++ b/src/3rdparty/xkbcommon/src/xkbcomp/xkbcomp.c @@ -97,12 +97,13 @@ text_v1_keymap_new_from_names(struct xkb_keymap *keymap, } static bool -text_v1_keymap_new_from_string(struct xkb_keymap *keymap, const char *string) +text_v1_keymap_new_from_string(struct xkb_keymap *keymap, + const char *string, size_t len) { bool ok; XkbFile *xkb_file; - xkb_file = XkbParseString(keymap->ctx, string, "(input string)"); + xkb_file = XkbParseString(keymap->ctx, string, len, "(input string)", NULL); if (!xkb_file) { log_err(keymap->ctx, "Failed to parse input xkb string\n"); return NULL; @@ -114,38 +115,6 @@ text_v1_keymap_new_from_string(struct xkb_keymap *keymap, const char *string) } static bool -text_v1_keymap_new_from_buffer(struct xkb_keymap *keymap, - const char *buffer, size_t length) -{ - bool ok; - XkbFile *xkb_file; - char *buf; - - buf = malloc(length + 2); - if (!buf) { - log_err(keymap->ctx, "Cannot allocate memory for keymap\n"); - return NULL; - } - - /* yy_scan_buffer requires two terminating zero bytes */ - memcpy(buf, buffer, length); - buf[length] = 0; - buf[length + 1] = 0; - - xkb_file = XkbParseBuffer(keymap->ctx, buf, length + 2, "input"); - if (!xkb_file) { - log_err(keymap->ctx, "Failed to parse input xkb file\n"); - free(buf); - return NULL; - } - - ok = compile_keymap_file(keymap, xkb_file); - FreeXkbFile(xkb_file); - free(buf); - return ok; -} - -static bool text_v1_keymap_new_from_file(struct xkb_keymap *keymap, FILE *file) { bool ok; @@ -165,7 +134,6 @@ text_v1_keymap_new_from_file(struct xkb_keymap *keymap, FILE *file) const struct xkb_keymap_format_ops text_v1_keymap_format_ops = { .keymap_new_from_names = text_v1_keymap_new_from_names, .keymap_new_from_string = text_v1_keymap_new_from_string, - .keymap_new_from_buffer = text_v1_keymap_new_from_buffer, .keymap_new_from_file = text_v1_keymap_new_from_file, .keymap_get_as_string = text_v1_keymap_get_as_string, }; |