Add pp_write_text_as_html_like_dot_to_stream

gcc/ChangeLog:
	* pretty-print.c (pp_write_text_as_html_like_dot_to_stream): New
	function.
	* pretty-print.h (pp_write_text_as_html_like_dot_to_stream): New decl.

From-SVN: r279444

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 8fa7cc49c3059d9095be1d9b82d19ca1b46aba0b..d25666380cd19ec62ef687c763453d5f14c64610 100644 (file)
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,9 @@
+2019-12-16  David Malcolm  <dmalcolm@redhat.com>
+
+       * pretty-print.c (pp_write_text_as_html_like_dot_to_stream): New
+       function.
+       * pretty-print.h (pp_write_text_as_html_like_dot_to_stream): New decl.
+
 2019-12-16  Segher Boessenkool  <segher@kernel.crashing.org>
 
        * config/rs6000/rs6000.md (movsi_to_cr_one): Use CR0_REGNO instead of

diff --git a/gcc/pretty-print.c b/gcc/pretty-print.c
index 084e03c73c781ce2b1e93efa3c5b487524b547b3..2ecb0343ba0522d06f5069da800098c0514e8d7e 100644 (file)
--- a/gcc/pretty-print.c
+++ b/gcc/pretty-print.c
@@ -907,6 +907,54 @@ pp_write_text_as_dot_label_to_stream (pretty_printer *pp, bool for_record)
   pp_clear_output_area (pp);
 }
 
+/* As pp_write_text_to_stream, but for GraphViz HTML-like strings.
+
+   Flush the formatted text of pretty-printer PP onto the attached stream,
+   escaping these characters
+     " & < >
+   using XML escape sequences.
+
+   http://www.graphviz.org/doc/info/lang.html#html states:
+      special XML escape sequences for ", &, <, and > may be necessary in
+      order to embed these characters in attribute values or raw text
+   This doesn't list "'" (which would normally be escaped in XML
+   as "&apos;" or in HTML as "&#39;");.
+
+   Experiments show that escaping "'" doesn't seem to be necessary.  */
+
+void
+pp_write_text_as_html_like_dot_to_stream (pretty_printer *pp)
+{
+  const char *text = pp_formatted_text (pp);
+  const char *p = text;
+  FILE *fp = pp_buffer (pp)->stream;
+
+  for (;*p; p++)
+    {
+      switch (*p)
+       {
+       case '"':
+         fputs ("&quot;", fp);
+         break;
+       case '&':
+         fputs ("&amp;", fp);
+         break;
+       case '<':
+         fputs ("&lt;", fp);
+         break;
+       case '>':
+         fputs ("&gt;",fp);
+         break;
+
+       default:
+         fputc (*p, fp);
+         break;
+       }
+    }
+
+  pp_clear_output_area (pp);
+}
+
 /* Wrap a text delimited by START and END into PRETTY-PRINTER.  */
 static void
 pp_wrap_text (pretty_printer *pp, const char *start, const char *end)

diff --git a/gcc/pretty-print.h b/gcc/pretty-print.h
index 493507d41419e9065afb8d4fbe04f4e976da67a1..86b9e869eeb7ab7dee9e2eb7fa5a5fea0b698fe8 100644 (file)
--- a/gcc/pretty-print.h
+++ b/gcc/pretty-print.h
@@ -393,8 +393,11 @@ extern void pp_indent (pretty_printer *);
 extern void pp_newline (pretty_printer *);
 extern void pp_character (pretty_printer *, int);
 extern void pp_string (pretty_printer *, const char *);
+
 extern void pp_write_text_to_stream (pretty_printer *);
 extern void pp_write_text_as_dot_label_to_stream (pretty_printer *, bool);
+extern void pp_write_text_as_html_like_dot_to_stream (pretty_printer *pp);
+
 extern void pp_maybe_space (pretty_printer *);
 
 extern void pp_begin_quote (pretty_printer *, bool);