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

util/???_comp.l

Browse Source 
A couple of minor changes, perparatory to regenerating sys/share/???_lex.c
with flex-latest plus new custom skeleton for same.
This commit is contained in:
PatR
2015-12-05 22:59:56 -08:00
parent c1a5895f3a
commit ea6c2a49fe
2 changed files with 15 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
util/dgn_comp.l
View File

@@ -1,5 +1,5 @@
%{ %{
/* NetHack 3.6 dgn_comp.l $NHDT-Date: 1448710672 2015/11/28 11:37:52 $ $NHDT-Branch: master $:$NHDT-Revision: 1.11 $ */ /* NetHack 3.6 dgn_comp.l $NHDT-Date: 1449385184 2015/12/06 06:59:44 $ $NHDT-Branch: NetHack-3.6.0 $:$NHDT-Revision: 1.12 $ */
/* 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. */
@@ -61,20 +61,20 @@ int FDECL(yyoutput, (int));
#define YY_NO_UNPUT #define YY_NO_UNPUT
#endif #endif
#ifdef FLEX_SCANNER #if defined(FLEX_SCANNER) || defined(FLEXHACK_SCANNER)
#define YY_MALLOC_DECL \ /* older flex wants this */
genericptr_t FDECL(malloc, (size_t)); \ #define YY_MALLOC_DECL genericptr_t FDECL(malloc, (size_t)); \
genericptr_t FDECL(realloc, (genericptr_t,size_t)); genericptr_t FDECL(realloc, (genericptr_t, size_t));
/* newer flex assumes <stdlib.h> so needs this in case it's been suppressed */
YY_MALLOC_DECL
#endif #endif
void FDECL(init_yyin, (FILE *)); void FDECL(init_yyin, (FILE *));
void FDECL(init_yyout, (FILE *)); void FDECL(init_yyout, (FILE *));
/* this doesn't always get put in dgn_comp.h /* this doesn't always get put in dgn_comp.h
* (esp. when using older versions of bison) * (esp. when using older versions of bison)
*/ */
extern YYSTYPE yylval; extern YYSTYPE yylval;
int nh_line_number = 1; int nh_line_number = 1;
@@ -131,6 +131,7 @@ FILE *input_f;
#endif #endif
yyin = input_f; yyin = input_f;
} }
/* analogous routine (for completeness) */ /* analogous routine (for completeness) */
void void
init_yyout( output_f ) init_yyout( output_f )

12
util/lev_comp.l
View File

@@ -1,5 +1,5 @@
%{ %{
/* NetHack 3.6 lev_comp.l $NHDT-Date: 1448710678 2015/11/28 11:37:58 $ $NHDT-Branch: master $:$NHDT-Revision: 1.21 $ */ /* NetHack 3.6 lev_comp.l $NHDT-Date: 1449385191 2015/12/06 06:59:51 $ $NHDT-Branch: NetHack-3.6.0 $:$NHDT-Revision: 1.22 $ */
/* Copyright (c) 1989 by Jean-Christophe Collet */ /* Copyright (c) 1989 by Jean-Christophe Collet */
/* NetHack may be freely redistributed. See license for details. */ /* NetHack may be freely redistributed. See license for details. */
@@ -59,10 +59,12 @@ int FDECL(yyoutput, (int));
#define YY_NO_UNPUT #define YY_NO_UNPUT
#endif #endif
#ifdef FLEX_SCANNER #if defined(FLEX_SCANNER) || defined(FLEXHACK_SCANNER)
#define YY_MALLOC_DECL \ /* older flex wants this */
genericptr_t FDECL(malloc, (size_t)); \ #define YY_MALLOC_DECL genericptr_t FDECL(malloc, (size_t)); \
genericptr_t FDECL(realloc, (genericptr_t,size_t)); genericptr_t FDECL(realloc, (genericptr_t, size_t));
/* newer flex assumes <stdlib.h> so needs this in case it's been suppressed */
YY_MALLOC_DECL
#endif #endif
void FDECL(init_yyin, (FILE *)); void FDECL(init_yyin, (FILE *));