diff options
Diffstat (limited to 'gcc/ada')
| -rw-r--r-- | gcc/ada/ChangeLog | 8 | ||||
| -rw-r--r-- | gcc/ada/gigi.h | 6 | ||||
| -rw-r--r-- | gcc/ada/trans.c | 6 | ||||
| -rw-r--r-- | gcc/ada/utils.c | 10 | ||||
| -rw-r--r-- | gcc/ada/utils2.c | 4 |
5 files changed, 21 insertions, 13 deletions
diff --git a/gcc/ada/ChangeLog b/gcc/ada/ChangeLog index e3347ed..3197152 100644 --- a/gcc/ada/ChangeLog +++ b/gcc/ada/ChangeLog @@ -1,3 +1,11 @@ +2003-05-01 Nathan Sidwell <nathan@codesourcery.com> + + * trans.c (build_unit_elab, set_lineno): Rename lineno to + input_line. + * utils.c (pushdecl, create_label_decl, begin_subprog_body, + end_subprog_body): Likewise. + * utils2.c (build_call_raise): Likewise. + 2003-05-01 Laurent Guerby <guerby@acm.org> PR ada/10546 diff --git a/gcc/ada/gigi.h b/gcc/ada/gigi.h index 4094f49..8ad8a2a 100644 --- a/gcc/ada/gigi.h +++ b/gcc/ada/gigi.h @@ -7,7 +7,7 @@ * C Header File * * * * * - * Copyright (C) 1992-2002 Free Software Foundation, Inc. * + * Copyright (C) 1992-2003 Free Software Foundation, Inc. * * * * GNAT is free software; you can redistribute it and/or modify it under * * terms of the GNU General Public License as published by the Free Soft- * @@ -192,9 +192,9 @@ extern tree gnat_to_gnu PARAMS ((Node_Id)); extern void process_type PARAMS ((Entity_Id)); -/* Determine the input_filename and the lineno from the source location +/* Determine the input_filename and the input_line from the source location (Sloc) of GNAT_NODE node. Set the global variable input_filename and - lineno. If WRITE_NOTE_P is true, emit a line number note. */ + input_line. If WRITE_NOTE_P is true, emit a line number note. */ extern void set_lineno PARAMS ((Node_Id, int)); /* Post an error message. MSG is the error message, properly annotated. diff --git a/gcc/ada/trans.c b/gcc/ada/trans.c index 797671d..be5c656 100644 --- a/gcc/ada/trans.c +++ b/gcc/ada/trans.c @@ -7,7 +7,7 @@ * C Implementation File * * * * * - * Copyright (C) 1992-2002, Free Software Foundation, Inc. * + * Copyright (C) 1992-2003, Free Software Foundation, Inc. * * * * GNAT is free software; you can redistribute it and/or modify it under * * terms of the GNU General Public License as published by the Free Soft- * @@ -5343,7 +5343,7 @@ build_unit_elab (gnat_unit, body_p, gnu_elab_list) tree lhs = TREE_PURPOSE (gnu_elab_list); input_filename = DECL_SOURCE_FILE (lhs); - lineno = DECL_SOURCE_LINE (lhs); + input_line = DECL_SOURCE_LINE (lhs); /* If LHS has a padded type, convert it to the unpadded type so the assignment is done properly. */ @@ -5414,7 +5414,7 @@ set_lineno (gnat_node, write_note_p) (get_identifier (Get_Name_String (Reference_Name (Get_Source_File_Index (source_location)))));; - lineno = Get_Logical_Line_Number (source_location); + input_line = Get_Logical_Line_Number (source_location); if (write_note_p) emit_line_note (input_filename, lineno); diff --git a/gcc/ada/utils.c b/gcc/ada/utils.c index d21a097..e74d5a2 100644 --- a/gcc/ada/utils.c +++ b/gcc/ada/utils.c @@ -7,7 +7,7 @@ * C Implementation File * * * * * - * Copyright (C) 1992-2002, Free Software Foundation, Inc. * + * Copyright (C) 1992-2003, Free Software Foundation, Inc. * * * * GNAT is free software; you can redistribute it and/or modify it under * * terms of the GNU General Public License as published by the Free Soft- * @@ -479,7 +479,7 @@ pushdecl (decl) void gnat_init_decl_processing () { - lineno = 0; + input_line = 0; /* Make the binding_level structure for global names. */ current_function_decl = 0; @@ -1663,7 +1663,7 @@ create_label_decl (label_name) DECL_CONTEXT (label_decl) = current_function_decl; DECL_MODE (label_decl) = VOIDmode; - DECL_SOURCE_LINE (label_decl) = lineno; + DECL_SOURCE_LINE (label_decl) = input_line; DECL_SOURCE_FILE (label_decl) = input_filename; return label_decl; @@ -1781,7 +1781,7 @@ begin_subprog_body (subprog_decl) /* Store back the PARM_DECL nodes. They appear in the right order. */ DECL_ARGUMENTS (subprog_decl) = getdecls (); - init_function_start (subprog_decl, input_filename, lineno); + init_function_start (subprog_decl, input_filename, input_line); expand_function_start (subprog_decl, 0); /* If this function is `main', emit a call to `__main' @@ -1808,7 +1808,7 @@ end_subprog_body () /* Mark the RESULT_DECL as being in this subprogram. */ DECL_CONTEXT (DECL_RESULT (current_function_decl)) = current_function_decl; - expand_function_end (input_filename, lineno, 0); + expand_function_end (input_filename, input_line, 0); /* If this is a nested function, push a new GC context. That will keep local variables on the stack from being collected while we're doing diff --git a/gcc/ada/utils2.c b/gcc/ada/utils2.c index 21d32f9..1964be1 100644 --- a/gcc/ada/utils2.c +++ b/gcc/ada/utils2.c @@ -7,7 +7,7 @@ * C Implementation File * * * * * - * Copyright (C) 1992-2002, Free Software Foundation, Inc. * + * Copyright (C) 1992-2003, Free Software Foundation, Inc. * * * * GNAT is free software; you can redistribute it and/or modify it under * * terms of the GNU General Public License as published by the Free Soft- * @@ -1508,7 +1508,7 @@ build_call_raise (msg) build_call_2_expr (fndecl, build1 (ADDR_EXPR, build_pointer_type (char_type_node), filename), - build_int_2 (lineno, 0)); + build_int_2 (input_line, 0)); } /* Return a CONSTRUCTOR of TYPE whose list is LIST. */ |