1. 08 Aug, 2001 1 commit
    • Implement std::messages. · 33590f13
      
      2001-08-07  Benjamin Kosnik  <bkoz@redhat.com>
      
      	Implement std::messages.
      	Make config a fully-nested directory.
      	* config/locale: New directory.
      	* config/c_locale_generic.cc: Move into locale subdirectory.
      	* config/c_locale_generic.h: Same.
      	* config/c_locale_gnu.cc: Same.
      	* config/c_locale_gnu.h: Same.
      	* config/c_locale_ieee_1003.1-200x.cc: Same.
      	* config/c_locale_ieee_1003.1-200x_.h: Same.
      	* config/codecvt_specializations_generic.h: Same.
      	* config/codecvt_specializations_ieee_1003.1-200x.h: Same.
      	* config/messages_members_gnu.h: Same.
      	* config/messaages_members_gnu.cc: Same.
      	* config/messages_members_generic.h: Same.
      	* config/messaages_members_generic.cc: Same.
      	* config/messages_members_ieee_1003.1-200x.h: Same.
      	* config/messaages_members_ieee_1003.1-200x.cc: Same.
      	* config/io: New directory.
      	* config/basic_file_libio.h: Move into io subdirectory.
      	* config/basic_file_libio.cc: Same.
      	* config/c_io_libio.h: Same.
      	* config/c_io_libio_codecvt.c: Same.
      	* config/basic_file_stdio.h: Same.
      	* config/basic_file_stdio.cc: Same.
      	* config/c_io_stdio.h: Same.
      
      	* po: New directory.
      	* po/POTFILES.in: New file.
      	* po/Makefile.am: New file.
      	* po/Makefile.in: New file.
      	* po/libstdc++.pot: Generic translation file.
      	* po/fr.po: Preliminary French translation.
      	* po/de.po: Preliminary German translation.
      	* intl: New directory.
      	* intl/Makefile.am: New file.
      	* intl/Makefile.in: New file.
      	* intl/string_literals.cc: New file.
      	* acinclude.m4 (GLIBCPP_CONFIGURE): Bump VERSION to 3.1.0. Add
      	requisite setup for gettext. Re-arrange.
      	* aclocal.m4: Regenerate.
      	* configure.in: Don't call GLIBCPP_CHECK_COMPILER_VERSION.
      	Output Makefile bits for po and intl.
      	* configure: Regenerate.
      	* Makefile.am (SUBDIRS): Add intl, po. Add rule for dist.
      	* Makefile.in: Regenerate.
      	* acconfig.h: Add ENABLE_NLS, HAVE_CATGETS, HAVE_GETTEXT, HAVE_STPCPY.
      	* config.h.in: Regenerate.
      
      	* acinclude.m4 (AC_REPLACE_STRINGFUNCS): Remove.
      
      	* include/Makefile.am (install-data-local): Don't install Makefile.
      	* include/Makefile.in: Regenerate.
      
      	* include/bits/locale_facet.h (locale::facet::_S_clone_c_locale):
      	Add member.
      	* config/locale/c_locale_gnu.cc (_S_clone_c_locale): Add definition.
      	* config/locale/c_locale_generic.cc: Same.
      	* config/locale/c_locale_ieee_1003.1-200x.cc: Same.
      
      	* include/bits/codecvt.h: Excise non-standard, non-required
      	bits. This includes __enc_traits, and partial specializations of
      	codecvt for __enc_traits.
      	* src/codecvt.cc (__enc_traits::_S_max_size): Guard
      	* config/codecvt_partials_ieee_1003.1-200x.h: New file.
      	* config/codecvt_partials_generic.h: New file.
      	* include/Makefile.am (allstamps): Add stamp-codecvt_model.
      	(stamp-codecvt_model): Add.
      	* include/Makefile.in: Regenerate.
      	* acinclude.m4 (GLIBCPP_ENABLE_CLOCALE): Add in codecvt configury.
      	* aclocal.m4: Regenerate.
      	* configure: Regenerate.
      	* testsuite/22_locale/codecvt_unicode_wchar_t.cc: Use macro guard.
      	* testsuite/22_locale/codecvt_unicode_char.cc: Same.
      	* testsuite/22_locale/ctor_copy_dtor.cc: And here.
      
      	* include/bits/localefwd.h (class locale::facet): Add __enc_traits
      	as a friend for _S_*_c_locale functions.
      	* include/bits/codecvt.h (__enc_traits::__enc_traits): Add locale
      	argument to default constructor so that CODESET information can be
      	deduced.
      	* include/bits/locale_facets.h (messages_byname):
      	Re-implement. Remove specializations.
      	* src/locale.cc (messages_byname<char>): Remove specialization.
      	(messages_byname<wchar_t>): Same.
      	* config/locale/c_locale_ieee_1003.1-200x.cc: New file.
      	* config/locale/c_locale_ieee_1003.1-200x.h: New file.
      	* config/locale/messages_members_ieee_1003.1-200x.cc: New file.
      	* config/locale/messages_members_ieee_1003.1-200x.h: New file.
      	* config/locale/messages_members_gnu.cc: New file.
      	* config/locale/messages_members_gnu.h: New file.
      	* config/locale/messages_members_generic.cc: New file.
      	* config/locale/messages_members_generic.h: New file.
      
      	* docs/html/configopts.html: Add documentation for new locale
      	model, ieee_1003.1. Adjust other flags for current defaults.
      	* docs/html/22_locale/locale.html: Update.
      	* docs/html/22_locale/howto.html: Add link to messages.html. Organize.
      	* docs/html/22_locale/messages.html: New.
      
      	* src/Makefile.am (sources): Add messages_virtuals.cc.
      	* src/Makefile.in: Regenerate.
      	* include/Makefile.am (allstamps): Add stamp-messages_model.
      	(stamp-messages_model): Add.
      	* include/Makefile.in: Regenerate.
      	* acinclude.m4 (GLIBCPP_ENABLE_CLOCALE): Add in messages configury.
      	* aclocal.m4: Regenerate.
      	* configure: Regenerate.
      
      	* testsuite_flags.in (--cxxflags): Add LOCALEDIR.
      	* testsuite/lib/libstdc++-v3-dg.exp: Remove broken LD_LIBRARY_PATH
      	bits for Irix.
      	* acinclude (GLIBCPP_ENABLE_CLOCALE): Set glibcpp_localedir to the
      	build directories message catalog base directory, and export.
      	Eventually this should probably be made to deal with build and
      	install directories. For now, punt on this as the library itself
      	doesn't use message catalogs (yet).
      	* testsuite/22_locale/messages.cc: New file.
      	* testsuite/22_locale/messages_char_members.cc: New file.
      	* testsuite/22_locale/messages_byname.cc: New file.
      
      From-SVN: r44702
      Benjamin Kosnik committed
  2. 07 Aug, 2001 19 commits
    • cppinit.c (cpp_finish): Pop the final buffer without comment. · 7364fdd8
      	* cppinit.c (cpp_finish): Pop the final buffer without comment.
      	* cpplex.c (_cpp_lex_token): Don't pop the final buffer; and
      	take care to avoid multiple no-newline at EOF warnings in that
      	case.
      
      From-SVN: r44701
      Neil Booth committed
    • calls.c (expand_call): Do not emit INSN_SETJMP note. · 570a98eb
      	* calls.c (expand_call): Do not emit INSN_SETJMP note.
      	(emit_library_call_value_1): Likewise.
      	(emit_call_1): Emit REG_SETJMP note.
      	* cse.c (cse_end_of_basic_block): Use REG_SETJMP instead
      	of INSN_SETJMP
      	* cselib.c (cselib_process_insn): Likewise.
      	* flow.c (propagate_block): Likewise.
      	* loop.c (find_and_verify_loops): Likewise.
      	* reload.c (find_equiv_regs): Likewise.
      	* reload1.c (reload): Likewise.
      	* resource.c (mark_referenced_resources,
      	mark_set_resources): Likewise.
      	* sched-deps (sched_analyze_insn, sched_analyze): Likewise.
      	* final.c (final_scan_insn): Remove NOTE_INSN_SETJMP.
      	* haifa-sched.c (unlink_other_notes): Likewise.
      	(reemit_notes): Likewise.
      	* sched-ebb.c (sched_ebb): Likewise.
      	* sched-rgc.c (sched_region): Likewise.
      	* rtl.c (note_insn_name): Likewise.
      	(reg_note_name): Add REG_SETJMP
      	* rtl.h (reg_note): Add REG_SETJMP.
      	(insn_note): Remove NOTE_INSN_SETJMP.
      
      	* profile.c (branch_prob): Add fake edges for setjmp.
      
      From-SVN: r44700
      Jan Hubicka committed
    • config.gcc: Quote target_cpu_default2 correctly for powerpc*-*-* targets. · ff25793c
              * config.gcc: Quote target_cpu_default2 correctly for
              powerpc*-*-* targets.
      
      From-SVN: r44699
      Daniel Jacobowitz committed
    • cpplib.h, line-map.h: Update comments. · 42dcba34
      	* cpplib.h, line-map.h: Update comments.
      	* cppmain.c (printer_init): Move inline.
      	(maybe_print_line, print_line): Take a map pointer.
      	(cb_ident, cb_define, cb_undef, cb_include, cb_def_pragma): Update.
      	(cb_file_change): Don't use prior value of print.map.
      
      From-SVN: r44697
      Neil Booth committed
    • cp-demangle.c (demangle_special_name): "GR" -> "reference temporary for". · 056400f1
              * cp-demangle.c (demangle_special_name): "GR" -> "reference temporary
              for".
      
      From-SVN: r44694
      Jason Merrill committed
    • rtlanal.c (find_first_parameter_load): Call note_stores only on the instructions. · 0d025d43
      	* rtlanal.c (find_first_parameter_load): Call note_stores
      	only on the instructions.
      
      From-SVN: r44693
      Jan Hubicka committed
    • revert get_alias_set change for now · 41e0f05c
      From-SVN: r44692
      Jason Merrill committed
    • re PR c++/3820 (GCC 3.0 crashes with empty base class) · 0830ae44
      cp:
      	PR c++/3820
      	Stop using TYPE_NONCOPIED_PARTS.
      	* call.c (build_over_call): Be careful when copy constructing
      	or assigning to an empty class.
      	* class.c (check_bases_and_members): It has a
      	COMPLEX_ASSIGN_REF if it has a vptr.
      	(layout_class_type): Don't add empty class padding to
      	TYPE_NONCOPIED_PARTS.
      	(finish_struct_1): Don't add the VFIELD either.
      	* cp-tree.h (TYPE_HAS_TRIVIAL_INIT_REF): Mention _copy_
      	initialization.
      testsuite:
      	* g++.dg/abi/empty4.C: New test.
      
      From-SVN: r44691
      Nathan Sidwell committed
    • alias.c (nonlocal_mentioned_p): Rename CONST_CALL_P to CONST_OR_PURE_CALL_P · 24a28584
      	* alias.c (nonlocal_mentioned_p):
      	Rename CONST_CALL_P to CONST_OR_PURE_CALL_P
      	* calls.c (emit_call_1): Likewise.
      	* cse.c (cse_insn, invalidate_skipped_block): Likewise.
      	* cselib.c (cselib_process_insn): Likewise.
      	* df.c (df_insns_modify): Likewise.
      	* flow.c (need_fake_edge_p): Likewise.
      	(propagate_one_insn): Likewise.
      	* haifa-sched.c (reemit_notes): Likewise.
      	* integrate.c (copy_insn_list): Likewise.
      	* jump.c (delete_prior_computation): Likewise.
      	* local-alloc.c (validate_equiv_mem): Likewise.
      	* loop.c (scan_loop): Likewise.
      	* predict.c (estimate_probability): Likewise.
      	* reload.c (reload): Likewise.
      	* sched-deps (sched_analyze): Likewise.
      	* rtl.h (CONST_CALL_P): rename to CONST_OR_PURE_CALL_P.
      	* gcse.c (compute_hash_table): Likewise.
      	(mark_call): Likewise.
      	(store_killed_in_insn): Likewise.
      
      From-SVN: r44688
      Jan Hubicka committed
    • oops · 0254ec9f
      From-SVN: r44687
      Jason Merrill committed
    • improve comment · 57cf57fb
      From-SVN: r44685
      Jason Merrill committed
    • alias.c (get_alias_set): Return a previously calculated alias set for a VAR_DECL. · 1b81b789
              * alias.c (get_alias_set): Return a previously calculated
              alias set for a VAR_DECL.
      
      From-SVN: r44683
      Jason Merrill committed
    • Daily bump. · e13ef1e2
      From-SVN: r44681
      GCC Administrator committed
    • varasm.c (assemble_gc_entry): Remove. · 2d2e44d2
              * varasm.c (assemble_gc_entry): Remove.
              * output.h: Likewise.
      
      From-SVN: r44680
      Richard Henderson committed
    • acinclude.m4 (GLIBCPP_CONFIGURE_TESTSUITE): New macro, calls... · fe413112
      2001-08-06  Phil Edwards  <pme@sources.redhat.com>
      
      	* acinclude.m4 (GLIBCPP_CONFIGURE_TESTSUITE):  New macro, calls...
      	(GLIBCPP_CHECK_SETRLIMIT):  ...this new macro, which also uses...
      	(GLIBCPP_CHECK_SETRLIMIT_ancilliary):  ...this new macro.
      	* configure.in (AM_CONFIG_HEADER):  Also generate testsuite_hooks.h.
      	Call GLIBCPP_CONFIGURE_TESTSUITE.
      	* aclocal.m4:  Regenerate.
      	* config.h.in:  Regenerate.
      	* configure:  Regenerate.
      
      	* testsuite/lib/libstdc++-v3-dg.exp:  Download new header instead
      	of old header.
      
      	* testsuite_flags.in:  Add build dir's testsuite to INCLUDES.
      	* testsuite/debug_assert.h:  Removed; contents merged into...
      	* testsuite/testsuite_hooks.h.in:  ...here.  New file.
      	* testsuite/17_intro/header_ciso646.cc:  No longer include
      	debug_assert.h, include testsuite_hooks.h instead.
      	* testsuite/17_intro/header_fstream.cc:  Likewise.
      	* testsuite/17_intro/header_iomanip.cc:  Likewise.
      	* testsuite/17_intro/header_ios.cc:  Likewise.
      	* testsuite/17_intro/header_iosfwd.cc:  Likewise.
      	* testsuite/17_intro/header_iostream.cc:  Likewise.
      	* testsuite/17_intro/header_istream.cc:  Likewise.
      	* testsuite/17_intro/header_ostream.cc:  Likewise.
      	* testsuite/17_intro/header_sstream.cc:  Likewise.
      	* testsuite/17_intro/header_streambuf.cc:  Likewise.
      	* testsuite/18_support/numeric_limits.cc:  Likewise.
      	* testsuite/19_diagnostics/stdexceptions.cc:  Likewise.
      	* testsuite/20_util/allocator_members.cc:  Likewise.
      	* testsuite/20_util/auto_ptr.cc:  Likewise.
      	* testsuite/20_util/pairs.cc:  Likewise.
      	* testsuite/21_strings/append.cc:  Likewise.
      	* testsuite/21_strings/capacity.cc:  Likewise.
      	* testsuite/21_strings/char_traits_requirements.cc:  Likewise.
      	* testsuite/21_strings/compare.cc:  Likewise.
      	* testsuite/21_strings/ctor_copy_dtor.cc:  Likewise.  Also set up
      	call to (disabled) __set_testsuite_memlimit() wrapper.
      	* testsuite/21_strings/element_access.cc:  Likewise.
      	* testsuite/21_strings/find.cc:  Likewise.
      	* testsuite/21_strings/insert.cc:  Likewise.  Also set up call to
      	(disabled) __set_testsuite_memlimit() wrapper.
      	* testsuite/21_strings/inserters_extractors.cc:  Likewise.
      	* testsuite/21_strings/invariants.cc:  Likewise.
      	* testsuite/21_strings/nonmember.cc:  Likewise.
      	* testsuite/21_strings/operations.cc:  Likewise.
      	* testsuite/21_strings/replace.cc:  Likewise.
      	* testsuite/21_strings/rfind.cc:  Likewise.
      	* testsuite/21_strings/substr.cc:  Likewise.
      	* testsuite/22_locale/codecvt_char_char.cc:  Likewise.
      	* testsuite/22_locale/codecvt_unicode_char.cc:  Likewise.
      	* testsuite/22_locale/codecvt_unicode_wchar_t.cc:  Likewise.
      	* testsuite/22_locale/codecvt_wchar_t_char.cc:  Likewise.
      	* testsuite/22_locale/ctor_copy_dtor.cc:  Likewise.
      	* testsuite/22_locale/ctype_char_members.cc:  Likewise.
      	* testsuite/22_locale/ctype_wchar_t_members.cc:  Likewise.
      	* testsuite/22_locale/facet.cc:  Likewise.
      	* testsuite/22_locale/global_templates.cc:  Likewise.
      	* testsuite/22_locale/members.cc:  Likewise.
      	* testsuite/22_locale/numpunct_byname.cc:  Likewise.
      	* testsuite/22_locale/numpunct_char_members.cc:  Likewise.
      	* testsuite/22_locale/operators.cc:  Likewise.
      	* testsuite/22_locale/static_members.cc:  Likewise.
      	* testsuite/23_containers/bitset_ctor.cc:  Likewise.
      	* testsuite/23_containers/bitset_members.cc:  Likewise.
      	* testsuite/23_containers/bitset_shift.cc:  Likewise.
      	* testsuite/23_containers/vector_capacity.cc:  Likewise.
      	* testsuite/23_containers/vector_ctor.cc:  Likewise.
      	* testsuite/23_containers/vector_element_access.cc:  Likewise.
      	* testsuite/23_containers/vector_modifiers.cc:  Likewise.
      	* testsuite/24_iterators/istreambuf_iterator.cc:  Likewise.
      	* testsuite/24_iterators/iterator.cc:  Likewise.
      	* testsuite/24_iterators/ostreambuf_iterator.cc:  Likewise.
      	* testsuite/25_algorithms/binary_search.cc:  Likewise.
      	* testsuite/25_algorithms/copy.cc:  Likewise.
      	* testsuite/25_algorithms/heap.cc:  Likewise.
      	* testsuite/25_algorithms/lower_bound.cc:  Likewise.
      	* testsuite/25_algorithms/min_max.cc:  Likewise.
      	* testsuite/25_algorithms/partition.cc:  Likewise.
      	* testsuite/25_algorithms/rotate.cc:  Likewise.
      	* testsuite/25_algorithms/sort.cc:  Likewise.
      	* testsuite/26_numerics/c_math.cc:  Likewise.
      	* testsuite/26_numerics/complex_inserters_extractors.cc:  Likewise.
      	* testsuite/26_numerics/complex_value.cc:  Likewise.
      	* testsuite/27_io/filebuf.cc:  Likewise.
      	* testsuite/27_io/filebuf_members.cc:  Likewise.
      	* testsuite/27_io/filebuf_virtuals.cc:  Likewise.
      	* testsuite/27_io/fpos.cc:  Likewise.
      	* testsuite/27_io/fstream_members.cc:  Likewise.
      	* testsuite/27_io/ifstream_members.cc:  Likewise.
      	* testsuite/27_io/ios_base_callbacks.cc:  Likewise.
      	* testsuite/27_io/ios_base_members_static.cc:  Likewise.
      	* testsuite/27_io/ios_base_storage.cc:  Likewise.
      	* testsuite/27_io/ios_ctor.cc:  Likewise.
      	* testsuite/27_io/ios_init.cc:  Likewise.
      	* testsuite/27_io/ios_manip_basefield.cc:  Likewise.
      	* testsuite/27_io/ios_manip_fmtflags.cc:  Likewise.
      	* testsuite/27_io/ios_members.cc:  Likewise.
      	* testsuite/27_io/istream_extractor_arith.cc:  Likewise.
      	* testsuite/27_io/istream_extractor_char.cc:  Likewise.
      	* testsuite/27_io/istream_extractor_other.cc:  Likewise.
      	* testsuite/27_io/istream_manip.cc:  Likewise.
      	* testsuite/27_io/istream_seeks.cc:  Likewise.
      	* testsuite/27_io/istream_sentry.cc:  Likewise.
      	* testsuite/27_io/istream_unformatted.cc:  Likewise.
      	* testsuite/27_io/istringstream_members.cc:  Likewise.
      	* testsuite/27_io/narrow_stream_objects.cc:  Likewise.
      	* testsuite/27_io/ofstream_members.cc:  Likewise.
      	* testsuite/27_io/ostream_inserter_arith.cc:  Likewise.
      	* testsuite/27_io/ostream_inserter_char.cc:  Likewise.
      	* testsuite/27_io/ostream_inserter_other.cc:  Likewise.
      	* testsuite/27_io/ostream_manip.cc:  Likewise.
      	* testsuite/27_io/ostream_seeks.cc:  Likewise.
      	* testsuite/27_io/ostream_unformatted.cc:  Likewise.
      	* testsuite/27_io/ostringstream_members.cc:  Likewise.
      	* testsuite/27_io/streambuf.cc:  Likewise.
      	* testsuite/27_io/stringbuf.cc:  Likewise.
      	* testsuite/27_io/stringbuf_virtuals.cc:  Likewise.
      	* testsuite/27_io/stringstream.cc:  Likewise.
      	* testsuite/27_io/stringstream_members.cc:  Likewise.
      	* testsuite/27_io/wide_stream_objects.cc:  Likewise.
      
      From-SVN: r44679
      Phil Edwards committed
    • varasm.c (assemble_constructor): Take a symbol_ref and a priority instead of a bare string. · 47907859
              * varasm.c (assemble_constructor): Take a symbol_ref and a
              priority instead of a bare string.  Move priority handling
              here from cp/decl2.c.
              * output.h: Update decls.
      
              * c-decl.c (c_expand_body): Update calls to assemble_constructor
              and assemble_destructor.
              * profile.c (output_func_start_profiler): Likewise.
              * objc/objc-act.c (finish_objc): Likewise.
              (build_module_descriptor): Return the symbol not the symbol name.
      
              * ch/grant.c (chill_finish_compile): Pass a symbol_ref and priority
              to assemble_constructor.
      
              * cp/decl2.c (finish_objects): Pass a symbol_ref and priority to
              assemble_{constructor,destructor}.  Remove priority handling.
      
              * java/class.c (emit_register_classes): Pass a symbol_ref and priority
              to assemble_constructor.
      
      From-SVN: r44678
      Richard Henderson committed
  3. 06 Aug, 2001 16 commits
  4. 05 Aug, 2001 4 commits
    • * cpplib.c (do_line): Update line number after pop_buffer. · 9765f972
      From-SVN: r44653
      Neil Booth committed
    • StringWriter.java: Merged with Classpath. · f3997ccf
      	* java/io/StringWriter.java: Merged with Classpath.
      	* java/io/InputStream.java: Merged with Classpath.
      	* java/io/OutputStream.java: Merged with Classpath.
      	* java/io/PushbackInputStream.java: Merged with Classpath.
      	* java/io/CharArrayReader.java: Merged with Classpath.
      	* java/io/CharArrayWriter.java: Merged with Classpath.
      
      From-SVN: r44652
      Tom Tromey committed
    • re PR preprocessor/3824 (With -traditional, CPP 0xffffffff > 0 but C 0xffffffff < 0) · 6604e6f3
      	PR preprocessor/3824
      	* line-map.c: Update comments.
      	* line-map.h: Update comments.
      	* tradcif.y: Don't consider large numbers unsigned.
      	* gcc.dg/cpp/tr-sign.c: New testcase.
      
      From-SVN: r44651
      Neil Booth committed
    • re PR preprocessor/3081 (Preprocessor merges 2 first lines when -imacros is being used) · 67821e3a
      	PR preprocessor/3081
      	* c-lex.c (map): New.
      	(cb_file_change): Update map and use it.
      	(cb_def_pragma, cb_define, cb_undef): Use map and line.
      	(c_lex): Update to use map.
      	* cpperror.c (print_location): Move to using logical line numbers.
      	* cppfiles.c (stack_include_file): Update for new _cpp_do_file_change.
      	(cpp_make_system_header): Similarly.
      	(_cpp_execute_include): Stop line numbering hacks.  Store the
      	line we will return to.
      	* cpphash.h (CPP_BUF_LINE): Remove.
      	(struct cpp_buffer): Remove lineno and pseudo_newlines.
      	Add map and return_to_line.
      	(_cpp_do_file_change): Update.
      	* cppinit.c (cpp_start_read): Update line kludge.
      	* cpplex.c (handle_newline): Don't update lineno and pseudo_newlines.
      	(trigraph_ok): Use logical line numbers for diagnostics.
      	(skip_block_comment): Likewise.
      	(skip_whitespace): Likewise.
      	(skip_line_comment): Use pfile->line instead.
      	(_cpp_lex_token): Update to use logical line numbering exclusively.
      	Handle BOL locally.  Accept new lines in directives, but keep
      	pfile->line decremented.  Diagnostics use logical lines.  Update
      	directive handling.
      	* cpplib.c (SEEN_EOL): New.
      	(skip_rest_of_line, check_eol): Use it.
      	(end_directive): Increase line number when accepting the newline
      	at the end of a directive.
      	(run_directive): Simplify.
      	(do_line): Bad LC_LEAVEs become LC_RENAMEs.  Update.
      	(_cpp_do_file_change): Update to take buffer line number as an
      	argument, and store the current map in the cpp_reader.  Remove
      	line number kludges.
      	(_cpp_do__Pragma): Restore output position after a _Pragma.
      	(cpp_push_buffer): Don't set output line or lineno.
      	(_cpp_pop_buffer): Transfer more info from a faked buffer.
      	Remove line kludge.  Set output_line.
      	* cppmacro.c (builtin_macro): Update handling of __LINE__.
      	(parse_arg): Use logical lines.
      	(save_lookahead_token): Save EOFs too now.
      	* cppmain.c (struct printer): Fix comments.
      	(printer_init): Simplify, let caller do errors.
      	(scan_translation_unit, check_multiline_token, dump_macro): Update.
      	(maybe_print_line): Simplify.
      	(print_line): Don't print a linemarker if -P.
      	(cb_define, cb_undef, cb_def_pragma, cb_ident, cb_include): Update.
      	(cb_file_change): Simplify.
      	* line-map.h (LAST_SOURCE_LINE): Fix.
      	(CURRENT_LINE_MAP): New.
      
      	* gcc.dg/cpp/19951025-1.c: Revert.
      	* gcc.dg/cpp/directiv.c: We no longer process directives that
      	interrupt macro arguments.
      
      From-SVN: r44650
      Neil Booth committed