public inbox for gcc-cvs@sourceware.org
help / color / mirror / Atom feed
* [gcc r13-4973] ada: Fix unescaped quotes when combining fdiagnostics-format=json and gnatdJ
@ 2023-01-03  9:34 Marc Poulhi?s
  0 siblings, 0 replies; only message in thread
From: Marc Poulhi?s @ 2023-01-03  9:34 UTC (permalink / raw)
  To: gcc-cvs

https://gcc.gnu.org/g:201c21b0e847679645df1af3dd13459274f41047

commit r13-4973-g201c21b0e847679645df1af3dd13459274f41047
Author: Ghjuvan Lacambre <lacambre@adacore.com>
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 ("}");

^ permalink raw reply	[flat|nested] only message in thread
only message in thread, other threads:[~2023-01-03  9:34 UTC | newest]

Thread overview: (only message) (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2023-01-03  9:34 [gcc r13-4973] ada: Fix unescaped quotes when combining fdiagnostics-format=json and gnatdJ Marc Poulhi?s

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).