Add in a toplevel pass to grab global declarations for analysis pass

7 files changed, 817 insertions, 8 deletions

diff --git a/gcc/rust/Make-lang.in b/gcc/rust/Make-lang.in
index 0b867a4..d954e97 100644
--- a/gcc/rust/Make-lang.in
+++ b/gcc/rust/Make-lang.in
@@ -70,6 +70,7 @@ GRS_OBJS = \
     rust/rust-ast-full-test.o \
     rust/rust-session-manager.o \
     rust/rust-resolution.o \
+    rust/rust-scan.o \
     rust/rust-compile.o \
     $(END)
 # removed object files from here 
diff --git a/gcc/rust/analysis/rust-resolution.cc b/gcc/rust/analysis/rust-resolution.cc
index 8d53567..731801a 100644
--- a/gcc/rust/analysis/rust-resolution.cc
+++ b/gcc/rust/analysis/rust-resolution.cc
@@ -19,7 +19,8 @@
 namespace Rust {
 namespace Analysis {
 
-TypeResolution::TypeResolution (AST::Crate &crate) : crate (crate)
+TypeResolution::TypeResolution (AST::Crate &crate, TopLevelScan &toplevel)
+  : crate (crate), toplevel (toplevel)
 {
   typeScope.Push ();
   scope.Push ();
@@ -50,9 +51,9 @@ TypeResolution::~TypeResolution ()
 }
 
 bool
-TypeResolution::ResolveNamesAndTypes (AST::Crate &crate)
+TypeResolution::ResolveNamesAndTypes (AST::Crate &crate, TopLevelScan &toplevel)
 {
-  TypeResolution resolver (crate);
+  TypeResolution resolver (crate, toplevel);
   return resolver.go ();
 }
 
@@ -315,7 +316,11 @@ TypeResolution::visit (AST::AssignmentExpr &expr)
   // scope will require knowledge of the type
 
   // do the lhsType and the rhsType match
-  typesAreCompatible (lhsType, rhsType, expr.right_expr->get_locus_slow ());
+  if (!typesAreCompatible (lhsType, rhsType,
+			   expr.right_expr->get_locus_slow ()))
+    return;
+
+  // is the lhs mutable?
 }
 
 void
diff --git a/gcc/rust/analysis/rust-resolution.h b/gcc/rust/analysis/rust-resolution.h
index 51b2d6a..44b5db5 100644
--- a/gcc/rust/analysis/rust-resolution.h
+++ b/gcc/rust/analysis/rust-resolution.h
@@ -3,6 +3,7 @@
 #include "rust-system.h"
 #include "rust-ast-full.h"
 #include "rust-ast-visitor.h"
+#include "rust-scan.h"
 #include "scope.h"
 
 namespace Rust {
@@ -11,7 +12,7 @@ namespace Analysis {
 class TypeResolution : public AST::ASTVisitor
 {
 public:
-  static bool ResolveNamesAndTypes (AST::Crate &crate);
+  static bool ResolveNamesAndTypes (AST::Crate &crate, TopLevelScan &toplevel);
 
   ~TypeResolution ();
 
@@ -221,7 +222,7 @@ public:
   virtual void visit (AST::BareFunctionType &type);
 
 private:
-  TypeResolution (AST::Crate &crate);
+  TypeResolution (AST::Crate &crate, TopLevelScan &toplevel);
 
   bool go ();
 
@@ -230,6 +231,7 @@ private:
   Scope<AST::Type *> scope;
   Scope<AST::Type *> typeScope;
   AST::Crate &crate;
+  TopLevelScan &toplevel;
 
   std::vector<AST::IdentifierPattern> letPatternBuffer;
   std::vector<AST::Type *> typeBuffer;
diff --git a/gcc/rust/analysis/rust-scan.cc b/gcc/rust/analysis/rust-scan.cc
new file mode 100644
index 0000000..d579f0d
--- /dev/null
+++ b/gcc/rust/analysis/rust-scan.cc
@@ -0,0 +1,571 @@
+#include "rust-scan.h"
+#include "rust-diagnostics.h"
+
+namespace Rust {
+namespace Analysis {
+
+TopLevelScan::TopLevelScan (AST::Crate &crate) : crate (crate)
+{
+  for (auto &item : crate.items)
+    item->accept_vis (*this);
+}
+
+TopLevelScan::~TopLevelScan () {}
+
+void
+TopLevelScan::visit (AST::Token &tok)
+{}
+
+void
+TopLevelScan::visit (AST::DelimTokenTree &delim_tok_tree)
+{}
+
+void
+TopLevelScan::visit (AST::AttrInputMetaItemContainer &input)
+{}
+
+void
+TopLevelScan::visit (AST::IdentifierExpr &ident_expr)
+{}
+
+void
+TopLevelScan::visit (AST::Lifetime &lifetime)
+{}
+
+void
+TopLevelScan::visit (AST::LifetimeParam &lifetime_param)
+{}
+
+void
+TopLevelScan::visit (AST::MacroInvocationSemi &macro)
+{}
+
+// rust-path.h
+void
+TopLevelScan::visit (AST::PathInExpression &path)
+{}
+
+void
+TopLevelScan::visit (AST::TypePathSegment &segment)
+{}
+void
+TopLevelScan::visit (AST::TypePathSegmentGeneric &segment)
+{}
+
+void
+TopLevelScan::visit (AST::TypePathSegmentFunction &segment)
+{}
+
+void
+TopLevelScan::visit (AST::TypePath &path)
+{}
+
+void
+TopLevelScan::visit (AST::QualifiedPathInExpression &path)
+{}
+
+void
+TopLevelScan::visit (AST::QualifiedPathInType &path)
+{}
+
+// rust-expr.h
+void
+TopLevelScan::visit (AST::LiteralExpr &expr)
+{}
+
+void
+TopLevelScan::visit (AST::AttrInputLiteral &attr_input)
+{}
+
+void
+TopLevelScan::visit (AST::MetaItemLitExpr &meta_item)
+{}
+
+void
+TopLevelScan::visit (AST::MetaItemPathLit &meta_item)
+{}
+
+void
+TopLevelScan::visit (AST::BorrowExpr &expr)
+{}
+void
+TopLevelScan::visit (AST::DereferenceExpr &expr)
+{}
+void
+TopLevelScan::visit (AST::ErrorPropagationExpr &expr)
+{}
+void
+TopLevelScan::visit (AST::NegationExpr &expr)
+{}
+
+void
+TopLevelScan::visit (AST::ArithmeticOrLogicalExpr &expr)
+{}
+
+void
+TopLevelScan::visit (AST::ComparisonExpr &expr)
+{}
+
+void
+TopLevelScan::visit (AST::LazyBooleanExpr &expr)
+{}
+
+void
+TopLevelScan::visit (AST::TypeCastExpr &expr)
+{}
+
+void
+TopLevelScan::visit (AST::AssignmentExpr &expr)
+{}
+
+void
+TopLevelScan::visit (AST::CompoundAssignmentExpr &expr)
+{}
+
+void
+TopLevelScan::visit (AST::GroupedExpr &expr)
+{}
+// void TopLevelScan::visit(ArrayElems& elems) {}
+void
+TopLevelScan::visit (AST::ArrayElemsValues &elems)
+{}
+void
+TopLevelScan::visit (AST::ArrayElemsCopied &elems)
+{}
+void
+TopLevelScan::visit (AST::ArrayExpr &expr)
+{}
+void
+TopLevelScan::visit (AST::ArrayIndexExpr &expr)
+{}
+void
+TopLevelScan::visit (AST::TupleExpr &expr)
+{}
+void
+TopLevelScan::visit (AST::TupleIndexExpr &expr)
+{}
+void
+TopLevelScan::visit (AST::StructExprStruct &expr)
+{}
+// void TopLevelScan::visit(StructExprField& field) {}
+void
+TopLevelScan::visit (AST::StructExprFieldIdentifier &field)
+{}
+void
+TopLevelScan::visit (AST::StructExprFieldIdentifierValue &field)
+{}
+void
+TopLevelScan::visit (AST::StructExprFieldIndexValue &field)
+{}
+void
+TopLevelScan::visit (AST::StructExprStructFields &expr)
+{}
+void
+TopLevelScan::visit (AST::StructExprStructBase &expr)
+{}
+void
+TopLevelScan::visit (AST::StructExprTuple &expr)
+{}
+void
+TopLevelScan::visit (AST::StructExprUnit &expr)
+{}
+// void TopLevelScan::visit(EnumExprField& field) {}
+void
+TopLevelScan::visit (AST::EnumExprFieldIdentifier &field)
+{}
+void
+TopLevelScan::visit (AST::EnumExprFieldIdentifierValue &field)
+{}
+void
+TopLevelScan::visit (AST::EnumExprFieldIndexValue &field)
+{}
+void
+TopLevelScan::visit (AST::EnumExprStruct &expr)
+{}
+void
+TopLevelScan::visit (AST::EnumExprTuple &expr)
+{}
+void
+TopLevelScan::visit (AST::EnumExprFieldless &expr)
+{}
+
+void
+TopLevelScan::visit (AST::CallExpr &expr)
+{}
+
+void
+TopLevelScan::visit (AST::MethodCallExpr &expr)
+{}
+void
+TopLevelScan::visit (AST::FieldAccessExpr &expr)
+{}
+void
+TopLevelScan::visit (AST::ClosureExprInner &expr)
+{}
+void
+TopLevelScan::visit (AST::BlockExpr &expr)
+{}
+void
+TopLevelScan::visit (AST::ClosureExprInnerTyped &expr)
+{}
+void
+TopLevelScan::visit (AST::ContinueExpr &expr)
+{}
+void
+TopLevelScan::visit (AST::BreakExpr &expr)
+{}
+void
+TopLevelScan::visit (AST::RangeFromToExpr &expr)
+{}
+void
+TopLevelScan::visit (AST::RangeFromExpr &expr)
+{}
+void
+TopLevelScan::visit (AST::RangeToExpr &expr)
+{}
+void
+TopLevelScan::visit (AST::RangeFullExpr &expr)
+{}
+void
+TopLevelScan::visit (AST::RangeFromToInclExpr &expr)
+{}
+void
+TopLevelScan::visit (AST::RangeToInclExpr &expr)
+{}
+void
+TopLevelScan::visit (AST::ReturnExpr &expr)
+{}
+void
+TopLevelScan::visit (AST::UnsafeBlockExpr &expr)
+{}
+void
+TopLevelScan::visit (AST::LoopExpr &expr)
+{}
+void
+TopLevelScan::visit (AST::WhileLoopExpr &expr)
+{}
+void
+TopLevelScan::visit (AST::WhileLetLoopExpr &expr)
+{}
+void
+TopLevelScan::visit (AST::ForLoopExpr &expr)
+{}
+void
+TopLevelScan::visit (AST::IfExpr &expr)
+{}
+void
+TopLevelScan::visit (AST::IfExprConseqElse &expr)
+{}
+void
+TopLevelScan::visit (AST::IfExprConseqIf &expr)
+{}
+void
+TopLevelScan::visit (AST::IfExprConseqIfLet &expr)
+{}
+void
+TopLevelScan::visit (AST::IfLetExpr &expr)
+{}
+void
+TopLevelScan::visit (AST::IfLetExprConseqElse &expr)
+{}
+void
+TopLevelScan::visit (AST::IfLetExprConseqIf &expr)
+{}
+void
+TopLevelScan::visit (AST::IfLetExprConseqIfLet &expr)
+{}
+// void TopLevelScan::visit(MatchCase& match_case) {}
+void
+TopLevelScan::visit (AST::MatchCaseBlockExpr &match_case)
+{}
+void
+TopLevelScan::visit (AST::MatchCaseExpr &match_case)
+{}
+void
+TopLevelScan::visit (AST::MatchExpr &expr)
+{}
+void
+TopLevelScan::visit (AST::AwaitExpr &expr)
+{}
+void
+TopLevelScan::visit (AST::AsyncBlockExpr &expr)
+{}
+
+// rust-item.h
+void
+TopLevelScan::visit (AST::TypeParam &param)
+{}
+// void TopLevelScan::visit(WhereClauseItem& item) {}
+void
+TopLevelScan::visit (AST::LifetimeWhereClauseItem &item)
+{}
+void
+TopLevelScan::visit (AST::TypeBoundWhereClauseItem &item)
+{}
+void
+TopLevelScan::visit (AST::Method &method)
+{}
+void
+TopLevelScan::visit (AST::ModuleBodied &module)
+{}
+void
+TopLevelScan::visit (AST::ModuleNoBody &module)
+{}
+void
+TopLevelScan::visit (AST::ExternCrate &crate)
+{}
+// void TopLevelScan::visit(UseTree& use_tree) {}
+void
+TopLevelScan::visit (AST::UseTreeGlob &use_tree)
+{}
+void
+TopLevelScan::visit (AST::UseTreeList &use_tree)
+{}
+void
+TopLevelScan::visit (AST::UseTreeRebind &use_tree)
+{}
+void
+TopLevelScan::visit (AST::UseDeclaration &use_decl)
+{}
+
+void
+TopLevelScan::visit (AST::Function &function)
+{
+  functions[function.function_name] = &function;
+}
+
+void
+TopLevelScan::visit (AST::TypeAlias &type_alias)
+{}
+void
+TopLevelScan::visit (AST::StructStruct &struct_item)
+{}
+void
+TopLevelScan::visit (AST::TupleStruct &tuple_struct)
+{}
+void
+TopLevelScan::visit (AST::EnumItem &item)
+{}
+void
+TopLevelScan::visit (AST::EnumItemTuple &item)
+{}
+void
+TopLevelScan::visit (AST::EnumItemStruct &item)
+{}
+void
+TopLevelScan::visit (AST::EnumItemDiscriminant &item)
+{}
+void
+TopLevelScan::visit (AST::Enum &enum_item)
+{}
+void
+TopLevelScan::visit (AST::Union &union_item)
+{}
+
+void
+TopLevelScan::visit (AST::ConstantItem &const_item)
+{}
+
+void
+TopLevelScan::visit (AST::StaticItem &static_item)
+{}
+void
+TopLevelScan::visit (AST::TraitItemFunc &item)
+{}
+void
+TopLevelScan::visit (AST::TraitItemMethod &item)
+{}
+void
+TopLevelScan::visit (AST::TraitItemConst &item)
+{}
+void
+TopLevelScan::visit (AST::TraitItemType &item)
+{}
+void
+TopLevelScan::visit (AST::Trait &trait)
+{}
+void
+TopLevelScan::visit (AST::InherentImpl &impl)
+{}
+void
+TopLevelScan::visit (AST::TraitImpl &impl)
+{}
+// void TopLevelScan::visit(ExternalItem& item) {}
+void
+TopLevelScan::visit (AST::ExternalStaticItem &item)
+{}
+void
+TopLevelScan::visit (AST::ExternalFunctionItem &item)
+{}
+void
+TopLevelScan::visit (AST::ExternBlock &block)
+{}
+
+// rust-macro.h
+void
+TopLevelScan::visit (AST::MacroMatchFragment &match)
+{}
+void
+TopLevelScan::visit (AST::MacroMatchRepetition &match)
+{}
+void
+TopLevelScan::visit (AST::MacroMatcher &matcher)
+{}
+void
+TopLevelScan::visit (AST::MacroRulesDefinition &rules_def)
+{}
+void
+TopLevelScan::visit (AST::MacroInvocation &macro_invoc)
+{}
+void
+TopLevelScan::visit (AST::MetaItemPath &meta_item)
+{}
+void
+TopLevelScan::visit (AST::MetaItemSeq &meta_item)
+{}
+void
+TopLevelScan::visit (AST::MetaWord &meta_item)
+{}
+void
+TopLevelScan::visit (AST::MetaNameValueStr &meta_item)
+{}
+void
+TopLevelScan::visit (AST::MetaListPaths &meta_item)
+{}
+void
+TopLevelScan::visit (AST::MetaListNameValueStr &meta_item)
+{}
+
+// rust-pattern.h
+void
+TopLevelScan::visit (AST::LiteralPattern &pattern)
+{}
+
+void
+TopLevelScan::visit (AST::IdentifierPattern &pattern)
+{}
+
+void
+TopLevelScan::visit (AST::WildcardPattern &pattern)
+{}
+// void TopLevelScan::visit(RangePatternBound& bound) {}
+void
+TopLevelScan::visit (AST::RangePatternBoundLiteral &bound)
+{}
+void
+TopLevelScan::visit (AST::RangePatternBoundPath &bound)
+{}
+void
+TopLevelScan::visit (AST::RangePatternBoundQualPath &bound)
+{}
+void
+TopLevelScan::visit (AST::RangePattern &pattern)
+{}
+void
+TopLevelScan::visit (AST::ReferencePattern &pattern)
+{}
+// void TopLevelScan::visit(StructPatternField& field) {}
+void
+TopLevelScan::visit (AST::StructPatternFieldTuplePat &field)
+{}
+void
+TopLevelScan::visit (AST::StructPatternFieldIdentPat &field)
+{}
+void
+TopLevelScan::visit (AST::StructPatternFieldIdent &field)
+{}
+void
+TopLevelScan::visit (AST::StructPattern &pattern)
+{}
+// void TopLevelScan::visit(TupleStructItems& tuple_items) {}
+void
+TopLevelScan::visit (AST::TupleStructItemsNoRange &tuple_items)
+{}
+void
+TopLevelScan::visit (AST::TupleStructItemsRange &tuple_items)
+{}
+void
+TopLevelScan::visit (AST::TupleStructPattern &pattern)
+{}
+// void TopLevelScan::visit(TuplePatternItems& tuple_items) {}
+void
+TopLevelScan::visit (AST::TuplePatternItemsMultiple &tuple_items)
+{}
+void
+TopLevelScan::visit (AST::TuplePatternItemsRanged &tuple_items)
+{}
+void
+TopLevelScan::visit (AST::TuplePattern &pattern)
+{}
+void
+TopLevelScan::visit (AST::GroupedPattern &pattern)
+{}
+void
+TopLevelScan::visit (AST::SlicePattern &pattern)
+{}
+
+// rust-stmt.h
+void
+TopLevelScan::visit (AST::EmptyStmt &stmt)
+{}
+
+void
+TopLevelScan::visit (AST::LetStmt &stmt)
+{}
+
+void
+TopLevelScan::visit (AST::ExprStmtWithoutBlock &stmt)
+{}
+
+void
+TopLevelScan::visit (AST::ExprStmtWithBlock &stmt)
+{}
+
+// rust-type.h
+void
+TopLevelScan::visit (AST::TraitBound &bound)
+{}
+
+void
+TopLevelScan::visit (AST::ImplTraitType &type)
+{}
+
+void
+TopLevelScan::visit (AST::TraitObjectType &type)
+{}
+void
+TopLevelScan::visit (AST::ParenthesisedType &type)
+{}
+void
+TopLevelScan::visit (AST::ImplTraitTypeOneBound &type)
+{}
+void
+TopLevelScan::visit (AST::TraitObjectTypeOneBound &type)
+{}
+void
+TopLevelScan::visit (AST::TupleType &type)
+{}
+void
+TopLevelScan::visit (AST::NeverType &type)
+{}
+void
+TopLevelScan::visit (AST::RawPointerType &type)
+{}
+void
+TopLevelScan::visit (AST::ReferenceType &type)
+{}
+void
+TopLevelScan::visit (AST::ArrayType &type)
+{}
+void
+TopLevelScan::visit (AST::SliceType &type)
+{}
+void
+TopLevelScan::visit (AST::InferredType &type)
+{}
+void
+TopLevelScan::visit (AST::BareFunctionType &type)
+{}
+
+} // namespace Analysis
+} // namespace Rust
diff --git a/gcc/rust/analysis/rust-scan.h b/gcc/rust/analysis/rust-scan.h
new file mode 100644
index 0000000..ccd41fe
--- /dev/null
+++ b/gcc/rust/analysis/rust-scan.h
@@ -0,0 +1,229 @@
+#pragma once
+
+#include "rust-system.h"
+#include "rust-ast-full.h"
+#include "rust-ast-visitor.h"
+#include "scope.h"
+
+namespace Rust {
+namespace Analysis {
+
+class TopLevelScan : public AST::ASTVisitor
+{
+public:
+  TopLevelScan (AST::Crate &crate);
+
+  ~TopLevelScan ();
+
+  // visitor impl
+  // rust-ast.h
+  // virtual void visit(AttrInput& attr_input);
+  // virtual void visit(TokenTree& token_tree);
+  // virtual void visit(MacroMatch& macro_match);
+  virtual void visit (AST::Token &tok);
+  virtual void visit (AST::DelimTokenTree &delim_tok_tree);
+  virtual void visit (AST::AttrInputMetaItemContainer &input);
+  // virtual void visit(MetaItem& meta_item);
+  // virtual void vsit(Stmt& stmt);
+  // virtual void visit(Expr& expr);
+  virtual void visit (AST::IdentifierExpr &ident_expr);
+  // virtual void visit(Pattern& pattern);
+  // virtual void visit(Type& type);
+  // virtual void visit(TypeParamBound& type_param_bound);
+  virtual void visit (AST::Lifetime &lifetime);
+  // virtual void visit(GenericParam& generic_param);
+  virtual void visit (AST::LifetimeParam &lifetime_param);
+  // virtual void visit(TraitItem& trait_item);
+  // virtual void visit(InherentImplItem& inherent_impl_item);
+  // virtual void visit(TraitImplItem& trait_impl_item);
+  virtual void visit (AST::MacroInvocationSemi &macro);
+
+  // rust-path.h
+  virtual void visit (AST::PathInExpression &path);
+  virtual void visit (AST::TypePathSegment &segment);
+  virtual void visit (AST::TypePathSegmentGeneric &segment);
+  virtual void visit (AST::TypePathSegmentFunction &segment);
+  virtual void visit (AST::TypePath &path);
+  virtual void visit (AST::QualifiedPathInExpression &path);
+  virtual void visit (AST::QualifiedPathInType &path);
+
+  // rust-expr.h
+  virtual void visit (AST::LiteralExpr &expr);
+  virtual void visit (AST::AttrInputLiteral &attr_input);
+  virtual void visit (AST::MetaItemLitExpr &meta_item);
+  virtual void visit (AST::MetaItemPathLit &meta_item);
+  virtual void visit (AST::BorrowExpr &expr);
+  virtual void visit (AST::DereferenceExpr &expr);
+  virtual void visit (AST::ErrorPropagationExpr &expr);
+  virtual void visit (AST::NegationExpr &expr);
+  virtual void visit (AST::ArithmeticOrLogicalExpr &expr);
+  virtual void visit (AST::ComparisonExpr &expr);
+  virtual void visit (AST::LazyBooleanExpr &expr);
+  virtual void visit (AST::TypeCastExpr &expr);
+  virtual void visit (AST::AssignmentExpr &expr);
+  virtual void visit (AST::CompoundAssignmentExpr &expr);
+  virtual void visit (AST::GroupedExpr &expr);
+  // virtual void visit(ArrayElems& elems);
+  virtual void visit (AST::ArrayElemsValues &elems);
+  virtual void visit (AST::ArrayElemsCopied &elems);
+  virtual void visit (AST::ArrayExpr &expr);
+  virtual void visit (AST::ArrayIndexExpr &expr);
+  virtual void visit (AST::TupleExpr &expr);
+  virtual void visit (AST::TupleIndexExpr &expr);
+  virtual void visit (AST::StructExprStruct &expr);
+  // virtual void visit(StructExprField& field);
+  virtual void visit (AST::StructExprFieldIdentifier &field);
+  virtual void visit (AST::StructExprFieldIdentifierValue &field);
+  virtual void visit (AST::StructExprFieldIndexValue &field);
+  virtual void visit (AST::StructExprStructFields &expr);
+  virtual void visit (AST::StructExprStructBase &expr);
+  virtual void visit (AST::StructExprTuple &expr);
+  virtual void visit (AST::StructExprUnit &expr);
+  // virtual void visit(EnumExprField& field);
+  virtual void visit (AST::EnumExprFieldIdentifier &field);
+  virtual void visit (AST::EnumExprFieldIdentifierValue &field);
+  virtual void visit (AST::EnumExprFieldIndexValue &field);
+  virtual void visit (AST::EnumExprStruct &expr);
+  virtual void visit (AST::EnumExprTuple &expr);
+  virtual void visit (AST::EnumExprFieldless &expr);
+  virtual void visit (AST::CallExpr &expr);
+  virtual void visit (AST::MethodCallExpr &expr);
+  virtual void visit (AST::FieldAccessExpr &expr);
+  virtual void visit (AST::ClosureExprInner &expr);
+  virtual void visit (AST::BlockExpr &expr);
+  virtual void visit (AST::ClosureExprInnerTyped &expr);
+  virtual void visit (AST::ContinueExpr &expr);
+  virtual void visit (AST::BreakExpr &expr);
+  virtual void visit (AST::RangeFromToExpr &expr);
+  virtual void visit (AST::RangeFromExpr &expr);
+  virtual void visit (AST::RangeToExpr &expr);
+  virtual void visit (AST::RangeFullExpr &expr);
+  virtual void visit (AST::RangeFromToInclExpr &expr);
+  virtual void visit (AST::RangeToInclExpr &expr);
+  virtual void visit (AST::ReturnExpr &expr);
+  virtual void visit (AST::UnsafeBlockExpr &expr);
+  virtual void visit (AST::LoopExpr &expr);
+  virtual void visit (AST::WhileLoopExpr &expr);
+  virtual void visit (AST::WhileLetLoopExpr &expr);
+  virtual void visit (AST::ForLoopExpr &expr);
+  virtual void visit (AST::IfExpr &expr);
+  virtual void visit (AST::IfExprConseqElse &expr);
+  virtual void visit (AST::IfExprConseqIf &expr);
+  virtual void visit (AST::IfExprConseqIfLet &expr);
+  virtual void visit (AST::IfLetExpr &expr);
+  virtual void visit (AST::IfLetExprConseqElse &expr);
+  virtual void visit (AST::IfLetExprConseqIf &expr);
+  virtual void visit (AST::IfLetExprConseqIfLet &expr);
+  // virtual void visit(MatchCase& match_case);
+  virtual void visit (AST::MatchCaseBlockExpr &match_case);
+  virtual void visit (AST::MatchCaseExpr &match_case);
+  virtual void visit (AST::MatchExpr &expr);
+  virtual void visit (AST::AwaitExpr &expr);
+  virtual void visit (AST::AsyncBlockExpr &expr);
+
+  // rust-item.h
+  virtual void visit (AST::TypeParam &param);
+  // virtual void visit(WhereClauseItem& item);
+  virtual void visit (AST::LifetimeWhereClauseItem &item);
+  virtual void visit (AST::TypeBoundWhereClauseItem &item);
+  virtual void visit (AST::Method &method);
+  virtual void visit (AST::ModuleBodied &module);
+  virtual void visit (AST::ModuleNoBody &module);
+  virtual void visit (AST::ExternCrate &crate);
+  // virtual void visit(UseTree& use_tree);
+  virtual void visit (AST::UseTreeGlob &use_tree);
+  virtual void visit (AST::UseTreeList &use_tree);
+  virtual void visit (AST::UseTreeRebind &use_tree);
+  virtual void visit (AST::UseDeclaration &use_decl);
+  virtual void visit (AST::Function &function);
+  virtual void visit (AST::TypeAlias &type_alias);
+  virtual void visit (AST::StructStruct &struct_item);
+  virtual void visit (AST::TupleStruct &tuple_struct);
+  virtual void visit (AST::EnumItem &item);
+  virtual void visit (AST::EnumItemTuple &item);
+  virtual void visit (AST::EnumItemStruct &item);
+  virtual void visit (AST::EnumItemDiscriminant &item);
+  virtual void visit (AST::Enum &enum_item);
+  virtual void visit (AST::Union &union_item);
+  virtual void visit (AST::ConstantItem &const_item);
+  virtual void visit (AST::StaticItem &static_item);
+  virtual void visit (AST::TraitItemFunc &item);
+  virtual void visit (AST::TraitItemMethod &item);
+  virtual void visit (AST::TraitItemConst &item);
+  virtual void visit (AST::TraitItemType &item);
+  virtual void visit (AST::Trait &trait);
+  virtual void visit (AST::InherentImpl &impl);
+  virtual void visit (AST::TraitImpl &impl);
+  // virtual void visit(ExternalItem& item);
+  virtual void visit (AST::ExternalStaticItem &item);
+  virtual void visit (AST::ExternalFunctionItem &item);
+  virtual void visit (AST::ExternBlock &block);
+
+  // rust-macro.h
+  virtual void visit (AST::MacroMatchFragment &match);
+  virtual void visit (AST::MacroMatchRepetition &match);
+  virtual void visit (AST::MacroMatcher &matcher);
+  virtual void visit (AST::MacroRulesDefinition &rules_def);
+  virtual void visit (AST::MacroInvocation &macro_invoc);
+  virtual void visit (AST::MetaItemPath &meta_item);
+  virtual void visit (AST::MetaItemSeq &meta_item);
+  virtual void visit (AST::MetaWord &meta_item);
+  virtual void visit (AST::MetaNameValueStr &meta_item);
+  virtual void visit (AST::MetaListPaths &meta_item);
+  virtual void visit (AST::MetaListNameValueStr &meta_item);
+
+  // rust-pattern.h
+  virtual void visit (AST::LiteralPattern &pattern);
+  virtual void visit (AST::IdentifierPattern &pattern);
+  virtual void visit (AST::WildcardPattern &pattern);
+  // virtual void visit(RangePatternBound& bound);
+  virtual void visit (AST::RangePatternBoundLiteral &bound);
+  virtual void visit (AST::RangePatternBoundPath &bound);
+  virtual void visit (AST::RangePatternBoundQualPath &bound);
+  virtual void visit (AST::RangePattern &pattern);
+  virtual void visit (AST::ReferencePattern &pattern);
+  // virtual void visit(StructPatternField& field);
+  virtual void visit (AST::StructPatternFieldTuplePat &field);
+  virtual void visit (AST::StructPatternFieldIdentPat &field);
+  virtual void visit (AST::StructPatternFieldIdent &field);
+  virtual void visit (AST::StructPattern &pattern);
+  // virtual void visit(TupleStructItems& tuple_items);
+  virtual void visit (AST::TupleStructItemsNoRange &tuple_items);
+  virtual void visit (AST::TupleStructItemsRange &tuple_items);
+  virtual void visit (AST::TupleStructPattern &pattern);
+  // virtual void visit(TuplePatternItems& tuple_items);
+  virtual void visit (AST::TuplePatternItemsMultiple &tuple_items);
+  virtual void visit (AST::TuplePatternItemsRanged &tuple_items);
+  virtual void visit (AST::TuplePattern &pattern);
+  virtual void visit (AST::GroupedPattern &pattern);
+  virtual void visit (AST::SlicePattern &pattern);
+
+  // rust-stmt.h
+  virtual void visit (AST::EmptyStmt &stmt);
+  virtual void visit (AST::LetStmt &stmt);
+  virtual void visit (AST::ExprStmtWithoutBlock &stmt);
+  virtual void visit (AST::ExprStmtWithBlock &stmt);
+
+  // rust-type.h
+  virtual void visit (AST::TraitBound &bound);
+  virtual void visit (AST::ImplTraitType &type);
+  virtual void visit (AST::TraitObjectType &type);
+  virtual void visit (AST::ParenthesisedType &type);
+  virtual void visit (AST::ImplTraitTypeOneBound &type);
+  virtual void visit (AST::TraitObjectTypeOneBound &type);
+  virtual void visit (AST::TupleType &type);
+  virtual void visit (AST::NeverType &type);
+  virtual void visit (AST::RawPointerType &type);
+  virtual void visit (AST::ReferenceType &type);
+  virtual void visit (AST::ArrayType &type);
+  virtual void visit (AST::SliceType &type);
+  virtual void visit (AST::InferredType &type);
+  virtual void visit (AST::BareFunctionType &type);
+
+private:
+  std::map<std::string, AST::Function *> functions;
+  AST::Crate &crate;
+};
+
+} // namespace Analysis
+} // namespace Rust
diff --git a/gcc/rust/backend/rust-compile.cc b/gcc/rust/backend/rust-compile.cc
index 38217f0..19f5025 100644
--- a/gcc/rust/backend/rust-compile.cc
+++ b/gcc/rust/backend/rust-compile.cc
@@ -361,7 +361,6 @@ Compilation::visit (AST::Function &function)
       printf ("FUNC PARAM: %s\n", param.as_string ().c_str ());
       // TODO
     }
-
   if (parameters.size () != function.function_params.size ())
     {
       rust_error_at (function.locus,
diff --git a/gcc/rust/rust-session-manager.cc b/gcc/rust/rust-session-manager.cc
index 1e49271..2e0f3e9 100644
--- a/gcc/rust/rust-session-manager.cc
+++ b/gcc/rust/rust-session-manager.cc
@@ -9,6 +9,7 @@
 
 #include "rust-lex.h"
 #include "rust-parse.h"
+#include "rust-scan.h"
 #include "rust-resolution.h"
 #include "rust-compile.h"
 
@@ -752,7 +753,8 @@ void
 Session::name_resolution (AST::Crate &crate)
 {
   fprintf (stderr, "started name resolution\n");
-  Analysis::TypeResolution::ResolveNamesAndTypes (crate);
+  Analysis::TopLevelScan toplevel (crate);
+  Analysis::TypeResolution::ResolveNamesAndTypes (crate, toplevel);
   fprintf (stderr, "finished name resolution\n");
 }