nethack-gwaa-kiwi/nethack
1
0
Fork 0
Code Pull Requests Activity

New precompiled versions of these

Browse Source
This commit is contained in:
Derek S. Ray
2015-05-26 22:54:55 -04:00
parent 5f02b15a75
commit a65c568e49
6 changed files with 1359 additions and 1667 deletions
Download Patch File Download Diff File Expand all files Collapse all files
sys/share/dgn_comp.h
+45 -35
View File
@@ -32,34 +32,35 @@
This special exception was added by the Free Software Foundation in This special exception was added by the Free Software Foundation in
version 2.2 of Bison. */ version 2.2 of Bison. */
/* Tokens. */ /* Tokens. */
#ifndef YYTOKENTYPE #ifndef YYTOKENTYPE
#define YYTOKENTYPE # define YYTOKENTYPE
/* Put the tokens into the symbol table, so that GDB and other debuggers /* Put the tokens into the symbol table, so that GDB and other debuggers
know about them. */ know about them. */
enum yytokentype { enum yytokentype {
INTEGER = 258, INTEGER = 258,
A_DUNGEON = 259, A_DUNGEON = 259,
BRANCH = 260, BRANCH = 260,
CHBRANCH = 261, CHBRANCH = 261,
LEVEL = 262, LEVEL = 262,
RNDLEVEL = 263, RNDLEVEL = 263,
CHLEVEL = 264, CHLEVEL = 264,
RNDCHLEVEL = 265, RNDCHLEVEL = 265,
UP_OR_DOWN = 266, UP_OR_DOWN = 266,
PROTOFILE = 267, PROTOFILE = 267,
DESCRIPTION = 268, DESCRIPTION = 268,
DESCRIPTOR = 269, DESCRIPTOR = 269,
LEVELDESC = 270, LEVELDESC = 270,
ALIGNMENT = 271, ALIGNMENT = 271,
LEVALIGN = 272, LEVALIGN = 272,
ENTRY = 273, ENTRY = 273,
STAIR = 274, STAIR = 274,
NO_UP = 275, NO_UP = 275,
NO_DOWN = 276, NO_DOWN = 276,
PORTAL = 277, PORTAL = 277,
STRING = 278 STRING = 278
}; };
#endif #endif
/* Tokens. */ /* Tokens. */
#define INTEGER 258 #define INTEGER 258
@@ -84,20 +85,29 @@ enum yytokentype {
#define PORTAL 277 #define PORTAL 277
#define STRING 278 #define STRING 278
#if !defined YYSTYPE && !defined YYSTYPE_IS_DECLARED
typedef union YYSTYPE {
/* Line 1676 of yacc.c */
#line 69 "dgn_comp.y"
int i;
char *str;
#if ! defined YYSTYPE && ! defined YYSTYPE_IS_DECLARED
typedef union YYSTYPE
{
/* Line 1676 of yacc.c */
#line 67 "dgn_comp.y"
int i;
char* str;
/* Line 1676 of yacc.c */ /* Line 1676 of yacc.c */
#line 105 "y.tab.h" #line 105 "y.tab.h"
} YYSTYPE; } YYSTYPE;
#define YYSTYPE_IS_TRIVIAL 1 # define YYSTYPE_IS_TRIVIAL 1
#define yystype YYSTYPE /* obsolescent; will be withdrawn */ # define yystype YYSTYPE /* obsolescent; will be withdrawn */
#define YYSTYPE_IS_DECLARED 1 # define YYSTYPE_IS_DECLARED 1
#endif #endif
extern YYSTYPE yylval; extern YYSTYPE yylval;
sys/share/dgn_lex.c
+41 -41
View File
@@ -483,7 +483,7 @@ char *yytext;
#line 1 "dgn_comp.l" #line 1 "dgn_comp.l"
#define INITIAL 0 #define INITIAL 0
#line 2 "dgn_comp.l" #line 2 "dgn_comp.l"
/* NetHack 3.6 dgn_comp.l $NHDT-Date: 1432512788 2015/05/25 00:13:08 $ $NHDT-Branch: master $:$NHDT-Revision: 1.12 $ */ /* NetHack 3.6 dgn_comp.l $NHDT-Date: 1432512785 2015/05/25 00:13:05 $ $NHDT-Branch: master $:$NHDT-Revision: 1.10 $ */
/* Copyright (c) 1989 by Jean-Christophe Collet */ /* Copyright (c) 1989 by Jean-Christophe Collet */
/* Copyright (c) 1990 by M. Stephenson */ /* Copyright (c) 1990 by M. Stephenson */
/* NetHack may be freely redistributed. See license for details. */ /* NetHack may be freely redistributed. See license for details. */
@@ -559,7 +559,7 @@ extern YYSTYPE yylval;
int nh_line_number = 1; int nh_line_number = 1;
#line 565 "lex.yy.c" #line 563 "lex.yy.c"
/* Macros after this point can all be overridden by user definitions in /* Macros after this point can all be overridden by user definitions in
* section 1. * section 1.
@@ -713,9 +713,9 @@ YY_DECL
register char *yy_cp, *yy_bp; register char *yy_cp, *yy_bp;
register int yy_act; register int yy_act;
#line 81 "dgn_comp.l" #line 79 "dgn_comp.l"
#line 721 "lex.yy.c" #line 719 "lex.yy.c"
if ( yy_init ) if ( yy_init )
{ {
@@ -801,152 +801,152 @@ do_action: /* This label is used only to access EOF actions. */
case 1: case 1:
YY_RULE_SETUP YY_RULE_SETUP
#line 82 "dgn_comp.l" #line 80 "dgn_comp.l"
return(A_DUNGEON); return(A_DUNGEON);
YY_BREAK YY_BREAK
case 2: case 2:
YY_RULE_SETUP YY_RULE_SETUP
#line 83 "dgn_comp.l" #line 81 "dgn_comp.l"
{ yylval.i=1; return(UP_OR_DOWN); } { yylval.i=1; return(UP_OR_DOWN); }
YY_BREAK YY_BREAK
case 3: case 3:
YY_RULE_SETUP YY_RULE_SETUP
#line 84 "dgn_comp.l" #line 82 "dgn_comp.l"
{ yylval.i=0; return(UP_OR_DOWN); } { yylval.i=0; return(UP_OR_DOWN); }
YY_BREAK YY_BREAK
case 4: case 4:
YY_RULE_SETUP YY_RULE_SETUP
#line 85 "dgn_comp.l" #line 83 "dgn_comp.l"
return(ENTRY); return(ENTRY);
YY_BREAK YY_BREAK
case 5: case 5:
YY_RULE_SETUP YY_RULE_SETUP
#line 86 "dgn_comp.l" #line 84 "dgn_comp.l"
return(STAIR); return(STAIR);
YY_BREAK YY_BREAK
case 6: case 6:
YY_RULE_SETUP YY_RULE_SETUP
#line 87 "dgn_comp.l" #line 85 "dgn_comp.l"
return(NO_UP); return(NO_UP);
YY_BREAK YY_BREAK
case 7: case 7:
YY_RULE_SETUP YY_RULE_SETUP
#line 88 "dgn_comp.l" #line 86 "dgn_comp.l"
return(NO_DOWN); return(NO_DOWN);
YY_BREAK YY_BREAK
case 8: case 8:
YY_RULE_SETUP YY_RULE_SETUP
#line 89 "dgn_comp.l" #line 87 "dgn_comp.l"
return(PORTAL); return(PORTAL);
YY_BREAK YY_BREAK
case 9: case 9:
YY_RULE_SETUP YY_RULE_SETUP
#line 90 "dgn_comp.l" #line 88 "dgn_comp.l"
return(PROTOFILE); return(PROTOFILE);
YY_BREAK YY_BREAK
case 10: case 10:
YY_RULE_SETUP YY_RULE_SETUP
#line 91 "dgn_comp.l" #line 89 "dgn_comp.l"
return(DESCRIPTION); return(DESCRIPTION);
YY_BREAK YY_BREAK
case 11: case 11:
YY_RULE_SETUP YY_RULE_SETUP
#line 92 "dgn_comp.l" #line 90 "dgn_comp.l"
return(LEVELDESC); return(LEVELDESC);
YY_BREAK YY_BREAK
case 12: case 12:
YY_RULE_SETUP YY_RULE_SETUP
#line 93 "dgn_comp.l" #line 91 "dgn_comp.l"
return(ALIGNMENT); return(ALIGNMENT);
YY_BREAK YY_BREAK
case 13: case 13:
YY_RULE_SETUP YY_RULE_SETUP
#line 94 "dgn_comp.l" #line 92 "dgn_comp.l"
return(LEVALIGN); return(LEVALIGN);
YY_BREAK YY_BREAK
case 14: case 14:
YY_RULE_SETUP YY_RULE_SETUP
#line 95 "dgn_comp.l" #line 93 "dgn_comp.l"
{ yylval.i=TOWN ; return(DESCRIPTOR); } { yylval.i=TOWN ; return(DESCRIPTOR); }
YY_BREAK YY_BREAK
case 15: case 15:
YY_RULE_SETUP YY_RULE_SETUP
#line 96 "dgn_comp.l" #line 94 "dgn_comp.l"
{ yylval.i=HELLISH ; return(DESCRIPTOR); } { yylval.i=HELLISH ; return(DESCRIPTOR); }
YY_BREAK YY_BREAK
case 16: case 16:
YY_RULE_SETUP YY_RULE_SETUP
#line 97 "dgn_comp.l" #line 95 "dgn_comp.l"
{ yylval.i=MAZELIKE ; return(DESCRIPTOR); } { yylval.i=MAZELIKE ; return(DESCRIPTOR); }
YY_BREAK YY_BREAK
case 17: case 17:
YY_RULE_SETUP YY_RULE_SETUP
#line 98 "dgn_comp.l" #line 96 "dgn_comp.l"
{ yylval.i=ROGUELIKE ; return(DESCRIPTOR); } { yylval.i=ROGUELIKE ; return(DESCRIPTOR); }
YY_BREAK YY_BREAK
case 18: case 18:
YY_RULE_SETUP YY_RULE_SETUP
#line 99 "dgn_comp.l" #line 97 "dgn_comp.l"
{ yylval.i=D_ALIGN_NONE ; return(DESCRIPTOR); } { yylval.i=D_ALIGN_NONE ; return(DESCRIPTOR); }
YY_BREAK YY_BREAK
case 19: case 19:
YY_RULE_SETUP YY_RULE_SETUP
#line 100 "dgn_comp.l" #line 98 "dgn_comp.l"
{ yylval.i=D_ALIGN_NONE ; return(DESCRIPTOR); } { yylval.i=D_ALIGN_NONE ; return(DESCRIPTOR); }
YY_BREAK YY_BREAK
case 20: case 20:
YY_RULE_SETUP YY_RULE_SETUP
#line 101 "dgn_comp.l" #line 99 "dgn_comp.l"
{ yylval.i=D_ALIGN_LAWFUL ; return(DESCRIPTOR); } { yylval.i=D_ALIGN_LAWFUL ; return(DESCRIPTOR); }
YY_BREAK YY_BREAK
case 21: case 21:
YY_RULE_SETUP YY_RULE_SETUP
#line 102 "dgn_comp.l" #line 100 "dgn_comp.l"
{ yylval.i=D_ALIGN_NEUTRAL ; return(DESCRIPTOR); } { yylval.i=D_ALIGN_NEUTRAL ; return(DESCRIPTOR); }
YY_BREAK YY_BREAK
case 22: case 22:
YY_RULE_SETUP YY_RULE_SETUP
#line 103 "dgn_comp.l" #line 101 "dgn_comp.l"
{ yylval.i=D_ALIGN_CHAOTIC ; return(DESCRIPTOR); } { yylval.i=D_ALIGN_CHAOTIC ; return(DESCRIPTOR); }
YY_BREAK YY_BREAK
case 23: case 23:
YY_RULE_SETUP YY_RULE_SETUP
#line 104 "dgn_comp.l" #line 102 "dgn_comp.l"
return(BRANCH); return(BRANCH);
YY_BREAK YY_BREAK
case 24: case 24:
YY_RULE_SETUP YY_RULE_SETUP
#line 105 "dgn_comp.l" #line 103 "dgn_comp.l"
return(CHBRANCH); return(CHBRANCH);
YY_BREAK YY_BREAK
case 25: case 25:
YY_RULE_SETUP YY_RULE_SETUP
#line 106 "dgn_comp.l" #line 104 "dgn_comp.l"
return(LEVEL); return(LEVEL);
YY_BREAK YY_BREAK
case 26: case 26:
YY_RULE_SETUP YY_RULE_SETUP
#line 107 "dgn_comp.l" #line 105 "dgn_comp.l"
return(RNDLEVEL); return(RNDLEVEL);
YY_BREAK YY_BREAK
case 27: case 27:
YY_RULE_SETUP YY_RULE_SETUP
#line 108 "dgn_comp.l" #line 106 "dgn_comp.l"
return(CHLEVEL); return(CHLEVEL);
YY_BREAK YY_BREAK
case 28: case 28:
YY_RULE_SETUP YY_RULE_SETUP
#line 109 "dgn_comp.l" #line 107 "dgn_comp.l"
return(RNDCHLEVEL); return(RNDCHLEVEL);
YY_BREAK YY_BREAK
case 29: case 29:
YY_RULE_SETUP YY_RULE_SETUP
#line 110 "dgn_comp.l" #line 108 "dgn_comp.l"
{ yylval.i=atoi(yytext); return(INTEGER); } { yylval.i=atoi(yytext); return(INTEGER); }
YY_BREAK YY_BREAK
case 30: case 30:
YY_RULE_SETUP YY_RULE_SETUP
#line 111 "dgn_comp.l" #line 109 "dgn_comp.l"
{ yytext[yyleng-1] = 0; /* Discard the trailing \" */ { yytext[yyleng-1] = 0; /* Discard the trailing \" */
yylval.str = (char *) alloc(strlen(yytext+1)+1); yylval.str = (char *) alloc(strlen(yytext+1)+1);
Strcpy(yylval.str, yytext+1); /* Discard the first \" */ Strcpy(yylval.str, yytext+1); /* Discard the first \" */
@@ -954,30 +954,30 @@ YY_RULE_SETUP
YY_BREAK YY_BREAK
case 31: case 31:
YY_RULE_SETUP YY_RULE_SETUP
#line 115 "dgn_comp.l" #line 113 "dgn_comp.l"
{ nh_line_number++; } { nh_line_number++; }
YY_BREAK YY_BREAK
case 32: case 32:
YY_RULE_SETUP YY_RULE_SETUP
#line 116 "dgn_comp.l" #line 114 "dgn_comp.l"
{ nh_line_number++; } { nh_line_number++; }
YY_BREAK YY_BREAK
case 33: case 33:
YY_RULE_SETUP YY_RULE_SETUP
#line 117 "dgn_comp.l" #line 115 "dgn_comp.l"
; /* skip trailing tabs & spaces */ ; /* skip trailing tabs & spaces */
YY_BREAK YY_BREAK
case 34: case 34:
YY_RULE_SETUP YY_RULE_SETUP
#line 118 "dgn_comp.l" #line 116 "dgn_comp.l"
{ return yytext[0]; } { return yytext[0]; }
YY_BREAK YY_BREAK
case 35: case 35:
YY_RULE_SETUP YY_RULE_SETUP
#line 119 "dgn_comp.l" #line 117 "dgn_comp.l"
ECHO; ECHO;
YY_BREAK YY_BREAK
#line 983 "lex.yy.c" #line 981 "lex.yy.c"
case YY_STATE_EOF(INITIAL): case YY_STATE_EOF(INITIAL):
yyterminate(); yyterminate();
@@ -1865,7 +1865,7 @@ int main()
return 0; return 0;
} }
#endif #endif
#line 119 "dgn_comp.l" #line 117 "dgn_comp.l"
/* routine to switch to another input file; needed for flex */ /* routine to switch to another input file; needed for flex */
sys/share/dgn_yacc.c
+42 -42
View File
@@ -70,7 +70,7 @@
/* Line 189 of yacc.c */ /* Line 189 of yacc.c */
#line 1 "dgn_comp.y" #line 1 "dgn_comp.y"
/* NetHack 3.6 dgn_comp.y $NHDT-Date: 1432512787 2015/05/25 00:13:07 $ $NHDT-Branch: master $:$NHDT-Revision: 1.8 $ */ /* NetHack 3.6 dgn_comp.y $NHDT-Date: 1432512785 2015/05/25 00:13:05 $ $NHDT-Branch: master $:$NHDT-Revision: 1.8 $ */
/* Copyright (c) 1989 by Jean-Christophe Collet */ /* Copyright (c) 1989 by Jean-Christophe Collet */
/* Copyright (c) 1990 by M. Stephenson */ /* Copyright (c) 1990 by M. Stephenson */
/* NetHack may be freely redistributed. See license for details. */ /* NetHack may be freely redistributed. See license for details. */
@@ -135,7 +135,7 @@ extern FILE *yyin, *yyout; /* from dgn_lex.c */
/* Line 189 of yacc.c */ /* Line 189 of yacc.c */
#line 141 "y.tab.c" #line 139 "y.tab.c"
/* Enabling traces. */ /* Enabling traces. */
#ifndef YYDEBUG #ifndef YYDEBUG
@@ -216,7 +216,7 @@ typedef union YYSTYPE
{ {
/* Line 214 of yacc.c */ /* Line 214 of yacc.c */
#line 69 "dgn_comp.y" #line 67 "dgn_comp.y"
int i; int i;
char* str; char* str;
@@ -224,7 +224,7 @@ typedef union YYSTYPE
/* Line 214 of yacc.c */ /* Line 214 of yacc.c */
#line 230 "y.tab.c" #line 228 "y.tab.c"
} YYSTYPE; } YYSTYPE;
# define YYSTYPE_IS_TRIVIAL 1 # define YYSTYPE_IS_TRIVIAL 1
# define yystype YYSTYPE /* obsolescent; will be withdrawn */ # define yystype YYSTYPE /* obsolescent; will be withdrawn */
@@ -236,7 +236,7 @@ typedef union YYSTYPE
/* Line 264 of yacc.c */ /* Line 264 of yacc.c */
#line 242 "y.tab.c" #line 240 "y.tab.c"
#ifdef short #ifdef short
# undef short # undef short
@@ -541,11 +541,11 @@ static const yytype_int8 yyrhs[] =
/* YYRLINE[YYN] -- source line where rule number YYN was defined. */ /* YYRLINE[YYN] -- source line where rule number YYN was defined. */
static const yytype_uint16 yyrline[] = static const yytype_uint16 yyrline[] =
{ {
0, 83, 83, 84, 90, 91, 94, 95, 96, 97, 0, 81, 81, 82, 88, 89, 92, 93, 94, 95,
100, 113, 116, 122, 123, 124, 127, 133, 136, 143, 98, 111, 114, 120, 121, 122, 125, 131, 134, 141,
152, 159, 160, 161, 162, 163, 166, 176, 189, 200, 150, 157, 158, 159, 160, 161, 164, 174, 187, 198,
214, 221, 230, 243, 259, 273, 290, 291, 294, 308, 212, 219, 228, 241, 257, 271, 288, 289, 292, 306,
325, 328, 332, 336, 340, 347, 350, 356, 386, 423 323, 326, 330, 334, 338, 345, 348, 354, 384, 421
}; };
#endif #endif
@@ -1508,7 +1508,7 @@ yyreduce:
case 3: case 3:
/* Line 1455 of yacc.c */ /* Line 1455 of yacc.c */
#line 85 "dgn_comp.y" #line 83 "dgn_comp.y"
{ {
output_dgn(); output_dgn();
} }
@@ -1517,7 +1517,7 @@ yyreduce:
case 10: case 10:
/* Line 1455 of yacc.c */ /* Line 1455 of yacc.c */
#line 101 "dgn_comp.y" #line 99 "dgn_comp.y"
{ {
init_dungeon(); init_dungeon();
Strcpy(tmpdungeon[n_dgns].name, (yyvsp[(3) - (6)].str)); Strcpy(tmpdungeon[n_dgns].name, (yyvsp[(3) - (6)].str));
@@ -1532,7 +1532,7 @@ yyreduce:
case 11: case 11:
/* Line 1455 of yacc.c */ /* Line 1455 of yacc.c */
#line 113 "dgn_comp.y" #line 111 "dgn_comp.y"
{ {
(yyval.i) = 0; (yyval.i) = 0;
} }
@@ -1541,7 +1541,7 @@ yyreduce:
case 12: case 12:
/* Line 1455 of yacc.c */ /* Line 1455 of yacc.c */
#line 117 "dgn_comp.y" #line 115 "dgn_comp.y"
{ {
(yyval.i) = (yyvsp[(1) - (1)].i); (yyval.i) = (yyvsp[(1) - (1)].i);
} }
@@ -1550,7 +1550,7 @@ yyreduce:
case 16: case 16:
/* Line 1455 of yacc.c */ /* Line 1455 of yacc.c */
#line 128 "dgn_comp.y" #line 126 "dgn_comp.y"
{ {
tmpdungeon[n_dgns].entry_lev = (yyvsp[(3) - (3)].i); tmpdungeon[n_dgns].entry_lev = (yyvsp[(3) - (3)].i);
} }
@@ -1559,7 +1559,7 @@ yyreduce:
case 18: case 18:
/* Line 1455 of yacc.c */ /* Line 1455 of yacc.c */
#line 137 "dgn_comp.y" #line 135 "dgn_comp.y"
{ {
if((yyvsp[(3) - (3)].i) <= TOWN || (yyvsp[(3) - (3)].i) >= D_ALIGN_CHAOTIC) if((yyvsp[(3) - (3)].i) <= TOWN || (yyvsp[(3) - (3)].i) >= D_ALIGN_CHAOTIC)
yyerror("Illegal description - ignoring!"); yyerror("Illegal description - ignoring!");
@@ -1571,7 +1571,7 @@ yyreduce:
case 19: case 19:
/* Line 1455 of yacc.c */ /* Line 1455 of yacc.c */
#line 144 "dgn_comp.y" #line 142 "dgn_comp.y"
{ {
if((yyvsp[(3) - (3)].i) && (yyvsp[(3) - (3)].i) < D_ALIGN_CHAOTIC) if((yyvsp[(3) - (3)].i) && (yyvsp[(3) - (3)].i) < D_ALIGN_CHAOTIC)
yyerror("Illegal alignment - ignoring!"); yyerror("Illegal alignment - ignoring!");
@@ -1583,7 +1583,7 @@ yyreduce:
case 20: case 20:
/* Line 1455 of yacc.c */ /* Line 1455 of yacc.c */
#line 153 "dgn_comp.y" #line 151 "dgn_comp.y"
{ {
Strcpy(tmpdungeon[n_dgns].protoname, (yyvsp[(3) - (3)].str)); Strcpy(tmpdungeon[n_dgns].protoname, (yyvsp[(3) - (3)].str));
Free((yyvsp[(3) - (3)].str)); Free((yyvsp[(3) - (3)].str));
@@ -1593,7 +1593,7 @@ yyreduce:
case 26: case 26:
/* Line 1455 of yacc.c */ /* Line 1455 of yacc.c */
#line 167 "dgn_comp.y" #line 165 "dgn_comp.y"
{ {
init_level(); init_level();
Strcpy(tmplevel[n_levs].name, (yyvsp[(3) - (6)].str)); Strcpy(tmplevel[n_levs].name, (yyvsp[(3) - (6)].str));
@@ -1608,7 +1608,7 @@ yyreduce:
case 27: case 27:
/* Line 1455 of yacc.c */ /* Line 1455 of yacc.c */
#line 177 "dgn_comp.y" #line 175 "dgn_comp.y"
{ {
init_level(); init_level();
Strcpy(tmplevel[n_levs].name, (yyvsp[(3) - (7)].str)); Strcpy(tmplevel[n_levs].name, (yyvsp[(3) - (7)].str));
@@ -1624,7 +1624,7 @@ yyreduce:
case 28: case 28:
/* Line 1455 of yacc.c */ /* Line 1455 of yacc.c */
#line 190 "dgn_comp.y" #line 188 "dgn_comp.y"
{ {
init_level(); init_level();
Strcpy(tmplevel[n_levs].name, (yyvsp[(3) - (7)].str)); Strcpy(tmplevel[n_levs].name, (yyvsp[(3) - (7)].str));
@@ -1640,7 +1640,7 @@ yyreduce:
case 29: case 29:
/* Line 1455 of yacc.c */ /* Line 1455 of yacc.c */
#line 201 "dgn_comp.y" #line 199 "dgn_comp.y"
{ {
init_level(); init_level();
Strcpy(tmplevel[n_levs].name, (yyvsp[(3) - (8)].str)); Strcpy(tmplevel[n_levs].name, (yyvsp[(3) - (8)].str));
@@ -1657,7 +1657,7 @@ yyreduce:
case 30: case 30:
/* Line 1455 of yacc.c */ /* Line 1455 of yacc.c */
#line 215 "dgn_comp.y" #line 213 "dgn_comp.y"
{ {
if((yyvsp[(3) - (3)].i) >= D_ALIGN_CHAOTIC) if((yyvsp[(3) - (3)].i) >= D_ALIGN_CHAOTIC)
yyerror("Illegal description - ignoring!"); yyerror("Illegal description - ignoring!");
@@ -1669,7 +1669,7 @@ yyreduce:
case 31: case 31:
/* Line 1455 of yacc.c */ /* Line 1455 of yacc.c */
#line 222 "dgn_comp.y" #line 220 "dgn_comp.y"
{ {
if((yyvsp[(3) - (3)].i) && (yyvsp[(3) - (3)].i) < D_ALIGN_CHAOTIC) if((yyvsp[(3) - (3)].i) && (yyvsp[(3) - (3)].i) < D_ALIGN_CHAOTIC)
yyerror("Illegal alignment - ignoring!"); yyerror("Illegal alignment - ignoring!");
@@ -1681,7 +1681,7 @@ yyreduce:
case 32: case 32:
/* Line 1455 of yacc.c */ /* Line 1455 of yacc.c */
#line 231 "dgn_comp.y" #line 229 "dgn_comp.y"
{ {
init_level(); init_level();
Strcpy(tmplevel[n_levs].name, (yyvsp[(3) - (7)].str)); Strcpy(tmplevel[n_levs].name, (yyvsp[(3) - (7)].str));
@@ -1699,7 +1699,7 @@ yyreduce:
case 33: case 33:
/* Line 1455 of yacc.c */ /* Line 1455 of yacc.c */
#line 244 "dgn_comp.y" #line 242 "dgn_comp.y"
{ {
init_level(); init_level();
Strcpy(tmplevel[n_levs].name, (yyvsp[(3) - (8)].str)); Strcpy(tmplevel[n_levs].name, (yyvsp[(3) - (8)].str));
@@ -1718,7 +1718,7 @@ yyreduce:
case 34: case 34:
/* Line 1455 of yacc.c */ /* Line 1455 of yacc.c */
#line 260 "dgn_comp.y" #line 258 "dgn_comp.y"
{ {
init_level(); init_level();
Strcpy(tmplevel[n_levs].name, (yyvsp[(3) - (8)].str)); Strcpy(tmplevel[n_levs].name, (yyvsp[(3) - (8)].str));
@@ -1737,7 +1737,7 @@ yyreduce:
case 35: case 35:
/* Line 1455 of yacc.c */ /* Line 1455 of yacc.c */
#line 274 "dgn_comp.y" #line 272 "dgn_comp.y"
{ {
init_level(); init_level();
Strcpy(tmplevel[n_levs].name, (yyvsp[(3) - (9)].str)); Strcpy(tmplevel[n_levs].name, (yyvsp[(3) - (9)].str));
@@ -1757,7 +1757,7 @@ yyreduce:
case 38: case 38:
/* Line 1455 of yacc.c */ /* Line 1455 of yacc.c */
#line 295 "dgn_comp.y" #line 293 "dgn_comp.y"
{ {
init_branch(); init_branch();
Strcpy(tmpbranch[n_brs].name, (yyvsp[(3) - (7)].str)); Strcpy(tmpbranch[n_brs].name, (yyvsp[(3) - (7)].str));
@@ -1774,7 +1774,7 @@ yyreduce:
case 39: case 39:
/* Line 1455 of yacc.c */ /* Line 1455 of yacc.c */
#line 309 "dgn_comp.y" #line 307 "dgn_comp.y"
{ {
init_branch(); init_branch();
Strcpy(tmpbranch[n_brs].name, (yyvsp[(3) - (8)].str)); Strcpy(tmpbranch[n_brs].name, (yyvsp[(3) - (8)].str));
@@ -1793,7 +1793,7 @@ yyreduce:
case 40: case 40:
/* Line 1455 of yacc.c */ /* Line 1455 of yacc.c */
#line 325 "dgn_comp.y" #line 323 "dgn_comp.y"
{ {
(yyval.i) = TBR_STAIR; /* two way stair */ (yyval.i) = TBR_STAIR; /* two way stair */
} }
@@ -1802,7 +1802,7 @@ yyreduce:
case 41: case 41:
/* Line 1455 of yacc.c */ /* Line 1455 of yacc.c */
#line 329 "dgn_comp.y" #line 327 "dgn_comp.y"
{ {
(yyval.i) = TBR_STAIR; /* two way stair */ (yyval.i) = TBR_STAIR; /* two way stair */
} }
@@ -1811,7 +1811,7 @@ yyreduce:
case 42: case 42:
/* Line 1455 of yacc.c */ /* Line 1455 of yacc.c */
#line 333 "dgn_comp.y" #line 331 "dgn_comp.y"
{ {
(yyval.i) = TBR_NO_UP; /* no up staircase */ (yyval.i) = TBR_NO_UP; /* no up staircase */
} }
@@ -1820,7 +1820,7 @@ yyreduce:
case 43: case 43:
/* Line 1455 of yacc.c */ /* Line 1455 of yacc.c */
#line 337 "dgn_comp.y" #line 335 "dgn_comp.y"
{ {
(yyval.i) = TBR_NO_DOWN; /* no down staircase */ (yyval.i) = TBR_NO_DOWN; /* no down staircase */
} }
@@ -1829,7 +1829,7 @@ yyreduce:
case 44: case 44:
/* Line 1455 of yacc.c */ /* Line 1455 of yacc.c */
#line 341 "dgn_comp.y" #line 339 "dgn_comp.y"
{ {
(yyval.i) = TBR_PORTAL; /* portal connection */ (yyval.i) = TBR_PORTAL; /* portal connection */
} }
@@ -1838,7 +1838,7 @@ yyreduce:
case 45: case 45:
/* Line 1455 of yacc.c */ /* Line 1455 of yacc.c */
#line 347 "dgn_comp.y" #line 345 "dgn_comp.y"
{ {
(yyval.i) = 0; /* defaults to down */ (yyval.i) = 0; /* defaults to down */
} }
@@ -1847,7 +1847,7 @@ yyreduce:
case 46: case 46:
/* Line 1455 of yacc.c */ /* Line 1455 of yacc.c */
#line 351 "dgn_comp.y" #line 349 "dgn_comp.y"
{ {
(yyval.i) = (yyvsp[(1) - (1)].i); (yyval.i) = (yyvsp[(1) - (1)].i);
} }
@@ -1856,7 +1856,7 @@ yyreduce:
case 47: case 47:
/* Line 1455 of yacc.c */ /* Line 1455 of yacc.c */
#line 357 "dgn_comp.y" #line 355 "dgn_comp.y"
{ {
char *p = (yyvsp[(1) - (1)].str); char *p = (yyvsp[(1) - (1)].str);
if (strlen(p) != 1) { if (strlen(p) != 1) {
@@ -1872,7 +1872,7 @@ yyreduce:
case 48: case 48:
/* Line 1455 of yacc.c */ /* Line 1455 of yacc.c */
#line 387 "dgn_comp.y" #line 385 "dgn_comp.y"
{ {
if ((yyvsp[(2) - (5)].i) < -MAXLEVEL || (yyvsp[(2) - (5)].i) > MAXLEVEL) { if ((yyvsp[(2) - (5)].i) < -MAXLEVEL || (yyvsp[(2) - (5)].i) > MAXLEVEL) {
yyerror("Abs base out of dlevel range - zeroing!"); yyerror("Abs base out of dlevel range - zeroing!");
@@ -1892,7 +1892,7 @@ yyreduce:
case 49: case 49:
/* Line 1455 of yacc.c */ /* Line 1455 of yacc.c */
#line 424 "dgn_comp.y" #line 422 "dgn_comp.y"
{ {
if ((yyvsp[(2) - (5)].i) < -MAXLEVEL || (yyvsp[(2) - (5)].i) > MAXLEVEL) { if ((yyvsp[(2) - (5)].i) < -MAXLEVEL || (yyvsp[(2) - (5)].i) > MAXLEVEL) {
yyerror("Rel base out of dlevel range - zeroing!"); yyerror("Rel base out of dlevel range - zeroing!");
@@ -1907,7 +1907,7 @@ yyreduce:
/* Line 1455 of yacc.c */ /* Line 1455 of yacc.c */
#line 1913 "y.tab.c" #line 1911 "y.tab.c"
default: break; default: break;
} }
YY_SYMBOL_PRINT ("-> $$ =", yyr1[yyn], &yyval, &yyloc); YY_SYMBOL_PRINT ("-> $$ =", yyr1[yyn], &yyval, &yyloc);
@@ -2119,7 +2119,7 @@ yyreturn:
/* Line 1675 of yacc.c */ /* Line 1675 of yacc.c */
#line 434 "dgn_comp.y" #line 432 "dgn_comp.y"
void void
sys/share/lev_comp.h
+67 -395
View File
@@ -32,410 +32,82 @@
This special exception was added by the Free Software Foundation in This special exception was added by the Free Software Foundation in
version 2.2 of Bison. */ version 2.2 of Bison. */
/* Tokens. */ /* Tokens. */
#ifndef YYTOKENTYPE #ifndef YYTOKENTYPE
#define YYTOKENTYPE # define YYTOKENTYPE
/* Put the tokens into the symbol table, so that GDB and other debuggers /* Put the tokens into the symbol table, so that GDB and other debuggers
know about them. */ know about them. */
enum yytokentype { enum yytokentype {
CHAR = 258, INTEGER = 258,
INTEGER = 259, A_DUNGEON = 259,
BOOLEAN = 260, BRANCH = 260,
PERCENT = 261, CHBRANCH = 261,
SPERCENT = 262, LEVEL = 262,
MINUS_INTEGER = 263, RNDLEVEL = 263,
PLUS_INTEGER = 264, CHLEVEL = 264,
MAZE_GRID_ID = 265, RNDCHLEVEL = 265,
SOLID_FILL_ID = 266, UP_OR_DOWN = 266,
MINES_ID = 267, PROTOFILE = 267,
ROGUELEV_ID = 268, DESCRIPTION = 268,
MESSAGE_ID = 269, DESCRIPTOR = 269,
MAZE_ID = 270, LEVELDESC = 270,
LEVEL_ID = 271, ALIGNMENT = 271,
LEV_INIT_ID = 272, LEVALIGN = 272,
GEOMETRY_ID = 273, ENTRY = 273,
NOMAP_ID = 274, STAIR = 274,
OBJECT_ID = 275, NO_UP = 275,
COBJECT_ID = 276, NO_DOWN = 276,
MONSTER_ID = 277, PORTAL = 277,
TRAP_ID = 278, STRING = 278
DOOR_ID = 279, };
DRAWBRIDGE_ID = 280,
object_ID = 281,
monster_ID = 282,
terrain_ID = 283,
MAZEWALK_ID = 284,
WALLIFY_ID = 285,
REGION_ID = 286,
FILLING = 287,
IRREGULAR = 288,
JOINED = 289,
ALTAR_ID = 290,
LADDER_ID = 291,
STAIR_ID = 292,
NON_DIGGABLE_ID = 293,
NON_PASSWALL_ID = 294,
ROOM_ID = 295,
PORTAL_ID = 296,
TELEPRT_ID = 297,
BRANCH_ID = 298,
LEV = 299,
MINERALIZE_ID = 300,
CORRIDOR_ID = 301,
GOLD_ID = 302,
ENGRAVING_ID = 303,
FOUNTAIN_ID = 304,
POOL_ID = 305,
SINK_ID = 306,
NONE = 307,
RAND_CORRIDOR_ID = 308,
DOOR_STATE = 309,
LIGHT_STATE = 310,
CURSE_TYPE = 311,
ENGRAVING_TYPE = 312,
DIRECTION = 313,
RANDOM_TYPE = 314,
RANDOM_TYPE_BRACKET = 315,
A_REGISTER = 316,
ALIGNMENT = 317,
LEFT_OR_RIGHT = 318,
CENTER = 319,
TOP_OR_BOT = 320,
ALTAR_TYPE = 321,
UP_OR_DOWN = 322,
SUBROOM_ID = 323,
NAME_ID = 324,
FLAGS_ID = 325,
FLAG_TYPE = 326,
MON_ATTITUDE = 327,
MON_ALERTNESS = 328,
MON_APPEARANCE = 329,
ROOMDOOR_ID = 330,
IF_ID = 331,
ELSE_ID = 332,
TERRAIN_ID = 333,
HORIZ_OR_VERT = 334,
REPLACE_TERRAIN_ID = 335,
EXIT_ID = 336,
SHUFFLE_ID = 337,
QUANTITY_ID = 338,
BURIED_ID = 339,
LOOP_ID = 340,
FOR_ID = 341,
TO_ID = 342,
SWITCH_ID = 343,
CASE_ID = 344,
BREAK_ID = 345,
DEFAULT_ID = 346,
ERODED_ID = 347,
TRAPPED_ID = 348,
RECHARGED_ID = 349,
INVIS_ID = 350,
GREASED_ID = 351,
FEMALE_ID = 352,
CANCELLED_ID = 353,
REVIVED_ID = 354,
AVENGE_ID = 355,
FLEEING_ID = 356,
BLINDED_ID = 357,
PARALYZED_ID = 358,
STUNNED_ID = 359,
CONFUSED_ID = 360,
SEENTRAPS_ID = 361,
ALL_ID = 362,
MONTYPE_ID = 363,
GRAVE_ID = 364,
ERODEPROOF_ID = 365,
FUNCTION_ID = 366,
MSG_OUTPUT_TYPE = 367,
COMPARE_TYPE = 368,
UNKNOWN_TYPE = 369,
rect_ID = 370,
fillrect_ID = 371,
line_ID = 372,
randline_ID = 373,
grow_ID = 374,
selection_ID = 375,
flood_ID = 376,
rndcoord_ID = 377,
circle_ID = 378,
ellipse_ID = 379,
filter_ID = 380,
complement_ID = 381,
gradient_ID = 382,
GRADIENT_TYPE = 383,
LIMITED = 384,
HUMIDITY_TYPE = 385,
STRING = 386,
MAP_ID = 387,
NQSTRING = 388,
VARSTRING = 389,
CFUNC = 390,
CFUNC_INT = 391,
CFUNC_STR = 392,
CFUNC_COORD = 393,
CFUNC_REGION = 394,
VARSTRING_INT = 395,
VARSTRING_INT_ARRAY = 396,
VARSTRING_STRING = 397,
VARSTRING_STRING_ARRAY = 398,
VARSTRING_VAR = 399,
VARSTRING_VAR_ARRAY = 400,
VARSTRING_COORD = 401,
VARSTRING_COORD_ARRAY = 402,
VARSTRING_REGION = 403,
VARSTRING_REGION_ARRAY = 404,
VARSTRING_MAPCHAR = 405,
VARSTRING_MAPCHAR_ARRAY = 406,
VARSTRING_MONST = 407,
VARSTRING_MONST_ARRAY = 408,
VARSTRING_OBJ = 409,
VARSTRING_OBJ_ARRAY = 410,
VARSTRING_SEL = 411,
VARSTRING_SEL_ARRAY = 412,
METHOD_INT = 413,
METHOD_INT_ARRAY = 414,
METHOD_STRING = 415,
METHOD_STRING_ARRAY = 416,
METHOD_VAR = 417,
METHOD_VAR_ARRAY = 418,
METHOD_COORD = 419,
METHOD_COORD_ARRAY = 420,
METHOD_REGION = 421,
METHOD_REGION_ARRAY = 422,
METHOD_MAPCHAR = 423,
METHOD_MAPCHAR_ARRAY = 424,
METHOD_MONST = 425,
METHOD_MONST_ARRAY = 426,
METHOD_OBJ = 427,
METHOD_OBJ_ARRAY = 428,
METHOD_SEL = 429,
METHOD_SEL_ARRAY = 430,
DICE = 431
};
#endif #endif
/* Tokens. */ /* Tokens. */
#define CHAR 258 #define INTEGER 258
#define INTEGER 259 #define A_DUNGEON 259
#define BOOLEAN 260 #define BRANCH 260
#define PERCENT 261 #define CHBRANCH 261
#define SPERCENT 262 #define LEVEL 262
#define MINUS_INTEGER 263 #define RNDLEVEL 263
#define PLUS_INTEGER 264 #define CHLEVEL 264
#define MAZE_GRID_ID 265 #define RNDCHLEVEL 265
#define SOLID_FILL_ID 266 #define UP_OR_DOWN 266
#define MINES_ID 267 #define PROTOFILE 267
#define ROGUELEV_ID 268 #define DESCRIPTION 268
#define MESSAGE_ID 269 #define DESCRIPTOR 269
#define MAZE_ID 270 #define LEVELDESC 270
#define LEVEL_ID 271 #define ALIGNMENT 271
#define LEV_INIT_ID 272 #define LEVALIGN 272
#define GEOMETRY_ID 273 #define ENTRY 273
#define NOMAP_ID 274 #define STAIR 274
#define OBJECT_ID 275 #define NO_UP 275
#define COBJECT_ID 276 #define NO_DOWN 276
#define MONSTER_ID 277 #define PORTAL 277
#define TRAP_ID 278 #define STRING 278
#define DOOR_ID 279
#define DRAWBRIDGE_ID 280
#define object_ID 281
#define monster_ID 282
#define terrain_ID 283
#define MAZEWALK_ID 284
#define WALLIFY_ID 285
#define REGION_ID 286
#define FILLING 287
#define IRREGULAR 288
#define JOINED 289
#define ALTAR_ID 290
#define LADDER_ID 291
#define STAIR_ID 292
#define NON_DIGGABLE_ID 293
#define NON_PASSWALL_ID 294
#define ROOM_ID 295
#define PORTAL_ID 296
#define TELEPRT_ID 297
#define BRANCH_ID 298
#define LEV 299
#define MINERALIZE_ID 300
#define CORRIDOR_ID 301
#define GOLD_ID 302
#define ENGRAVING_ID 303
#define FOUNTAIN_ID 304
#define POOL_ID 305
#define SINK_ID 306
#define NONE 307
#define RAND_CORRIDOR_ID 308
#define DOOR_STATE 309
#define LIGHT_STATE 310
#define CURSE_TYPE 311
#define ENGRAVING_TYPE 312
#define DIRECTION 313
#define RANDOM_TYPE 314
#define RANDOM_TYPE_BRACKET 315
#define A_REGISTER 316
#define ALIGNMENT 317
#define LEFT_OR_RIGHT 318
#define CENTER 319
#define TOP_OR_BOT 320
#define ALTAR_TYPE 321
#define UP_OR_DOWN 322
#define SUBROOM_ID 323
#define NAME_ID 324
#define FLAGS_ID 325
#define FLAG_TYPE 326
#define MON_ATTITUDE 327
#define MON_ALERTNESS 328
#define MON_APPEARANCE 329
#define ROOMDOOR_ID 330
#define IF_ID 331
#define ELSE_ID 332
#define TERRAIN_ID 333
#define HORIZ_OR_VERT 334
#define REPLACE_TERRAIN_ID 335
#define EXIT_ID 336
#define SHUFFLE_ID 337
#define QUANTITY_ID 338
#define BURIED_ID 339
#define LOOP_ID 340
#define FOR_ID 341
#define TO_ID 342
#define SWITCH_ID 343
#define CASE_ID 344
#define BREAK_ID 345
#define DEFAULT_ID 346
#define ERODED_ID 347
#define TRAPPED_ID 348
#define RECHARGED_ID 349
#define INVIS_ID 350
#define GREASED_ID 351
#define FEMALE_ID 352
#define CANCELLED_ID 353
#define REVIVED_ID 354
#define AVENGE_ID 355
#define FLEEING_ID 356
#define BLINDED_ID 357
#define PARALYZED_ID 358
#define STUNNED_ID 359
#define CONFUSED_ID 360
#define SEENTRAPS_ID 361
#define ALL_ID 362
#define MONTYPE_ID 363
#define GRAVE_ID 364
#define ERODEPROOF_ID 365
#define FUNCTION_ID 366
#define MSG_OUTPUT_TYPE 367
#define COMPARE_TYPE 368
#define UNKNOWN_TYPE 369
#define rect_ID 370
#define fillrect_ID 371
#define line_ID 372
#define randline_ID 373
#define grow_ID 374
#define selection_ID 375
#define flood_ID 376
#define rndcoord_ID 377
#define circle_ID 378
#define ellipse_ID 379
#define filter_ID 380
#define complement_ID 381
#define gradient_ID 382
#define GRADIENT_TYPE 383
#define LIMITED 384
#define HUMIDITY_TYPE 385
#define STRING 386
#define MAP_ID 387
#define NQSTRING 388
#define VARSTRING 389
#define CFUNC 390
#define CFUNC_INT 391
#define CFUNC_STR 392
#define CFUNC_COORD 393
#define CFUNC_REGION 394
#define VARSTRING_INT 395
#define VARSTRING_INT_ARRAY 396
#define VARSTRING_STRING 397
#define VARSTRING_STRING_ARRAY 398
#define VARSTRING_VAR 399
#define VARSTRING_VAR_ARRAY 400
#define VARSTRING_COORD 401
#define VARSTRING_COORD_ARRAY 402
#define VARSTRING_REGION 403
#define VARSTRING_REGION_ARRAY 404
#define VARSTRING_MAPCHAR 405
#define VARSTRING_MAPCHAR_ARRAY 406
#define VARSTRING_MONST 407
#define VARSTRING_MONST_ARRAY 408
#define VARSTRING_OBJ 409
#define VARSTRING_OBJ_ARRAY 410
#define VARSTRING_SEL 411
#define VARSTRING_SEL_ARRAY 412
#define METHOD_INT 413
#define METHOD_INT_ARRAY 414
#define METHOD_STRING 415
#define METHOD_STRING_ARRAY 416
#define METHOD_VAR 417
#define METHOD_VAR_ARRAY 418
#define METHOD_COORD 419
#define METHOD_COORD_ARRAY 420
#define METHOD_REGION 421
#define METHOD_REGION_ARRAY 422
#define METHOD_MAPCHAR 423
#define METHOD_MAPCHAR_ARRAY 424
#define METHOD_MONST 425
#define METHOD_MONST_ARRAY 426
#define METHOD_OBJ 427
#define METHOD_OBJ_ARRAY 428
#define METHOD_SEL 429
#define METHOD_SEL_ARRAY 430
#define DICE 431
#if !defined YYSTYPE && !defined YYSTYPE_IS_DECLARED
typedef union YYSTYPE {
/* Line 1676 of yacc.c */
#line 149 "lev_comp.y"
long i;
char *map;
struct { #if ! defined YYSTYPE && ! defined YYSTYPE_IS_DECLARED
long room; typedef union YYSTYPE
long wall; {
long door;
} corpos;
struct {
long area;
long x1;
long y1;
long x2;
long y2;
} lregn;
struct {
long x;
long y;
} crd;
struct {
long ter;
long lit;
} terr;
struct {
long height;
long width;
} sze;
struct {
long die;
long num;
} dice;
struct {
long cfunc;
char *varstr;
} meth;
/* Line 1676 of yacc.c */ /* Line 1676 of yacc.c */
#line 443 "y.tab.h" #line 67 "dgn_comp.y"
int i;
char* str;
/* Line 1676 of yacc.c */
#line 105 "y.tab.h"
} YYSTYPE; } YYSTYPE;
#define YYSTYPE_IS_TRIVIAL 1 # define YYSTYPE_IS_TRIVIAL 1
#define yystype YYSTYPE /* obsolescent; will be withdrawn */ # define yystype YYSTYPE /* obsolescent; will be withdrawn */
#define YYSTYPE_IS_DECLARED 1 # define YYSTYPE_IS_DECLARED 1
#endif #endif
extern YYSTYPE yylval; extern YYSTYPE yylval;
sys/share/lev_lex.c
+811 -801
View File
File diff suppressed because it is too large Load Diff
sys/share/lev_yacc.c
+343 -343
View File
File diff suppressed because it is too large Load Diff