From eaf299c6ca247c0fba4007c790f61cb76cb3a083 Mon Sep 17 00:00:00 2001 From: Neil Booth Date: Tue, 28 Nov 2000 23:07:29 +0000 Subject: [PATCH] c-common.h: Remove flag_digraphs. * c-common.h: Remove flag_digraphs. * c-decl.c: Remove flag_digraphs. (c_decode_option): Don't set it. * c-lex.c (init_c_lex): Don't do anything for digraphs. From-SVN: r37834 --- gcc/ChangeLog | 7 +++++++ gcc/c-common.h | 6 +----- gcc/c-decl.c | 17 +++-------------- gcc/c-lex.c | 3 --- 4 files changed, 11 insertions(+), 22 deletions(-) diff --git a/gcc/ChangeLog b/gcc/ChangeLog index e3f14841b66..dfc9b7af196 100644 --- a/gcc/ChangeLog +++ b/gcc/ChangeLog @@ -1,3 +1,10 @@ +2000-11-28 Neil Booth + + * c-common.h: Remove flag_digraphs. + * c-decl.c: Remove flag_digraphs. + (c_decode_option): Don't set it. + * c-lex.c (init_c_lex): Don't do anything for digraphs. + 2000-11-28 Richard Henderson * c-parse.in (finish_parse): Update for parse_in type change. diff --git a/gcc/c-common.h b/gcc/c-common.h index 94c89cfce14..9590380be15 100644 --- a/gcc/c-common.h +++ b/gcc/c-common.h @@ -361,7 +361,7 @@ extern int warn_missing_format_attribute; extern int flag_traditional; -/* Nonzero means enable C89 Amendment 1 features, other than digraphs. */ +/* Nonzero means enable C89 Amendment 1 features. */ extern int flag_isoc94; @@ -369,10 +369,6 @@ extern int flag_isoc94; extern int flag_isoc99; -/* Nonzero means accept digraphs. */ - -extern int flag_digraphs; - /* Nonzero means environment is hosted (i.e., not freestanding) */ extern int flag_hosted; diff --git a/gcc/c-decl.c b/gcc/c-decl.c index 50e557a8322..8f8fbf832b3 100644 --- a/gcc/c-decl.c +++ b/gcc/c-decl.c @@ -343,7 +343,7 @@ int flag_no_asm; int flag_traditional; -/* Nonzero means enable C89 Amendment 1 features, other than digraphs. */ +/* Nonzero means enable C89 Amendment 1 features. */ int flag_isoc94 = 0; @@ -351,10 +351,6 @@ int flag_isoc94 = 0; int flag_isoc99 = 0; -/* Nonzero means accept digraphs. */ - -int flag_digraphs = 1; - /* Nonzero means that we have builtin functions, and main is an int */ int flag_hosted = 1; @@ -517,7 +513,6 @@ c_decode_option (argc, argv) { flag_traditional = 1; flag_writable_strings = 1; - flag_digraphs = 0; } else if (!strcmp (p, "-fallow-single-precision")) flag_allow_single_precision = 1; @@ -538,7 +533,6 @@ c_decode_option (argc, argv) { flag_traditional = 0; flag_writable_strings = 0; - flag_digraphs = 1; } else if (!strncmp (p, "-std=", 5)) { @@ -558,9 +552,8 @@ c_decode_option (argc, argv) || !strcmp (argstart, "c89")) { iso_1990: - flag_digraphs = 0; flag_isoc94 = 0; - iso_1990_digraphs: + iso_1994: flag_traditional = 0; flag_writable_strings = 0; flag_no_asm = 1; @@ -570,9 +563,8 @@ c_decode_option (argc, argv) } else if (!strcmp (argstart, "iso9899:199409")) { - flag_digraphs = 1; flag_isoc94 = 1; - goto iso_1990_digraphs; + goto iso_1994; } else if (!strcmp (argstart, "iso9899:199x") || !strcmp (argstart, "iso9899:1999") @@ -585,7 +577,6 @@ c_decode_option (argc, argv) flag_no_nonansi_builtin = 1; flag_noniso_default_format_attributes = 0; flag_isoc99 = 1; - flag_digraphs = 1; flag_isoc94 = 1; } else if (!strcmp (argstart, "gnu89")) @@ -596,7 +587,6 @@ c_decode_option (argc, argv) flag_no_nonansi_builtin = 0; flag_noniso_default_format_attributes = 1; flag_isoc99 = 0; - flag_digraphs = 1; flag_isoc94 = 0; } else if (!strcmp (argstart, "gnu9x") || !strcmp (argstart, "gnu99")) @@ -607,7 +597,6 @@ c_decode_option (argc, argv) flag_no_nonansi_builtin = 0; flag_noniso_default_format_attributes = 1; flag_isoc99 = 1; - flag_digraphs = 1; flag_isoc94 = 1; } else diff --git a/gcc/c-lex.c b/gcc/c-lex.c index c76d86c3d46..ea0391a90ed 100644 --- a/gcc/c-lex.c +++ b/gcc/c-lex.c @@ -126,9 +126,6 @@ init_c_lex (filename) parse_in->cb.change_file = cb_change_file; parse_in->cb.def_pragma = cb_def_pragma; - /* Make sure parse_in->digraphs matches flag_digraphs. */ - CPP_OPTION (parse_in, digraphs) = flag_digraphs; - if (filename == 0 || !strcmp (filename, "-")) filename = "stdin"; -- 2.30.2