From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: by sourceware.org (Postfix, from userid 1851) id 1B075389246F; Mon, 10 Jan 2022 10:14:50 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 1B075389246F Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: Martin Liska To: gcc-cvs@gcc.gnu.org Subject: [gcc(refs/users/marxin/heads/cc-renaming)] Manual changes. X-Act-Checkin: gcc X-Git-Author: Martin Liska X-Git-Refname: refs/users/marxin/heads/cc-renaming X-Git-Oldrev: 7b443755efede39c85560c38410003044528befa X-Git-Newrev: d1a78e8a0aac8354d236f706f4c451ffacb5a222 Message-Id: <20220110101450.1B075389246F@sourceware.org> Date: Mon, 10 Jan 2022 10:14:50 +0000 (GMT) X-BeenThere: gcc-cvs@gcc.gnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Gcc-cvs mailing list List-Unsubscribe: , List-Archive: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 10 Jan 2022 10:14:50 -0000 https://gcc.gnu.org/g:d1a78e8a0aac8354d236f706f4c451ffacb5a222 commit d1a78e8a0aac8354d236f706f4c451ffacb5a222 Author: Martin Liska Date: Mon Jan 10 11:03:37 2022 +0100 Manual changes. Diff: --- gcc/gengtype.cc | 30 ++++++++++++------------------ 1 file changed, 12 insertions(+), 18 deletions(-) diff --git a/gcc/gengtype.cc b/gcc/gengtype.cc index e737c939457..386ae1b0506 100644 --- a/gcc/gengtype.cc +++ b/gcc/gengtype.cc @@ -1618,7 +1618,7 @@ set_gc_used (pair_p variables) printf ("%s used %d GTY-ed variables\n", progname, nbvars); } -/* File mapping routines. For each input file, there is one output .c file +/* File mapping routines. For each input file, there is one output .cc file (but some output files have many input files), and there is one .h file for the whole build. */ @@ -1949,8 +1949,8 @@ struct file_rule_st { /* File rule action handling *.h files. */ static outf_p header_dot_h_frul (input_file*, char**, char**); -/* File rule action handling *.c files. */ -static outf_p source_dot_c_frul (input_file*, char**, char**); +/* File rule action handling *.cc files. */ +static outf_p source_dot_cc_frul (input_file*, char**, char**); #define NULL_REGEX (regex_t*)0 @@ -1970,9 +1970,9 @@ struct file_rule_st files_rules[] = { but are not shared. */ /* the c-family/ source directory is special. */ - { DIR_PREFIX_REGEX "c-family/([[:alnum:]_-]*)\\.c$", + { DIR_PREFIX_REGEX "c-family/([[:alnum:]_-]*)\\.cc$", REG_EXTENDED, NULL_REGEX, - "gt-c-family-$3.h", "c-family/$3.c", NULL_FRULACT}, + "gt-c-family-$3.h", "c-family/$3.cc", NULL_FRULACT}, { DIR_PREFIX_REGEX "c-family/([[:alnum:]_-]*)\\.h$", REG_EXTENDED, NULL_REGEX, @@ -2015,20 +2015,14 @@ struct file_rule_st files_rules[] = { REG_EXTENDED, NULL_REGEX, "gt-objc-objc-map.h", "objc/objc-map.cc", NULL_FRULACT }, - /* General cases. For header *.h and source *.c or *.cc files, we + /* General cases. For header *.h and *.cc files, we * need special actions to handle the language. */ - /* Source *.c files are using get_file_gtfilename to compute their - output_name and get_file_basename to compute their for_name - through the source_dot_c_frul action. */ - { DIR_PREFIX_REGEX "([[:alnum:]_-]*)\\.c$", - REG_EXTENDED, NULL_REGEX, "gt-$3.h", "$3.c", source_dot_c_frul}, - /* Source *.cc files are using get_file_gtfilename to compute their output_name and get_file_basename to compute their for_name - through the source_dot_c_frul action. */ + through the source_dot_cc_frul action. */ { DIR_PREFIX_REGEX "([[:alnum:]_-]*)\\.cc$", - REG_EXTENDED, NULL_REGEX, "gt-$3.h", "$3.cc", source_dot_c_frul}, + REG_EXTENDED, NULL_REGEX, "gt-$3.h", "$3.cc", source_dot_cc_frul}, /* Common header files get "gtype-desc.cc" as their output_name, * while language specific header files are handled specially. So @@ -2083,13 +2077,13 @@ header_dot_h_frul (input_file* inpf, char**poutname, } -/* Special file rules action for handling *.c source files using +/* Special file rules action for handling *.cc source files using * get_file_gtfilename to compute their output_name and * get_file_basename to compute their for_name. The output_name is * gt--.h for language specific source files, and * gt-.h for common source files. */ static outf_p -source_dot_c_frul (input_file* inpf, char**poutname, char**pforname) +source_dot_cc_frul (input_file* inpf, char**poutname, char**pforname) { char *newbasename = CONST_CAST (char*, get_file_basename (inpf)); char *newoutname = CONST_CAST (char*, get_file_gtfilename (inpf)); @@ -2371,8 +2365,8 @@ close_output_files (void) { FILE *newfile = NULL; char *backupname = NULL; - /* Back up the old version of the output file gt-FOO.c as - BACKUPDIR/gt-FOO.c~ if we have a backup directory. */ + /* Back up the old version of the output file gt-FOO.cc as + BACKUPDIR/gt-FOO.cc~ if we have a backup directory. */ if (backup_dir) { backupname = concat (backup_dir, "/",