diff options
Diffstat (limited to 'src/xkbcomp/parser.y')
| -rw-r--r-- | src/xkbcomp/parser.y | 10 |
1 files changed, 2 insertions, 8 deletions
diff --git a/src/xkbcomp/parser.y b/src/xkbcomp/parser.y index 5ffb38b..491e96c 100644 --- a/src/xkbcomp/parser.y +++ b/src/xkbcomp/parser.y @@ -172,22 +172,16 @@ _xkbcommon_error(struct YYLTYPE *loc, struct parser_param *param, const char *ms %type <geom> Keys Key OverlayDecl OverlayKeyList OverlayKey OutlineList OutlineInList %type <geom> DoodadDecl %type <file> XkbFile XkbMapConfigList XkbMapConfig -%type <file> XkbCompositeMap XkbCompMapList +%type <file> XkbCompositeMap %% -XkbFile : XkbCompMapList +XkbFile : XkbCompositeMap { $$ = param->rtrn = $1; } | XkbMapConfigList { $$ = param->rtrn = $1; } ; -XkbCompMapList : XkbCompMapList XkbCompositeMap - { $$ = (XkbFile *)AppendStmt(&$1->common, &$2->common); } - | XkbCompositeMap - { $$ = $1; } - ; - XkbCompositeMap : OptFlags XkbCompositeType OptMapName OBRACE XkbMapConfigList CBRACE SEMI |