From 4daa149b86a42d1d10a735889c5f9cd6a0bca09e Mon Sep 17 00:00:00 2001 From: Tobias Burnus Date: Tue, 25 Nov 2014 23:33:32 +0100 Subject: gfortran.h (gfc_option_t): Remove flags moved as Var to .opt. 2014-11-25 Tobias Burnus gcc/fortran/ * gfortran.h (gfc_option_t): Remove flags moved as Var to .opt. (gfc_error_now_1): Renamed from gfc_error_now. (gfc_error_now): Renamed from gfc_error_now_2. (gfc_warning_now_1): Renamed from gfc_warning_now. (gfc_warning_now): Renamed from gfc_warning_now_2. * error.c (gfc_error_now_1): Renamed from gfc_error_now. (gfc_error_now): Renamed from gfc_error_now_2. (gfc_warning_now_1): Renamed from gfc_warning_now. (gfc_warning_now): Renamed from gfc_warning_now_2. (gfc_get_errors): Include common diagnostic in count. * lang.opt (Wc-binding-type, Wconversion, Wconversion-extra, Wintrinsics-std): Create a Var for those warnings. * check.c (gfc_check_cmplx): Pass warning flag to diagnostic function. * decl.c (get_proc_name, gfc_verify_c_interop_param, build_sym gfc_set_constant_character_len, verify_bind_c_sym): Ditto; use _1 for old diagnostic, remove _2 for new diagnostic. * expr.c (gfc_check_assign, gfc_check_vardef_context): Ditto. * frontend-passes.c (doloop_code, do_function): Ditto. * intrinsic.c (gfc_is_intrinsic, gfc_convert_type_warn): Ditto. * match.c (gfc_match_common): Ditto. * module.c (use_iso_fortran_env_module, gfc_use_module): Ditto. * parse.c (decode_statement, decode_gcc_attribute, next_free, next_fixed, gfc_check_do_variable): Ditto. * resolve.c (resolve_common_vars, resolve_ordinary_assign): Ditto. * scanner.c (add_path_to_list, skip_free_comments, gfc_next_char_literal, gfc_gobble_whitespace, load_line, preprocessor_line, load_file): Ditto. * symbol.c (gfc_set_default_type, verify_bind_c_derived_type): Ditto. * options.c (gfc_post_options): Ditto. (gfc_init_options, set_Wall, gfc_handle_option): Ditto; remove flags which now have a Var. * invoke.texi (Wconversion-extra): Make clear that the flag does not imply -Wconversion. gcc/testsuite/ * gfortran.dg/empty_label.f: Change test to continue testing for -fmax-errors=1. * gfortran.dg/empty_label.f90: Ditto. * gfortran.dg/warnings_are_errors_1.f90: Update dg-*. From-SVN: r218067 --- gcc/fortran/expr.c | 17 +++++++++-------- 1 file changed, 9 insertions(+), 8 deletions(-) (limited to 'gcc/fortran/expr.c') diff --git a/gcc/fortran/expr.c b/gcc/fortran/expr.c index 1bd62fa..d5b48cf 100644 --- a/gcc/fortran/expr.c +++ b/gcc/fortran/expr.c @@ -21,6 +21,7 @@ along with GCC; see the file COPYING3. If not see #include "config.h" #include "system.h" #include "coretypes.h" +#include "flags.h" #include "gfortran.h" #include "arith.h" #include "match.h" @@ -3227,7 +3228,7 @@ gfc_check_assign (gfc_expr *lvalue, gfc_expr *rvalue, int conform) if (rvalue->expr_type == EXPR_CONSTANT && lvalue->ts.type == rvalue->ts.type && (lvalue->ts.type == BT_REAL || lvalue->ts.type == BT_COMPLEX)) { - if (lvalue->ts.kind < rvalue->ts.kind && gfc_option.gfc_warn_conversion) + if (lvalue->ts.kind < rvalue->ts.kind && warn_conversion) { /* As a special bonus, don't warn about REAL rvalues which are not changed by the conversion if -Wconversion is specified. */ @@ -3258,8 +3259,7 @@ gfc_check_assign (gfc_expr *lvalue, gfc_expr *rvalue, int conform) gfc_typename (&lvalue->ts), &rvalue->where); } - else if (gfc_option.warn_conversion_extra - && lvalue->ts.kind > rvalue->ts.kind) + else if (warn_conversion_extra && lvalue->ts.kind > rvalue->ts.kind) { gfc_warning ("Conversion from %s to %s at %L", gfc_typename (&rvalue->ts), @@ -4971,11 +4971,12 @@ gfc_check_vardef_context (gfc_expr* e, bool pointer, bool alloc_obj, if (gfc_dep_compare_expr (ec, en) == 0) { if (context) - gfc_error_now ("Elements with the same value at %L" - " and %L in vector subscript" - " in a variable definition" - " context (%s)", &(ec->where), - &(en->where), context); + gfc_error_now_1 ("Elements with the same value " + "at %L and %L in vector " + "subscript in a variable " + "definition context (%s)", + &(ec->where), &(en->where), + context); return false; } } -- cgit v1.1