From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: by sourceware.org (Postfix, from userid 2122) id 192CD3858417; Thu, 3 Nov 2022 19:46:04 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 192CD3858417 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gcc.gnu.org; s=default; t=1667504772; bh=WWafWG5+Ih8xpZcmqJqVfOdCYE7VXHB0KkWULdF/H1M=; h=From:To:Subject:Date:From; b=FuIzRU2EoCDkwv8RG+csYZyvduDyU5TKftTqMg9Ffb1mlESQzUUL8ZaZmamNByW/l o73+6/BONfgUg1D0eevbcMoVDZ7tr8LDLAnq7cBguuPPVzloPewibEGMvZtRAlLVWI FtFVvrsB0iWgIfgVs51OBpHNXOAzWbpXCs0BskL4= Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: Jason Merrill To: gcc-cvs@gcc.gnu.org Subject: [gcc/devel/c++-contracts] input: rename get_source to get_source_text_between X-Act-Checkin: gcc X-Git-Author: Jason Merrill X-Git-Refname: refs/heads/devel/c++-contracts X-Git-Oldrev: e378b7f8250d1e1b029c0254dc17492fa16e9de4 X-Git-Newrev: 7dbd1db4df283b73fe8e9c181d37a0754e429fac Message-Id: <20221103194612.192CD3858417@sourceware.org> Date: Thu, 3 Nov 2022 19:46:04 +0000 (GMT) List-Id: https://gcc.gnu.org/g:7dbd1db4df283b73fe8e9c181d37a0754e429fac commit 7dbd1db4df283b73fe8e9c181d37a0754e429fac Author: Jason Merrill Date: Thu Nov 3 15:44:25 2022 -0400 input: rename get_source to get_source_text_between Let's use a more informative name. gcc/ChangeLog: * input.h: * input.cc (get_source): Rename to get_source_text_between. gcc/cp/ChangeLog: * contracts.cc (build_comment): Adjust. Diff: --- gcc/input.h | 2 +- gcc/cp/contracts.cc | 3 ++- gcc/input.cc | 5 +++-- 3 files changed, 6 insertions(+), 4 deletions(-) diff --git a/gcc/input.h b/gcc/input.h index c97768ad2f3..f18769950b5 100644 --- a/gcc/input.h +++ b/gcc/input.h @@ -111,7 +111,7 @@ class char_span }; extern char_span location_get_source_line (const char *file_path, int line); -extern char *get_source (location_t, location_t); +extern char *get_source_text_between (location_t, location_t); extern bool location_missing_trailing_newline (const char *file_path); diff --git a/gcc/cp/contracts.cc b/gcc/cp/contracts.cc index 38eb4ad9bfe..79374344207 100644 --- a/gcc/cp/contracts.cc +++ b/gcc/cp/contracts.cc @@ -723,7 +723,8 @@ build_comment (cp_expr condition) { /* Try to get the actual source text for the condition; if that fails pretty print the resulting tree. */ - char *str = get_source (condition.get_start (), condition.get_finish ()); + char *str = get_source_text_between (condition.get_start (), + condition.get_finish ()); if (!str) { /* FIXME cases where we end up here diff --git a/gcc/input.cc b/gcc/input.cc index 7166c810892..9b36356338a 100644 --- a/gcc/input.cc +++ b/gcc/input.cc @@ -949,10 +949,11 @@ location_get_source_line (const char *file_path, int line) return char_span (buffer, len); } -/* Return the source text between two locations. */ +/* Return a copy of the source text between two locations. The caller is + responsible for freeing the return value. */ char * -get_source (location_t start, location_t end) +get_source_text_between (location_t start, location_t end) { expanded_location expstart = expand_location_to_spelling_point (start, LOCATION_ASPECT_START);