diff options
| author | Zack Weinberg <zack@codesourcery.com> | 2005-06-30 23:09:06 +0000 |
|---|---|---|
| committer | Zack Weinberg <zack@gcc.gnu.org> | 2005-06-30 23:09:06 +0000 |
| commit | 39ce81c9c560d14c746714e6ec1621cad38bae93 (patch) | |
| tree | aaf251a28f0a2167060005edc8eb763baadddd63 /gcc/objcp | |
| parent | a3648cfc0c331051ae47bedcc40c561f9979673a (diff) | |
| download | gcc-39ce81c9c560d14c746714e6ec1621cad38bae93.zip gcc-39ce81c9c560d14c746714e6ec1621cad38bae93.tar.gz gcc-39ce81c9c560d14c746714e6ec1621cad38bae93.tar.bz2 | |
pretty-print.h (PP_NL_ARGMAX): New.
gcc:
* pretty-print.h (PP_NL_ARGMAX): New.
(text_info): Add locus.
(struct chunk_info): New.
(output_buffer): Add formatted_obstack, chunk_obstack, and
cur_chunk_array. Change obstack to a pointer.
(pp_wrapping_mode_t, pp_wrapping_mode, pp_set_verbatim_wrapping): New.
(struct pretty_print_info): Replace ideal_maximum_length and
prefixing_rule with wrapping.
(pp_line_cutoff, pp_prefixing_rule): Update to match.
Update prototypes and wrapper macros throughout.
* pretty-print.c (pp_formatted_text_data, pp_append_r)
(pp_base_clear_output_area, pp_construct, pp_base_formatted_text)
(pp_base_last_position_in_text, pp_base_newline, pp_base_character):
Update for changes to pp structure.
(pp_base_prepare_to_format, pp_base_format_text): Delete.
(pp_base_format, pp_base_output_formatted_text): New functions.
(pp_base_format_verbatim): Use pp_set_verbatim_wrapping.
(pp_verbatim): Clear text.locus.
(pp_printf): Likewise. Use pp_format and pp_output_formatted_text.
* c-objc-common.c (c_tree_printer): Update function signature.
* diagnostic.c (diagnostic_initialize): Update for changes to
pp structure.
(diagnostic_report_diagnostic): Call pp_format and then
pp_output_formatted_text.
(verbatim): Clear text.locus.
* diagnostic.h (diagnostic_prefixing_rule, diagnostic_line_cutoff):
Update for changes to pp structure.
* c-lang.c: No need to include c-pretty-print.h.
* Makefile.in: Remove bogus line containing only a tab.
(c-lang.o): Update dependencies.
* toplev.c (announce_function): Don't use verbatim.
(default_tree_printer): Update signature.
* objc/objc-lang.c: No need to include c-pretty-print.h.
* objc/Make-lang.in: Update dependencies.
gcc/cp:
* cp-lang.c: No need to include cxx-pretty-print.h.
* error.c (cp_printer): Update signature. No need to process
flags.
(print_instantiation_partial_context): Output last newline
with pp_base_newline.
* Make-lang.in: Update dependencies.
gcc/objcp:
* objcp-lang.c: No need to include cxx-pretty-print.h.
* Make-lang.in: Update dependencies.
Co-Authored-By: Jakub Jelinek <jakub@redhat.com>
From-SVN: r101481
Diffstat (limited to 'gcc/objcp')
| -rw-r--r-- | gcc/objcp/ChangeLog | 6 | ||||
| -rw-r--r-- | gcc/objcp/Make-lang.in | 2 | ||||
| -rw-r--r-- | gcc/objcp/objcp-lang.c | 1 |
3 files changed, 7 insertions, 2 deletions
diff --git a/gcc/objcp/ChangeLog b/gcc/objcp/ChangeLog index 58ef74b..4f3969e 100644 --- a/gcc/objcp/ChangeLog +++ b/gcc/objcp/ChangeLog @@ -1,3 +1,9 @@ +2005-06-30 Zack Weinberg <zack@codesourcery.com> + Jakub Jelinek <jakub@redhat.com> + + * objcp-lang.c: No need to include cxx-pretty-print.h. + * Make-lang.in: Update dependencies. + 2005-06-25 Kelley Cook <kcook@gcc.gnu.org> * all files: Update FSF in copyright headers. diff --git a/gcc/objcp/Make-lang.in b/gcc/objcp/Make-lang.in index f2c42ec..1e3a21d 100644 --- a/gcc/objcp/Make-lang.in +++ b/gcc/objcp/Make-lang.in @@ -69,7 +69,7 @@ cc1objplus$(exeext): $(OBJCXX_OBJS) cc1objplus-checksum.o $(BACKEND) $(LIBDEPS) objcp/objcp-lang.o : objcp/objcp-lang.c \ $(CXX_TREE_H) $(TM_H) toplev.h debug.h langhooks.h objc/objc-act.h \ - $(LANGHOOKS_DEF_H) c-common.h gtype-objcp.h $(CXX_PRETTY_PRINT_H) \ + $(LANGHOOKS_DEF_H) c-common.h gtype-objcp.h \ $(DIAGNOSTIC_H) cp/cp-objcp-common.h tree-gimple.h objcp/objcp-decl.o : objcp/objcp-decl.c \ diff --git a/gcc/objcp/objcp-lang.c b/gcc/objcp/objcp-lang.c index caa2941..30415ae 100644 --- a/gcc/objcp/objcp-lang.c +++ b/gcc/objcp/objcp-lang.c @@ -31,7 +31,6 @@ Boston, MA 02110-1301, USA. */ #include "langhooks.h" #include "langhooks-def.h" #include "diagnostic.h" -#include "cxx-pretty-print.h" #include "debug.h" #include "cp-objcp-common.h" |