From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: by sourceware.org (Postfix, from userid 7871) id 339673858C2D; Tue, 3 Jan 2023 09:34:50 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 339673858C2D DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gcc.gnu.org; s=default; t=1672738490; bh=H9WOMG7/ZL4OygjburHCQGbt6uJr1kAY43fjs9RHm7A=; h=From:To:Subject:Date:From; b=lLcA0+Nua4lILAxZ+SJ0YF9LvX3ZsqgUmMOgZObm4LvLfICgMRQ+Zr6XpxhDHYrn1 Ze8+gqhLqfwSeE/6sFVbIfP558xcz0Z/DDedHOr04aOHHBmOYYvQ1d7Wbb0dpGMNue NH5vK+1NTK/XRpO/ITBxY+U1r9PqqJubO53PCRO8= MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Content-Type: text/plain; charset="utf-8" From: Marc Poulhi?s To: gcc-cvs@gcc.gnu.org Subject: [gcc r13-4973] ada: Fix unescaped quotes when combining fdiagnostics-format=json and gnatdJ X-Act-Checkin: gcc X-Git-Author: Ghjuvan Lacambre X-Git-Refname: refs/heads/master X-Git-Oldrev: 238ff612f2fd88372c585753dd2faa73cb94cbb5 X-Git-Newrev: 201c21b0e847679645df1af3dd13459274f41047 Message-Id: <20230103093450.339673858C2D@sourceware.org> Date: Tue, 3 Jan 2023 09:34:50 +0000 (GMT) List-Id: https://gcc.gnu.org/g:201c21b0e847679645df1af3dd13459274f41047 commit r13-4973-g201c21b0e847679645df1af3dd13459274f41047 Author: Ghjuvan Lacambre Date: Mon Dec 12 14:54:47 2022 +0100 ada: Fix unescaped quotes when combining fdiagnostics-format=json and gnatdJ This commit fixes a small bug where GNAT would emit unescaped quotes in its -fdiagnostics-format=json output when using -gnatdJ and emitting messages about operator functions (e.g. "="). gcc/ada/ * errout.adb (Write_JSON_Span): Escape subprogram name. Diff: --- gcc/ada/errout.adb | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/gcc/ada/errout.adb b/gcc/ada/errout.adb index b30e8b51d15..261ba2e8033 100644 --- a/gcc/ada/errout.adb +++ b/gcc/ada/errout.adb @@ -2193,8 +2193,9 @@ package body Errout is end if; if Include_Subprogram_In_Messages then - Write_Str - (",""subprogram"":""" & Subprogram_Name_Ptr (Error.Node) & """"); + Write_Str (",""subprogram"":"""); + Write_JSON_Escaped_String (Subprogram_Name_Ptr (Error.Node)); + Write_Str (""""); end if; Write_Str ("}");