Future/bison
1
0
Fork 0
mirror of https://git.savannah.gnu.org/git/bison.git synced 2026-03-09 20:33:03 +00:00
Code Issues Packages Projects Releases Wiki Activity

Clean up scanners a bit.

Browse Source 
* src/flex-scanner.h (FLEX_NO_OBSTACK): New macro that blocks obstack
definitions so gcc won't warn when obstack_for_string is unused.
* src/scan-code.l: config.h and system.h are already #include'd by
scan-code-c.c, so get rid of them here.
* src/scan-gram.l: Likewise.
* src/scan-skel.l: Likewise, and use flex-scanner.h without obstack
definitions rather than duplicating the rest of it.
* src/scan-gram-c.c, scan-skel-c.c: #include "system.h".
This commit is contained in:
Joel E. Denny
2006-08-10 04:53:04 +00:00
parent 06e8700a00
commit f9bfc42aa7
7 changed files with 24 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
ChangeLog
View File

@@ -1,3 +1,15 @@
2006-08-10 Joel E. Denny <jdenny@ces.clemson.edu>
Clean up scanners a bit.
* src/flex-scanner.h (FLEX_NO_OBSTACK): New macro that blocks obstack
definitions so gcc won't warn when obstack_for_string is unused.
* src/scan-code.l: config.h and system.h are already #include'd by
scan-code-c.c, so get rid of them here.
* src/scan-gram.l: Likewise.
* src/scan-skel.l: Likewise, and use flex-scanner.h without obstack
definitions rather than duplicating the rest of it.
* src/scan-gram-c.c, scan-skel-c.c: #include "system.h".
2006-08-09 Joel E. Denny <jdenny@ces.clemson.edu>
Suppress signed/unsigned comparison warnings for yycheck.

6
src/flex-scanner.h
View File

@@ -1,4 +1,4 @@
/* Common parts between scan-code.l and scan-gram.l.
/* Common parts between scan-code.l, scan-gram.l, and scan-skel.l.
Copyright (C) 2006 Free Software Foundation, Inc.
@@ -59,6 +59,8 @@ int FLEX_PREFIX (lex_destroy) (void);
STRING_FINISH also stores this string in LAST_STRING, which can be
used, and which is used by STRING_FREE to free the last string. */
#ifndef FLEX_NO_OBSTACK
static struct obstack obstack_for_string;
#define STRING_GROW \
@@ -72,3 +74,5 @@ static struct obstack obstack_for_string;
#define STRING_FREE \
obstack_free (&obstack_for_string, last_string)
#endif

6
src/scan-code.l
View File

@@ -24,17 +24,15 @@
%option prefix="code_" outfile="lex.yy.c"
%{
#include <config.h>
#include "system.h"
/* Work around a bug in flex 2.5.31. See Debian bug 333231
<http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=333231>. */
#undef code_wrap
#define code_wrap() 1
#define FLEX_PREFIX(Id) code_ ## Id
#include "complain.h"
#include "flex-scanner.h"
#include "complain.h"
#include "reader.h"
#include "getargs.h"
#include <assert.h>

1
src/scan-gram-c.c
View File

@@ -1,2 +1,3 @@
#include <config.h>
#include "system.h"
#include "scan-gram.c"

3
src/scan-gram.l
View File

@@ -24,9 +24,6 @@
%option prefix="gram_" outfile="lex.yy.c"
%{
#include <config.h>
#include "system.h"
/* Work around a bug in flex 2.5.31. See Debian bug 333231
<http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=333231>. */
#undef gram_wrap

1
src/scan-skel-c.c
View File

@@ -1,2 +1,3 @@
#include <config.h>
#include "system.h"
#include "scan-skel.c"

16
src/scan-skel.l
View File

@@ -29,7 +29,9 @@
#undef skel_wrap
#define skel_wrap() 1
#include "system.h"
#define FLEX_NO_OBSTACK
#define FLEX_PREFIX(Id) skel_ ## Id
#include "flex-scanner.h"
#include <dirname.h>
#include <error.h>
@@ -40,19 +42,7 @@
#include "files.h"
#include "scan-skel.h"
/* Pacify "gcc -Wmissing-prototypes" when flex 2.5.31 is used. */
int skel_lex (void);
int skel_get_lineno (void);
FILE *skel_get_in (void);
FILE *skel_get_out (void);
int skel_get_leng (void);
char *skel_get_text (void);
void skel_set_lineno (int);
void skel_set_in (FILE *);
void skel_set_out (FILE *);
int skel_get_debug (void);
void skel_set_debug (int);
int skel_lex_destroy (void);
#define QPUTS(String) \
fputs (quotearg_style (c_quoting_style, String), yyout)