aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGhjuvan Lacambre <lacambre@adacore.com>2022-12-12 14:54:47 +0100
committerMarc Poulhiès <poulhies@adacore.com>2023-01-03 10:29:54 +0100
commit201c21b0e847679645df1af3dd13459274f41047 (patch)
tree4c75ffc8c0ed19ba0d7fea85f16b0e739b00e246
parent238ff612f2fd88372c585753dd2faa73cb94cbb5 (diff)
downloadgcc-201c21b0e847679645df1af3dd13459274f41047.zip
gcc-201c21b0e847679645df1af3dd13459274f41047.tar.gz
gcc-201c21b0e847679645df1af3dd13459274f41047.tar.bz2
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.
-rw-r--r--gcc/ada/errout.adb5
1 files changed, 3 insertions, 2 deletions
diff --git a/gcc/ada/errout.adb b/gcc/ada/errout.adb
index b30e8b5..261ba2e 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 ("}");