diff options
author | Manoj Srivastava <srivasta@debian.org> | 2016-07-31 15:00:12 -0700 |
---|---|---|
committer | Manoj Srivastava <srivasta@debian.org> | 2016-07-31 15:00:12 -0700 |
commit | dc20a68ba953b2a5da0311f3ce9f9217f9ad60b3 (patch) | |
tree | e45fdd69828a8668029d07f8601442cbb9258559 /src/parse.h | |
parent | e68e1da425634fda40095a7b3196d4175f782987 (diff) | |
parent | 487177cbb85bc4e88e468c71b27569054b8df090 (diff) |
Merge branch 'upstream'
Signed-off-by: Manoj Srivastava <srivasta@debian.org>
# Conflicts:
# src/buf.c
# src/flex.skl
# src/skel.c
Diffstat (limited to 'src/parse.h')
-rw-r--r-- | src/parse.h | 28 |
1 files changed, 14 insertions, 14 deletions
diff --git a/src/parse.h b/src/parse.h index 033f919..8d35287 100644 --- a/src/parse.h +++ b/src/parse.h @@ -53,13 +53,13 @@ extern int yydebug; NAME = 263, PREVCCL = 264, EOF_OP = 265, - OPTION_OP = 266, - OPT_OUTFILE = 267, - OPT_PREFIX = 268, - OPT_YYCLASS = 269, - OPT_HEADER = 270, - OPT_EXTRA_TYPE = 271, - OPT_TABLES = 272, + TOK_OPTION = 266, + TOK_OUTFILE = 267, + TOK_PREFIX = 268, + TOK_YYCLASS = 269, + TOK_HEADER_FILE = 270, + TOK_EXTRA_TYPE = 271, + TOK_TABLES_FILE = 272, CCE_ALNUM = 273, CCE_ALPHA = 274, CCE_BLANK = 275, @@ -101,13 +101,13 @@ extern int yydebug; #define NAME 263 #define PREVCCL 264 #define EOF_OP 265 -#define OPTION_OP 266 -#define OPT_OUTFILE 267 -#define OPT_PREFIX 268 -#define OPT_YYCLASS 269 -#define OPT_HEADER 270 -#define OPT_EXTRA_TYPE 271 -#define OPT_TABLES 272 +#define TOK_OPTION 266 +#define TOK_OUTFILE 267 +#define TOK_PREFIX 268 +#define TOK_YYCLASS 269 +#define TOK_HEADER_FILE 270 +#define TOK_EXTRA_TYPE 271 +#define TOK_TABLES_FILE 272 #define CCE_ALNUM 273 #define CCE_ALPHA 274 #define CCE_BLANK 275 |