diff options
Diffstat (limited to 'libcpp/include')
| -rw-r--r-- | libcpp/include/cpplib.h | 3 | ||||
| -rw-r--r-- | libcpp/include/rich-location.h | 13 |
2 files changed, 9 insertions, 7 deletions
diff --git a/libcpp/include/cpplib.h b/libcpp/include/cpplib.h index 7c147ae..75efdcd 100644 --- a/libcpp/include/cpplib.h +++ b/libcpp/include/cpplib.h @@ -1610,7 +1610,8 @@ struct cpp_decoded_char This is a tabstop value, along with a callback for getting the widths of characters. Normally this callback is cpp_wcwidth, but we support other schemes for escaping non-ASCII unicode as a series of - ASCII chars when printing the user's source code in diagnostic-show-locus.cc + ASCII chars when printing the user's source code in + gcc/diagnostics/source-printing.cc For example, consider: - the Unicode character U+03C0 "GREEK SMALL LETTER PI" (UTF-8: 0xCF 0x80) diff --git a/libcpp/include/rich-location.h b/libcpp/include/rich-location.h index fe9868d..c74e80e 100644 --- a/libcpp/include/rich-location.h +++ b/libcpp/include/rich-location.h @@ -25,7 +25,7 @@ along with this program; see the file COPYING3. If not see #include "label-text.h" class range_label; -class label_effects; +namespace diagnostics { class label_effects; } /* A hint to diagnostic_show_locus on how to print a source range within a rich_location. @@ -213,7 +213,7 @@ semi_embedded_vec<T, NUM_EMBEDDED>::truncate (int len) } class fixit_hint; -class diagnostic_path; +namespace diagnostics { namespace paths { class path; }} /* A "rich" source code location, for use when printing diagnostics. A rich_location has one or more carets&ranges, where the carets @@ -520,8 +520,8 @@ class rich_location } /* An optional path through the code. */ - const diagnostic_path *get_path () const { return m_path; } - void set_path (const diagnostic_path *path) { m_path = path; } + const diagnostics::paths::path *get_path () const { return m_path; } + void set_path (const diagnostics::paths::path *path) { m_path = path; } /* A flag for hinting that the diagnostic involves character encoding issues, and thus that it will be helpful to the user if we show some @@ -567,7 +567,7 @@ protected: static const int MAX_STATIC_FIXIT_HINTS = 2; semi_embedded_vec <fixit_hint *, MAX_STATIC_FIXIT_HINTS> m_fixit_hints; - const diagnostic_path *m_path; + const diagnostics::paths::path *m_path; }; /* Abstract base class for labelling a range within a rich_location @@ -596,7 +596,8 @@ class range_label virtual label_text get_text (unsigned range_idx) const = 0; /* Get any special effects for the label (e.g. links to other labels). */ - virtual const label_effects *get_effects (unsigned /*range_idx*/) const + virtual const diagnostics::label_effects * + get_effects (unsigned /*range_idx*/) const { return nullptr; } |