qf/quakeforge
0
0
Fork 0
mirror of https://git.code.sf.net/p/quake/quakeforge synced 2025-02-25 13:11:00 +00:00
Code Issues Projects Releases Packages Wiki Activity

Adjust lex files to work with updated git flex

Browse source 
While my modified version is needed to actually avoid warnings (vs
upstream git flex), the files still work with debian's flex (with no
warnings). I needed to update (and fix) flex so the lexer line numbers
would be correct.
This commit is contained in:
Bill Currie 2023-10-19 23:05:47 +09:00
parent 76c92fada0
commit 28478befa6
3 changed files with 13 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
libs/util/cexpr-lex.l
View file

@ -55,8 +55,10 @@
#include "QF/cexpr.h" #include "QF/cexpr.h"
#include "libs/util/cexpr-parse.h" #include "libs/util/cexpr-parse.h"
#define YY_NO_INPUT #define YY_NO_INPUT // debian flex
#define YY_NO_UNPUT #define YY_NO_UNPUT // debian flex
#define YY_NO_YYINPUT
#define YY_NO_YYUNPUT
#define YYSTYPE CEXPR_YYSTYPE #define YYSTYPE CEXPR_YYSTYPE
#define YY_EXTRA_TYPE exprctx_t * #define YY_EXTRA_TYPE exprctx_t *

8
tools/qfcc/source/qc-lex.l
View file

@ -75,8 +75,10 @@
# define YY_FLEX_REALLOC_HACK # define YY_FLEX_REALLOC_HACK
#endif #endif
#define YY_NO_INPUT #define YY_NO_INPUT // debian flex
#define YY_NO_UNPUT #define YY_NO_UNPUT // debian flex
#define YY_NO_YYINPUT
#define YY_NO_YYUNPUT
#define YYSTYPE QC_YYSTYPE #define YYSTYPE QC_YYSTYPE
#define YYLTYPE QC_YYLTYPE #define YYLTYPE QC_YYLTYPE
@ -139,7 +141,7 @@ STRING \"(\\.|[^"\\])*\"
%x GRAB_FRAME GRAB_OTHER GRAB_WRITE COMMENT LCOMMENT PRAGMA %x GRAB_FRAME GRAB_OTHER GRAB_WRITE COMMENT LCOMMENT PRAGMA
%% %%
yy_flex_debug = 0; yyset_debug (0, yyscanner);
grab_frame = GRAB_FRAME; grab_frame = GRAB_FRAME;
grab_other = GRAB_OTHER; grab_other = GRAB_OTHER;
grab_write = GRAB_WRITE; grab_write = GRAB_WRITE;

6
tools/qfcc/source/qp-lex.l
View file

@ -60,8 +60,10 @@
# define YY_FLEX_REALLOC_HACK # define YY_FLEX_REALLOC_HACK
#endif #endif
#define YY_NO_INPUT #define YY_NO_INPUT // debian flex
#define YY_NO_UNPUT #define YY_NO_UNPUT // debian flex
#define YY_NO_YYINPUT
#define YY_NO_YYUNPUT
#define YYSTYPE QP_YYSTYPE #define YYSTYPE QP_YYSTYPE