Refactor resolution

gcc/rust/Make-lang.in

@@ -1,6 +1,6 @@
 # Make-lang.in -- Top level -*- makefile -*- fragment for GCC Rust frontend.
 
-# Copyright (C) 2009-2013 Free Software Foundation, Inc.
+# Copyright (C) 2009-2020 Free Software Foundation, Inc.
 
 # This file is part of GCC.
 
@@ -11,7 +11,7 @@
 
 # GCC is distributed in the hope that it will be useful,
 # but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.	See the
 # GNU General Public License for more details.
 
 # You should have received a copy of the GNU General Public License
@@ -54,7 +54,7 @@ gccrs$(exeext): $(GCCRS_D_OBJS) $(EXTRA_GCC_OBJS) libcommon-target.a $(LIBDEPS)
 	  $(GCCRS_D_OBJS) $(EXTRA_GCC_OBJS) libcommon-target.a \
 	  $(EXTRA_GCC_LIBS) $(LIBS)
 
-# List of host object files used by the rust language - files for translation from the parse tree 
+# List of host object files used by the rust language - files for translation from the parse tree
 # to GENERIC
 # The compiler proper, not driver
 GRS_OBJS = \
@@ -69,11 +69,12 @@ GRS_OBJS = \
     rust/rust-parse.o \
     rust/rust-ast-full-test.o \
     rust/rust-session-manager.o \
-    rust/rust-resolution.o \
+    rust/rust-name-resolution.o \
+    rust/rust-type-resolution.o \
     rust/rust-scan.o \
     rust/rust-compile.o \
     $(END)
-# removed object files from here 
+# removed object files from here
 
 rust_OBJS = $(GRS_OBJS) rust/rustspec.o
 
@@ -85,25 +86,25 @@ rust1$(exeext): $(GRS_OBJS) attribs.o  $(BACKEND) $(LIBDEPS)
 # Build hooks.
 
 # Copies its dependencies into the source directory. This generally should be used for generated files
-# such as Bison output files which are not version-controlled, but should be included in any release 
-# tarballs. This target will be executed during a bootstrap if ‘--enable-generated-files-in-srcdir’ 
-# was specified as a configure option. 
-rust.srcextra: 
+# such as Bison output files which are not version-controlled, but should be included in any release
+# tarballs. This target will be executed during a bootstrap if ‘--enable-generated-files-in-srcdir’
+# was specified as a configure option.
+rust.srcextra:
 
 rust.all.cross:
 
 # idk what this does but someone used it
 rust.start.encap: gccrs$(exeext)
 rust.rest.encap:
 
-# Build generated man pages for the front end from Texinfo manuals (see Man Page Generation), in the 
-# build directory. This target is only called if the necessary tools are available, but should ignore 
-# errors so as not to stop the build if errors occur; man pages are optional and the tools involved 
-# may be installed in a broken way. 
+# Build generated man pages for the front end from Texinfo manuals (see Man Page Generation), in the
+# build directory. This target is only called if the necessary tools are available, but should ignore
+# errors so as not to stop the build if errors occur; man pages are optional and the tools involved
+# may be installed in a broken way.
 rust.man:
 
 # Copies its dependencies into the source directory. These targets will be executed during a bootstrap
-# if ‘--enable-generated-files-in-srcdir’ was specified as a configure option. 
+# if ‘--enable-generated-files-in-srcdir’ was specified as a configure option.
 rust.srcman:
 
 # Clean hooks.
@@ -114,40 +115,40 @@ rust.mostlyclean:
 rust.clean: rust.mostlyclean
 
 # Builds an etags TAGS file in the language subdirectory in the source tree.
-# TODO: add more directories if I add more 
+# TODO: add more directories if I add more
 rust.tags: force
 	cd $(srcdir)/rust; \
 	etags -o TAGS.sub *.y *.l *.cc *.h ast/*.h ast/*.cc lex/*.h lex/*.cc parse/*.h parse/*.cc; \
 	etags --include TAGS.sub --include ../TAGS.sub
 
 # Build documentation hooks.
 
-# Build info documentation for the front end, in the build directory. This target is only called by 
-# ‘make bootstrap’ if a suitable version of makeinfo is available, so does not need to check for this, 
-# and should fail if an error occurs. 
-rust.info: 
+# Build info documentation for the front end, in the build directory. This target is only called by
+# ‘make bootstrap’ if a suitable version of makeinfo is available, so does not need to check for this,
+# and should fail if an error occurs.
+rust.info:
 
-rust.srcinfo: 
+rust.srcinfo:
 
-# Build DVI documentation for the front end, in the build directory. This should be done using 
-# $(TEXI2DVI), with appropriate -I arguments pointing to directories of included files. 
-rust.dvi: 
+# Build DVI documentation for the front end, in the build directory. This should be done using
+# $(TEXI2DVI), with appropriate -I arguments pointing to directories of included files.
+rust.dvi:
 
-# Build PDF documentation for the front end, in the build directory. This should be done using 
-# $(TEXI2PDF), with appropriate -I arguments pointing to directories of included files. 
-rust.pdf: 
+# Build PDF documentation for the front end, in the build directory. This should be done using
+# $(TEXI2PDF), with appropriate -I arguments pointing to directories of included files.
+rust.pdf:
 
-doc/rust.info: 
-doc/rust.dvi: 
-doc/rust.pdf: 
+doc/rust.info:
+doc/rust.dvi:
+doc/rust.pdf:
 
-# Build HTML documentation for the front end, in the build directory. 
-rust.html: 
+# Build HTML documentation for the front end, in the build directory.
+rust.html:
 
 # Install hooks.
 
-# Install everything that is part of the front end, apart from the compiler executables listed in 
-# compilers in config-lang.in. 
+# Install everything that is part of the front end, apart from the compiler executables listed in
+# compilers in config-lang.in.
 rust.install-common: installdirs
 #	-rm -f $(DESTDIR)$(bindir)/$(GCCRS_INSTALL_NAME)$(exeext)
 #	-rm -f $(DESTDIR)$(bindir)/$(GCCRS_TARGET_INSTALL_NAME)$(exeext)
@@ -164,11 +165,11 @@ rust.install-common: installdirs
 	( cd $(DESTDIR)$(bindir) && \
       $(LN) $(GCCRS_INSTALL_NAME)$(exeext) $(GCCRS_TARGET_INSTALL_NAME)$(exeext) ); \
 
-# Install headers needed for plugins. 
+# Install headers needed for plugins.
 rust.install-plugin:
 
-# Uninstall files installed by installing the compiler. This is currently documented not to be 
-# supported, so the hook need not do anything. 
+# Uninstall files installed by installing the compiler. This is currently documented not to be
+# supported, so the hook need not do anything.
 rust.uninstall:
 #	-rm -rf $(DESTDIR)/$(bindir)/$(GCCRS_INSTALL_NAME)$(exeext)
 	-rm -f gccrs$(exeext) grs1$(exeext)
@@ -178,13 +179,13 @@ rust.uninstall:
 # No rust-specific selftests
 selftest-rust:
 
-# Install info documentation for the front end, if it is present in the source directory. This target 
-# should have dependencies on info files that should be installed. 
-rust.install-info: 
+# Install info documentation for the front end, if it is present in the source directory. This target
+# should have dependencies on info files that should be installed.
+rust.install-info:
 
-rust.install-pdf: 
+rust.install-pdf:
 
-# Install man pages for the front end. This target should ignore errors. 
+# Install man pages for the front end. This target should ignore errors.
 rust.install-man:
 
 # Stage hooks: