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

expr.c (expr_add_location): Move declaration to before all statements.

Browse Source 
* expr.c (expr_add_location): Move declaration to before all
	statements.
	* parse.y (java_expand_classes): Ditto.
	* lex.c (java_peek_unicode): Ditto.

From-SVN: r89152
This commit is contained in:
Hans-Peter Nilsson 2004-10-16 18:27:32 +00:00 committed by Hans-Peter Nilsson
parent d8d3480a29
commit e86d9e4bca
4 changed files with 14 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
gcc/java/ChangeLog
View File

@ -1,3 +1,10 @@
2004-10-16 Hans-Peter Nilsson <hp@bitrange.com>
* expr.c (expr_add_location): Move declaration to before all
statements.
* parse.y (java_expand_classes): Ditto.
* lex.c (java_peek_unicode): Ditto.
2004-10-16 Ranjit Mathew <rmathew@hotmail.com>
* check-init.c: Use %<, %> and %q for quoting in diagnostics,

6
gcc/java/expr.c
View File

@ -3239,15 +3239,15 @@ build_expr_wfl (tree node,
)
{
tree wfl;
static const char *last_file = 0;
static tree last_filenode = NULL_TREE;
#ifdef USE_MAPPED_LOCATION
wfl = make_node (EXPR_WITH_FILE_LOCATION);
SET_EXPR_LOCATION (wfl, location);
#else
wfl = make_node (EXPR_WITH_FILE_LOCATION);
static const char *last_file = 0;
static tree last_filenode = NULL_TREE;
EXPR_WFL_SET_LINECOL (wfl, line, col);
if (file != last_file)
{

3
gcc/java/lex.c
View File

@ -544,9 +544,10 @@ java_peek_unicode (void)
{
int unicode_escape_p;
java_lexer *lex = ctxp->lexer;
int next;
if (lex->avail_unicode)
return lex->next_unicode;
int next;
next = java_read_unicode (lex, &unicode_escape_p);

3
gcc/java/parse.y
View File

@ -9173,13 +9173,14 @@ java_expand_classes (void)
{
int save_error_count = 0;
static struct parser_ctxt *cur_ctxp = NULL;
location_t save_location;
java_parse_abort_on_error ();
if (!(ctxp = ctxp_for_generation))
return;
java_layout_classes ();
java_parse_abort_on_error ();
location_t save_location = input_location;
save_location = input_location;
for (cur_ctxp = ctxp_for_generation; cur_ctxp; cur_ctxp = cur_ctxp->next)
{