From d0c6fce24d0963380f4ee30c72fc2c5f7725e27c Mon Sep 17 00:00:00 2001
From: Ran Benita <ran234@gmail.com>
Date: Sat, 20 Sep 2014 15:06:13 +0300
Subject: [PATCH] parser: use "atom" instead of "sval" in yylval

"sval" is already used for "struct sval".

Signed-off-by: Ran Benita <ran234@gmail.com>
---
 src/xkbcomp/parser.y  | 6 +++---
 src/xkbcomp/scanner.c | 2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/xkbcomp/parser.y b/src/xkbcomp/parser.y
index dbb52d1..853f163 100644
--- a/src/xkbcomp/parser.y
+++ b/src/xkbcomp/parser.y
@@ -164,7 +164,7 @@ resolve_keysym(const char *name, xkb_keysym_t *sym_rtrn)
         int64_t          num;
         enum xkb_file_type file_type;
         char            *str;
-        xkb_atom_t      sval;
+        xkb_atom_t      atom;
         enum merge_mode merge;
         enum xkb_map_flags mapFlags;
         xkb_keysym_t    keysym;
@@ -187,14 +187,14 @@ resolve_keysym(const char *name, xkb_keysym_t *sym_rtrn)
 
 %type <num>     INTEGER FLOAT
 %type <str>     IDENT STRING
-%type <sval>    KEYNAME
+%type <atom>    KEYNAME
 %type <num>     KeyCode
 %type <ival>    Number Integer Float SignedNumber DoodadType
 %type <merge>   MergeMode OptMergeMode
 %type <file_type> XkbCompositeType FileType
 %type <mapFlags> Flag Flags OptFlags
 %type <str>     MapName OptMapName
-%type <sval>    FieldSpec Ident Element String
+%type <atom>    FieldSpec Ident Element String
 %type <keysym>  KeySym
 %type <any>     DeclList Decl
 %type <expr>    OptExprList ExprList Expr Term Lhs Terminal ArrayInit KeySyms
diff --git a/src/xkbcomp/scanner.c b/src/xkbcomp/scanner.c
index 06eb653..ead20ab 100644
--- a/src/xkbcomp/scanner.c
+++ b/src/xkbcomp/scanner.c
@@ -122,7 +122,7 @@ skip_more_whitespace_and_comments:
             return ERROR_TOK;
         }
         /* Empty key name literals are allowed. */
-        yylval->sval = xkb_atom_intern(s->ctx, s->buf, s->buf_pos - 1);
+        yylval->atom = xkb_atom_intern(s->ctx, s->buf, s->buf_pos - 1);
         return KEYNAME;
     }
 
-- 
2.7.4