r177883 - in /branches/pph/gcc: cp/ChangeLog.pp...

[gchare at gcc dot gnu dot org]

Author: gchare
Date: Thu Aug 18 21:55:42 2011
New Revision: 177883

URL: http://gcc.gnu.org/viewcvs?root=gcc&view=rev&rev=177883
Log:
Fixed streaming of child references, only reading in direct children, they are then responsible to read in their direct children and so on.

	* pph-streamer-in.c (pph_reading_includes): New.
	(pph_in_includes): Add logic to control pph_reading_includes.
	(pph_read_file_1): Only call pph_add_include if reading an include
	from the main file (not from pph_in_includes).
	(pph_read_file): Don't handle adding to pph_read_images here.
	(pph_reader_finish): Free pph_read_images.
	* pph-streamer-out.c (pph_tree_matches): Remove now unused STREAM
	parameter. Update all users.
	(pph_add_include): Changed signature to (stream, bool).
	Update all users.
	Handle adding INCLUDE to pph_read_images here.
	* gcc/cp/pph-streamer.c (pph_read_images): Moved here from
	pph-streamer-in.c
	(pph_stream_close): Free stream->encoder.w.includes.
	(pph_cache_lookup_in_includes): Lookup in pph_read_images.
	Remove now unused STREAM parameter.
	Update all users.
	(pph_cache_get): Index in pph_read_images.
	* pph-streamer.h (pph_stream): Move field includes to
	pph_stream.encoder.w.includes. Update all users.
	* gcc/cp/pph.c (pph_init): Initialize pph_read_images to NULL.
	(pph_finish): Fixed extra space typo.

	gcc/testsuite/ChangeLog.pph
	* g++.dg/pph/c2deepincl.cc: Remove asm xdiff.cp/ChangeLog.pph

Modified:
    branches/pph/gcc/cp/ChangeLog.pph
    branches/pph/gcc/cp/pph-streamer-in.c
    branches/pph/gcc/cp/pph-streamer-out.c
    branches/pph/gcc/cp/pph-streamer.c
    branches/pph/gcc/cp/pph-streamer.h
    branches/pph/gcc/cp/pph.c
    branches/pph/gcc/testsuite/ChangeLog.pph
    branches/pph/gcc/testsuite/g++.dg/pph/c2deepincl.cc