r260955 - in /branches/c++-modules: ChangeLog.m...

[nathan at gcc dot gnu dot org]

Author: nathan
Date: Wed May 30 15:17:29 2018
New Revision: 260955

URL: https://gcc.gnu.org/viewcvs?rev=260955&root=gcc&view=rev
Log:
	Module location
	libcpp/
	* include/cpplib.h (cpp_module_file): Delete.
	* include/line-map.h (MAP_MODULE_P, LINEMAP_MODULE_SET_FROM): New.
	(linemap_module_loc): Declare.
	* files.c (cpp_module_file): Delete.
	* line-map.c (linemap_module_loc): New.
	gcc/cp/
	* cp-tree.h (module_file_nest): Delete.
	(make_module_loc, reseat_module_loc, module_from_loc): Declare.
	* lex.c (module_file_nest): Delete.
	(make_module_loc, reseat_module_loc, module_from_loc): New.
	* module.c (struct module_state): Replace imp_loc and self_loc
	with plain loc.
	(module_state::{push,pop}_location): Delete.
	(module_state::from_loc): New.
	(module_state::find_module): Set module loc here.
	(module_state::do_import): Adjust loc setting.
	(module_state::lazy_load): Likewise.
	(finish_module): Likewise.
	gcc/
	* diagnostic.c (diagnostic_report_current_module): Show module imports.
	gcc/testsuite/
	* lib/prune.exp: Prune 'module imported at'.
	* g++.dg/modules/atom-check-1_b.C: Adjust.
	* g++.dg/modules/circ-1_c.C: Adjust.
	* g++.dg/modules/flag-1_b.C: Adjust.
	* g++.dg/modules/import-2.C: Adjust.
	* g++.dg/modules/mod-decl-1.C: Adjust.
	* g++.dg/modules/mod-decl-2_b.C: Adjust.
	* g++.dg/modules/mod-stamp-1_d.C: Adjust.

Modified:
    branches/c++-modules/ChangeLog.modules
    branches/c++-modules/gcc/cp/cp-tree.h
    branches/c++-modules/gcc/cp/lex.c
    branches/c++-modules/gcc/cp/module.c
    branches/c++-modules/gcc/diagnostic.c
    branches/c++-modules/gcc/testsuite/g++.dg/modules/atom-check-1_b.C
    branches/c++-modules/gcc/testsuite/g++.dg/modules/circ-1_c.C
    branches/c++-modules/gcc/testsuite/g++.dg/modules/flag-1_b.C
    branches/c++-modules/gcc/testsuite/g++.dg/modules/import-2.C
    branches/c++-modules/gcc/testsuite/g++.dg/modules/mod-decl-1.C
    branches/c++-modules/gcc/testsuite/g++.dg/modules/mod-decl-2_b.C
    branches/c++-modules/gcc/testsuite/g++.dg/modules/mod-stamp-1_d.C
    branches/c++-modules/gcc/testsuite/lib/prune.exp
    branches/c++-modules/libcpp/files.c
    branches/c++-modules/libcpp/include/cpplib.h
    branches/c++-modules/libcpp/include/line-map.h
    branches/c++-modules/libcpp/line-map.c