OpenE2K
/
gcc
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

spew.c (struct uinparsed_test): Replace 'filename' and 'lineno' members with 'locus'. 

* spew.c (struct uinparsed_test): Replace 'filename' and 'lineno'
        members with 'locus'.  Adjust use throughout.
        (struct feed):  Likewise.
        (alloc_unparsed_test): Change prototype, take a 'const location_t *'.
        Adjust use.
        (snarf_defarg): Use error(), not error_with_file_and_line().

From-SVN: r55610
This commit is contained in:
Gabriel Dos Reis 2002-07-20 12:45:45 +00:00 committed by Gabriel Dos Reis
parent 3d1fc12974
commit 7a56114260
2 changed files with 35 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
gcc/cp/ChangeLog
View File

@ -1,3 +1,12 @@
2002-07-20 Gabriel Dos Reis <gdr@nerim.net>
* spew.c (struct uinparsed_test): Replace 'filename' and 'lineno'
members with 'locus'. Adjust use throughout.
(struct feed): Likewise.
(alloc_unparsed_test): Change prototype, take a 'const location_t *'.
Adjust use.
(snarf_defarg): Use error(), not error_with_file_and_line().
2002-07-19 Chris Demetriou <cgd@broadcom.com>
* lang-specs.h (@c++): Include "%2" (cc1plus_spec) wherever

59
gcc/cp/spew.c
View File

@ -79,8 +79,7 @@ struct unparsed_text GTY(())
{
struct unparsed_text *next; /* process this one next */
tree decl; /* associated declaration */
const char *filename; /* name of file we were processing */
int lineno; /* line number we got the text from */
location_t locus; /* location we got the text from */
int interface; /* remembering interface_unknown and interface_only */
struct token_chunk * tokens; /* Start of the token list. */
@ -98,8 +97,7 @@ struct unparsed_text GTY(())
struct feed GTY(())
{
struct unparsed_text *input;
const char *filename;
int lineno;
location_t locus;
int yychar;
YYSTYPE GTY ((desc ("%1.yychar"))) yylval;
int first_token;
@ -131,7 +129,7 @@ static SPEW_INLINE struct token * space_for_token
static SPEW_INLINE struct token * remove_last_token
PARAMS ((struct unparsed_text *t));
static struct unparsed_text * alloc_unparsed_text
PARAMS ((const char *fn, int li, tree decl, int interface));
PARAMS ((const location_t *, tree decl, int interface));
static void snarf_block PARAMS ((struct unparsed_text *t));
static tree snarf_defarg PARAMS ((void));
@ -403,20 +401,20 @@ feed_input (input)
#ifdef SPEW_DEBUG
if (spew_debug)
fprintf (stderr, "\tfeeding %s:%d [%d tokens]\n",
input->filename, input->lineno, input->limit - input->pos);
input->locus.file, input->locus.line, input->limit - input->pos);
#endif
f->input = input;
f->filename = input_filename;
f->lineno = lineno;
f->locus.file = input_filename;
f->locus.line = lineno;
f->yychar = yychar;
f->yylval = yylval;
f->first_token = first_token;
f->token_obstack = token_obstack;
f->next = feed;
input_filename = input->filename;
lineno = input->lineno;
input_filename = input->locus.file;
lineno = input->locus.line;
yychar = YYEMPTY;
yylval.ttype = NULL_TREE;
first_token = 0;
@ -429,8 +427,8 @@ end_input ()
{
struct feed *f = feed;
input_filename = f->filename;
lineno = f->lineno;
input_filename = f->locus.file;
lineno = f->locus.line;
yychar = f->yychar;
yylval = f->yylval;
first_token = f->first_token;
@ -1070,17 +1068,15 @@ remove_last_token (t)
/* Allocate an 'unparsed_text' structure, ready to use space_for_token. */
static struct unparsed_text *
alloc_unparsed_text (fn, li, decl, interface)
const char *fn;
int li;
alloc_unparsed_text (locus, decl, interface)
const location_t *locus;
tree decl;
int interface;
{
struct unparsed_text *r;
r = ggc_alloc_cleared (sizeof (*r));
r->decl = decl;
r->filename = fn;
r->lineno = li;
r->locus = *locus;
r->interface = interface;
r->tokens = r->last_chunk = ggc_alloc_cleared (sizeof (*r->tokens));
return r;
@ -1166,8 +1162,7 @@ snarf_block (t)
}
else if (yyc == 0)
{
error_with_file_and_line (t->filename, t->lineno,
"end of file read inside definition");
error ("%Hend of file read inside definition", &t->locus);
break;
}
}
@ -1179,13 +1174,13 @@ void
snarf_method (decl)
tree decl;
{
int starting_lineno = lineno;
const char *starting_filename = input_filename;
struct unparsed_text *meth;
location_t starting;
starting.file = input_filename;
starting.line = lineno;
meth = alloc_unparsed_text (starting_filename, starting_lineno, decl,
(interface_unknown ? 1
: (interface_only ? 0 : 2)));
meth = alloc_unparsed_text (&starting, decl, (interface_unknown ? 1
: (interface_only ? 0 : 2)));
snarf_block (meth);
@ -1198,8 +1193,7 @@ snarf_method (decl)
#ifdef SPEW_DEBUG
if (spew_debug)
fprintf (stderr, "\tsaved method of %d tokens from %s:%d\n",
meth->limit,
starting_filename, starting_lineno);
meth->limit, starting.file, starting.line);
#endif
DECL_PENDING_INLINE_INFO (decl) = meth;
@ -1218,14 +1212,15 @@ snarf_method (decl)
static tree
snarf_defarg ()
{
int starting_lineno = lineno;
const char *starting_filename = input_filename;
int yyc;
int plev = 0;
struct unparsed_text *buf;
tree arg;
location_t starting;
starting.file = input_filename;
starting.line = lineno;
buf = alloc_unparsed_text (starting_filename, starting_lineno, 0, 0);
buf = alloc_unparsed_text (&starting, 0, 0);
for (;;)
{
@ -1239,8 +1234,7 @@ snarf_defarg ()
--plev;
else if (yyc == 0)
{
error_with_file_and_line (starting_filename, starting_lineno,
"end of file read inside default argument");
error ("%Hend of file read inside default argument", &starting);
goto done;
}
}
@ -1252,8 +1246,7 @@ snarf_defarg ()
#ifdef SPEW_DEBUG
if (spew_debug)
fprintf (stderr, "\tsaved defarg of %d tokens from %s:%d\n",
buf->limit,
starting_filename, starting_lineno);
buf->limit, starting.file, starting.line);
#endif
arg = make_node (DEFAULT_ARG);