Bison can generate all necessary definitions itself; there is no need
to maintain a hand written file for that.
Signed-off-by: Ran Benita <ran...@gmail.com>
---
src/xkbcomp/.gitignore | 1 +
src/xkbcomp/Makefile.am | 4 +-
src/xkbcomp/action.c | 1 -
src/xkbcomp/compat.c | 1 -
src/xkbcomp/expr.c | 1 -
src/xkbcomp/geometry.c | 1 -
src/xkbcomp/indicators.c | 1 -
src/xkbcomp/keycodes.c | 1 -
src/xkbcomp/keymap.c | 1 -
src/xkbcomp/keytypes.c | 1 -
src/xkbcomp/listing.c | 1 -
src/xkbcomp/misc.c | 1 -
src/xkbcomp/parseutils.h | 1 -
src/xkbcomp/symbols.c | 1 -
src/xkbcomp/tokens.h | 105 ----------------------------------------------
src/xkbcomp/vmod.c | 1 -
src/xkbcomp/xkbscan.l | 4 +-
17 files changed, 6 insertions(+), 121 deletions(-)
delete mode 100644 src/xkbcomp/tokens.h
diff --git a/src/xkbcomp/.gitignore b/src/xkbcomp/.gitignore
index f03a5af..f2976af 100644
--- a/src/xkbcomp/.gitignore
+++ b/src/xkbcomp/.gitignore
@@ -1,2 +1,3 @@
xkbparse.c
+xkbparse.h
xkbscan.c
diff --git a/src/xkbcomp/Makefile.am b/src/xkbcomp/Makefile.am
index ecee7d4..6176fb8 100644
--- a/src/xkbcomp/Makefile.am
+++ b/src/xkbcomp/Makefile.am
@@ -1,6 +1,7 @@
AM_CPPFLAGS = -I$(top_srcdir)/include -I$(top_srcdir)/src
AM_CFLAGS = $(X11_CFLAGS) $(CWARNFLAGS) \
-DDFLT_XKB_CONFIG_ROOT='"$(XKBCONFIGROOT)"'
+AM_YFLAGS = -d
noinst_LTLIBRARIES = libxkbcomp.la
libxkbcomp_la_SOURCES = \
@@ -24,7 +25,6 @@ libxkbcomp_la_SOURCES = \
parseutils.c \
parseutils.h \
symbols.c \
- tokens.h \
utils.c \
utils.h \
vmod.c \
@@ -35,3 +35,5 @@ libxkbcomp_la_SOURCES = \
xkbpath.c \
xkbpath.h \
xkbscan.l
+
+BUILT_SOURCES = xkbparse.h
diff --git a/src/xkbcomp/action.c b/src/xkbcomp/action.c
index 2debae7..f87b5ef 100644
--- a/src/xkbcomp/action.c
+++ b/src/xkbcomp/action.c
@@ -26,7 +26,6 @@
#include "xkbcomp.h"
#include "xkbmisc.h"
-#include "tokens.h"
#include "expr.h"
#include "keycodes.h"
diff --git a/src/xkbcomp/compat.c b/src/xkbcomp/compat.c
index 7a66281..9b268e6 100644
--- a/src/xkbcomp/compat.c
+++ b/src/xkbcomp/compat.c
@@ -28,7 +28,6 @@
#include "xkbcomp.h"
#include "xkballoc.h"
#include "xkbmisc.h"
-#include "tokens.h"
#include "expr.h"
#include "vmod.h"
#include "misc.h"
diff --git a/src/xkbcomp/expr.c b/src/xkbcomp/expr.c
index 929548a..13f8745 100644
--- a/src/xkbcomp/expr.c
+++ b/src/xkbcomp/expr.c
@@ -26,7 +26,6 @@
#include "xkbcomp.h"
#include "xkbmisc.h"
-#include "tokens.h"
#include "expr.h"
#include "vmod.h"
diff --git a/src/xkbcomp/geometry.c b/src/xkbcomp/geometry.c
index 41e0ab0..8e425a1 100644
--- a/src/xkbcomp/geometry.c
+++ b/src/xkbcomp/geometry.c
@@ -28,7 +28,6 @@
#include "xkballoc.h"
#include "xkbgeom.h"
#include "xkbmisc.h"
-#include "tokens.h"
#include "expr.h"
#include "vmod.h"
#include "misc.h"
diff --git a/src/xkbcomp/indicators.c b/src/xkbcomp/indicators.c
index 34d6a64..09baaaf 100644
--- a/src/xkbcomp/indicators.c
+++ b/src/xkbcomp/indicators.c
@@ -28,7 +28,6 @@
#include "xkballoc.h"
#include "xkbmisc.h"
#include "misc.h"
-#include "tokens.h"
#include "expr.h"
#include "vmod.h"
#include "indicators.h"
diff --git a/src/xkbcomp/keycodes.c b/src/xkbcomp/keycodes.c
index 8457245..906aa5f 100644
--- a/src/xkbcomp/keycodes.c
+++ b/src/xkbcomp/keycodes.c
@@ -27,7 +27,6 @@
#include "xkbcomp.h"
#include "xkballoc.h"
#include "xkbmisc.h"
-#include "tokens.h"
#include "expr.h"
#include "keycodes.h"
#include "misc.h"
diff --git a/src/xkbcomp/keymap.c b/src/xkbcomp/keymap.c
index 874bf8e..2c2420d 100644
--- a/src/xkbcomp/keymap.c
+++ b/src/xkbcomp/keymap.c
@@ -26,7 +26,6 @@
#include "xkbcomp.h"
#include "xkbmisc.h"
-#include "tokens.h"
#include "expr.h"
#include "vmod.h"
#include "action.h"
diff --git a/src/xkbcomp/keytypes.c b/src/xkbcomp/keytypes.c
index 57164d2..71f6075 100644
--- a/src/xkbcomp/keytypes.c
+++ b/src/xkbcomp/keytypes.c
@@ -27,7 +27,6 @@
#include "xkbcomp.h"
#include "xkballoc.h"
#include "xkbmisc.h"
-#include "tokens.h"
#include "expr.h"
#include "vmod.h"
#include "action.h"
diff --git a/src/xkbcomp/listing.c b/src/xkbcomp/listing.c
index 479af3f..dbedca6 100644
--- a/src/xkbcomp/listing.c
+++ b/src/xkbcomp/listing.c
@@ -120,7 +120,6 @@ SOFTWARE.
#include "xkbpath.h"
#include "parseutils.h"
#include "misc.h"
-#include "tokens.h"
#ifndef DFLT_XKB_CONFIG_ROOT
#define DFLT_XKB_CONFIG_ROOT "/usr/share/X11/xkb"
diff --git a/src/xkbcomp/misc.c b/src/xkbcomp/misc.c
index e538bab..35f947c 100644
--- a/src/xkbcomp/misc.c
+++ b/src/xkbcomp/misc.c
@@ -28,7 +28,6 @@
#include "xkballoc.h"
#include "xkbmisc.h"
#include "xkbpath.h"
-#include "tokens.h"
#include "keycodes.h"
#include "misc.h"
#include <X11/keysym.h>
diff --git a/src/xkbcomp/parseutils.h b/src/xkbcomp/parseutils.h
index dbaf683..64d01e0 100644
--- a/src/xkbcomp/parseutils.h
+++ b/src/xkbcomp/parseutils.h
@@ -198,7 +198,6 @@ extern void setScanState(char * /* file */ ,
int /* line */
);
-extern FILE *yyin;
extern const char *yystring;
#endif /* XKBPARSE_H */
diff --git a/src/xkbcomp/symbols.c b/src/xkbcomp/symbols.c
index f646e76..d82ec2e 100644
--- a/src/xkbcomp/symbols.c
+++ b/src/xkbcomp/symbols.c
@@ -27,7 +27,6 @@
#include "xkbcomp.h"
#include "xkballoc.h"
#include "xkbmisc.h"
-#include "tokens.h"
#include "expr.h"
#include "parseutils.h"
diff --git a/src/xkbcomp/tokens.h b/src/xkbcomp/tokens.h
deleted file mode 100644
index c936c01..0000000
--- a/src/xkbcomp/tokens.h
+++ /dev/null
@@ -1,105 +0,0 @@
-/************************************************************
- 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.
-
- ********************************************************/
-#ifndef TOKENS_H
-#define TOKENS_H 1
-
-#include <stdint.h>
-
-#define END_OF_FILE 0
-#define ERROR_TOK 255
-
-#define XKB_KEYMAP 1
-#define XKB_KEYCODES 2
-#define XKB_TYPES 3
-#define XKB_SYMBOLS 4
-#define XKB_COMPATMAP 5
-#define XKB_GEOMETRY 6
-#define XKB_SEMANTICS 7
-#define XKB_LAYOUT 8
-
-#define INCLUDE 10
-#define OVERRIDE 11
-#define AUGMENT 12
-#define REPLACE 13
-#define ALTERNATE 14
-
-#define VIRTUAL_MODS 20
-#define TYPE 21
-#define INTERPRET 22
-#define ACTION_TOK 23
-#define KEY 24
-#define ALIAS 25
-#define GROUP 26
-#define MODIFIER_MAP 27
-#define INDICATOR 28
-#define SHAPE 29
-#define KEYS 30
-#define ROW 31
-#define SECTION 32
-#define OVERLAY 33
-#define TEXT 34
-#define OUTLINE 35
-#define SOLID 36
-#define LOGO 37
-#define VIRTUAL 38
-
-#define EQUALS 40
-#define PLUS 41
-#define MINUS 42
-#define DIVIDE 43
-#define TIMES 44
-#define OBRACE 45
-#define CBRACE 46
-#define OPAREN 47
-#define CPAREN 48
-#define OBRACKET 49
-#define CBRACKET 50
-#define DOT 51
-#define COMMA 52
-#define SEMI 53
-#define EXCLAM 54
-#define INVERT 55
-
-#define STRING 60
-#define INTEGER 61
-#define FLOAT 62
-#define IDENT 63
-#define KEYNAME 64
-
-#define PARTIAL 70
-#define DEFAULT 71
-#define HIDDEN 72
-#define ALPHANUMERIC_KEYS 73
-#define MODIFIER_KEYS 74
-#define KEYPAD_KEYS 75
-#define FUNCTION_KEYS 76
-#define ALTERNATE_GROUP 77
-
-extern uint32_t tok_ONE_LEVEL;
-extern uint32_t tok_TWO_LEVEL;
-extern uint32_t tok_KEYPAD;
-
-#endif
diff --git a/src/xkbcomp/vmod.c b/src/xkbcomp/vmod.c
index 4ea022a..d4f243b 100644
--- a/src/xkbcomp/vmod.c
+++ b/src/xkbcomp/vmod.c
@@ -29,7 +29,6 @@
#include "xkbcomp.h"
#include "xkballoc.h"
#include "xkbmisc.h"
-#include "tokens.h"
#include "expr.h"
#include "misc.h"
diff --git a/src/xkbcomp/xkbscan.l b/src/xkbcomp/xkbscan.l
index d32cf39..3c98131 100644
--- a/src/xkbcomp/xkbscan.l
+++ b/src/xkbcomp/xkbscan.l
@@ -30,9 +30,9 @@
#include <ctype.h>
#include <X11/Xos.h>
-#include "tokens.h"
-#include "utils.h"
#include "parseutils.h"
+#include "xkbparse.h"
+#include "utils.h"
const char *yystring;
char *scanFile = NULL;
--
1.7.9.2
_______________________________________________
xorg-devel@lists.x.org: X.Org development
Archives: http://lists.x.org/archives/xorg-devel
Info: http://lists.x.org/mailman/listinfo/xorg-devel
