Level compiler now croaks if two maps have the same name.

git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/trunk@957 c06c8d41-db1a-0410-9941-cceddc491573

1 files changed, 166 insertions, 56 deletions

diff --git a/crawl-ref/source/prebuilt/levcomp.tab.h b/crawl-ref/source/prebuilt/levcomp.tab.h
index d875786253..af323539c5 100644
--- a/crawl-ref/source/prebuilt/levcomp.tab.h
+++ b/crawl-ref/source/prebuilt/levcomp.tab.h
@@ -1,61 +1,171 @@
-typedef union
+/* A Bison parser, made by GNU Bison 2.3.  */
+
+/* Skeleton interface for Bison's Yacc-like parsers in C
+
+   Copyright (C) 1984, 1989, 1990, 2000, 2001, 2002, 2003, 2004, 2005, 2006
+   Free Software Foundation, Inc.
+
+   This program is free software; you can redistribute it and/or modify
+   it under the terms of the GNU General Public License as published by
+   the Free Software Foundation; either version 2, or (at your option)
+   any later version.
+
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License for more details.
+
+   You should have received a copy of the GNU General Public License
+   along with this program; if not, write to the Free Software
+   Foundation, Inc., 51 Franklin Street, Fifth Floor,
+   Boston, MA 02110-1301, USA.  */
+
+/* As a special exception, you may create a larger work that contains
+   part or all of the Bison parser skeleton and distribute that work
+   under terms of your choice, so long as that work isn't itself a
+   parser generator using the skeleton or a modified version thereof
+   as a parser skeleton.  Alternatively, if you modify or redistribute
+   the parser skeleton itself, you may (at your option) remove this
+   special exception, which will cause the skeleton and the resulting
+   Bison output files to be licensed under the GNU General Public
+   License without this special exception.
+
+   This special exception was added by the Free Software Foundation in
+   version 2.2 of Bison.  */
+
+/* Tokens.  */
+#ifndef YYTOKENTYPE
+# define YYTOKENTYPE
+   /* Put the tokens into the symbol table, so that GDB and other debuggers
+      know about them.  */
+   enum yytokentype {
+     BRANCHDEF = 258,
+     BRANCH = 259,
+     DESC = 260,
+     DEFAULT = 261,
+     DEFAULT_DEPTH = 262,
+     SHUFFLE = 263,
+     SUBST = 264,
+     TAGS = 265,
+     NAME = 266,
+     DEPTH = 267,
+     ORIENT = 268,
+     PLACE = 269,
+     CHANCE = 270,
+     FLAGS = 271,
+     MONS = 272,
+     ITEM = 273,
+     ROOT_DEPTH = 274,
+     ENTRY_MSG = 275,
+     EXIT_MSG = 276,
+     ROCK_COLOUR = 277,
+     FLOOR_COLOUR = 278,
+     ENCOMPASS = 279,
+     FLOAT = 280,
+     NORTH = 281,
+     EAST = 282,
+     SOUTH = 283,
+     WEST = 284,
+     NORTHEAST = 285,
+     SOUTHEAST = 286,
+     SOUTHWEST = 287,
+     NORTHWEST = 288,
+     LEVEL = 289,
+     END = 290,
+     PVAULT = 291,
+     PMINIVAULT = 292,
+     MONSTERS = 293,
+     ENDMONSTERS = 294,
+     CHARACTER = 295,
+     NO_HMIRROR = 296,
+     NO_VMIRROR = 297,
+     NO_ROTATE = 298,
+     PANDEMONIC = 299,
+     DASH = 300,
+     COMMA = 301,
+     QUOTE = 302,
+     OPAREN = 303,
+     CPAREN = 304,
+     INTEGER = 305,
+     STRING = 306,
+     MAP_LINE = 307,
+     MONSTER_NAME = 308,
+     ITEM_INFO = 309,
+     IDENTIFIER = 310
+   };
+#endif
+/* Tokens.  */
+#define BRANCHDEF 258
+#define BRANCH 259
+#define DESC 260
+#define DEFAULT 261
+#define DEFAULT_DEPTH 262
+#define SHUFFLE 263
+#define SUBST 264
+#define TAGS 265
+#define NAME 266
+#define DEPTH 267
+#define ORIENT 268
+#define PLACE 269
+#define CHANCE 270
+#define FLAGS 271
+#define MONS 272
+#define ITEM 273
+#define ROOT_DEPTH 274
+#define ENTRY_MSG 275
+#define EXIT_MSG 276
+#define ROCK_COLOUR 277
+#define FLOOR_COLOUR 278
+#define ENCOMPASS 279
+#define FLOAT 280
+#define NORTH 281
+#define EAST 282
+#define SOUTH 283
+#define WEST 284
+#define NORTHEAST 285
+#define SOUTHEAST 286
+#define SOUTHWEST 287
+#define NORTHWEST 288
+#define LEVEL 289
+#define END 290
+#define PVAULT 291
+#define PMINIVAULT 292
+#define MONSTERS 293
+#define ENDMONSTERS 294
+#define CHARACTER 295
+#define NO_HMIRROR 296
+#define NO_VMIRROR 297
+#define NO_ROTATE 298
+#define PANDEMONIC 299
+#define DASH 300
+#define COMMA 301
+#define QUOTE 302
+#define OPAREN 303
+#define CPAREN 304
+#define INTEGER 305
+#define STRING 306
+#define MAP_LINE 307
+#define MONSTER_NAME 308
+#define ITEM_INFO 309
+#define IDENTIFIER 310
+
+
+
+
+#if ! defined YYSTYPE && ! defined YYSTYPE_IS_DECLARED
+typedef union YYSTYPE
+#line 38 "levcomp.ypp"
 {
     int i;
     const char *text;
-} YYSTYPE;
-#define	BRANCHDEF	257
-#define	BRANCH	258
-#define	DESC	259
-#define	DEFAULT	260
-#define	DEFAULT_DEPTH	261
-#define	SYMBOL	262
-#define	TAGS	263
-#define	SHUFFLE	264
-#define	NAME	265
-#define	DEPTH	266
-#define	ORIENT	267
-#define	PLACE	268
-#define	CHANCE	269
-#define	FLAGS	270
-#define	MONS	271
-#define	ITEM	272
-#define	ROOT_DEPTH	273
-#define	ENTRY_MSG	274
-#define	EXIT_MSG	275
-#define	ROCK_COLOUR	276
-#define	FLOOR_COLOUR	277
-#define	ENCOMPASS	278
-#define	FLOAT	279
-#define	NORTH	280
-#define	EAST	281
-#define	SOUTH	282
-#define	WEST	283
-#define	NORTHEAST	284
-#define	SOUTHEAST	285
-#define	SOUTHWEST	286
-#define	NORTHWEST	287
-#define	LEVEL	288
-#define	END	289
-#define	PVAULT	290
-#define	PMINIVAULT	291
-#define	MONSTERS	292
-#define	ENDMONSTERS	293
-#define	CHARACTER	294
-#define	NO_HMIRROR	295
-#define	NO_VMIRROR	296
-#define	NO_ROTATE	297
-#define	PANDEMONIC	298
-#define	DASH	299
-#define	COMMA	300
-#define	QUOTE	301
-#define	OPAREN	302
-#define	CPAREN	303
-#define	INTEGER	304
-#define	STRING	305
-#define	MAP_LINE	306
-#define	MONSTER_NAME	307
-#define	ITEM_INFO	308
-#define	IDENTIFIER	309
-
+}
+/* Line 1529 of yacc.c.  */
+#line 164 "levcomp.tab.h"
+	YYSTYPE;
+# define yystype YYSTYPE /* obsolescent; will be withdrawn */
+# define YYSTYPE_IS_DECLARED 1
+# define YYSTYPE_IS_TRIVIAL 1
+#endif
 
 extern YYSTYPE yylval;
+