From d4370213f65e9ebaab7b912ff9de84122e530a23 Mon Sep 17 00:00:00 2001 From: Alexandre Petit-Bianco Date: Mon, 5 Apr 1999 12:00:08 +0000 Subject: [PATCH] parse.y (struct parser_ctxt *ctxp): Now global. Mon Apr 5 11:24:19 1999 Alexandre Petit-Bianco * parse.y (struct parser_ctxt *ctxp): Now global. (declare_local_variables): Use WFL compound value for the declaration source line value, when doing cross-referencing. From-SVN: r26201 --- gcc/java/ChangeLog | 6 ++++++ gcc/java/parse.c | 9 +++++++-- gcc/java/parse.y | 9 +++++++-- 3 files changed, 20 insertions(+), 4 deletions(-) diff --git a/gcc/java/ChangeLog b/gcc/java/ChangeLog index 4ae22f108e59..737a03b292f9 100644 --- a/gcc/java/ChangeLog +++ b/gcc/java/ChangeLog @@ -1,3 +1,9 @@ +Mon Apr 5 11:24:19 1999 Alexandre Petit-Bianco + + * parse.y (struct parser_ctxt *ctxp): Now global. + (declare_local_variables): Use WFL compound value for the + declaration source line value, when doing cross-referencing. + 1999-03-31 Tom Tromey * gjavah.c (print_field_info): Allow constants of other types. diff --git a/gcc/java/parse.c b/gcc/java/parse.c index 512738d9f4fa..5a9e85670b3c 100644 --- a/gcc/java/parse.c +++ b/gcc/java/parse.c @@ -324,9 +324,9 @@ int java_error_count; int java_warning_count; /* The current parser context */ -static struct parser_ctxt *ctxp; +struct parser_ctxt *ctxp; -/* List of things that were anlyzed for which code will be generated */ +/* List of things that were analyzed for which code will be generated */ static struct parser_ctxt *ctxp_for_generation = NULL; /* binop_lookup maps token to tree_code. It is used where binary @@ -7921,6 +7921,11 @@ declare_local_variables (modifier, type, vlist) decl = build_decl (VAR_DECL, name, real_type); BLOCK_CHAIN_DECL (decl); + /* If doing xreferencing, replace the line number with the WFL + compound value */ + if (flag_emit_xref) + DECL_SOURCE_LINE (decl) = EXPR_WFL_LINECOL (wfl); + /* Don't try to use an INIT statement when an error was found */ if (init && java_error_count) init = NULL_TREE; diff --git a/gcc/java/parse.y b/gcc/java/parse.y index 7ab2ef6ef26f..2afbddee3ad6 100644 --- a/gcc/java/parse.y +++ b/gcc/java/parse.y @@ -248,9 +248,9 @@ int java_error_count; int java_warning_count; /* The current parser context */ -static struct parser_ctxt *ctxp; +struct parser_ctxt *ctxp; -/* List of things that were anlyzed for which code will be generated */ +/* List of things that were analyzed for which code will be generated */ static struct parser_ctxt *ctxp_for_generation = NULL; /* binop_lookup maps token to tree_code. It is used where binary @@ -5320,6 +5320,11 @@ declare_local_variables (modifier, type, vlist) decl = build_decl (VAR_DECL, name, real_type); BLOCK_CHAIN_DECL (decl); + /* If doing xreferencing, replace the line number with the WFL + compound value */ + if (flag_emit_xref) + DECL_SOURCE_LINE (decl) = EXPR_WFL_LINECOL (wfl); + /* Don't try to use an INIT statement when an error was found */ if (init && java_error_count) init = NULL_TREE; -- 2.47.2