diff options
Diffstat (limited to 'xkbparse.y')
| -rw-r--r-- | xkbparse.y | 36 |
1 files changed, 18 insertions, 18 deletions
@@ -6,19 +6,19 @@ 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 + 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 + 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 + + 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 + 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. @@ -139,11 +139,11 @@ unsigned int parseDebug; %type <uval> XkbCompositeType FileType MergeMode OptMergeMode %type <uval> DoodadType Flag Flags OptFlags %type <str> KeyName MapName OptMapName KeySym -%type <sval> FieldSpec Ident Element String -%type <any> DeclList Decl +%type <sval> FieldSpec Ident Element String +%type <any> DeclList Decl %type <expr> OptExprList ExprList Expr Term Lhs Terminal ArrayInit KeySyms %type <expr> OptKeySymList KeySymList Action ActionList Coord CoordList -%type <var> VarDecl VarDeclList SymbolsBody SymbolsVarDecl +%type <var> VarDecl VarDeclList SymbolsBody SymbolsVarDecl %type <vmod> VModDecl VModDefList VModDef %type <interp> InterpretDecl InterpretMatch %type <keyType> KeyTypeDecl @@ -157,7 +157,7 @@ unsigned int parseDebug; %type <shape> ShapeDecl %type <section> SectionDecl %type <row> SectionBody SectionBodyItem -%type <key> RowBody RowBodyItem Keys Key +%type <key> RowBody RowBodyItem Keys Key %type <overlay> OverlayDecl %type <olKey> OverlayKeyList OverlayKey %type <outline> OutlineList OutlineInList @@ -167,7 +167,7 @@ unsigned int parseDebug; %% XkbFile : XkbCompMapList { $$= rtrnValue= $1; } - | XkbMapConfigList + | XkbMapConfigList { $$= rtrnValue= $1; } | XkbConfig { $$= rtrnValue= $1; } @@ -339,9 +339,9 @@ KeyNameDecl : KeyName EQUALS Expr SEMI ; KeyAliasDecl : ALIAS KeyName EQUALS KeyName SEMI - { + { KeyAliasDef *def; - def= KeyAliasCreate($2,$4); + def= KeyAliasCreate($2,$4); if ($2) free($2); if ($4) free($4); $$= def; @@ -443,7 +443,7 @@ IndicatorNameDecl: INDICATOR Integer EQUALS Expr SEMI ShapeDecl : SHAPE String OBRACE OutlineList CBRACE SEMI { $$= ShapeDeclCreate($2,(OutlineDef *)&$4->common); } | SHAPE String OBRACE CoordList CBRACE SEMI - { + { OutlineDef *outlines; outlines= OutlineCreate(None,$4); $$= ShapeDeclCreate($2,outlines); @@ -501,7 +501,7 @@ OverlayDecl : OVERLAY String OBRACE OverlayKeyList CBRACE SEMI ; OverlayKeyList : OverlayKeyList COMMA OverlayKey - { + { $$= (OverlayKeyDef *) AppendStmt(&$1->common,&$3->common); } |