Changeset 18e683b for src/ResolvExpr

Timestamp:

Jun 24, 2019, 11:11:59 AM (5 years ago)

Author:

Aaron Moss <a3moss@…>

Branches:

ADT, arm-eh, ast-experimental, enum, forall-pointer-decay, jacob/cs343-translation, jenkins-sandbox, master, new-ast, new-ast-unique-expr, pthread-emulation, qualifiedEnum

Children:

c1ea11b

Parents:

8d61d620

Message:

Port LinkReferenceToTypes? pass

Location:

src/ResolvExpr

Files:

• CandidateFinder.cpp (modified) (2 diffs)
• Resolver.cc (modified) (2 diffs)
• Resolver.h (modified) (2 diffs)

src/ResolvExpr/CandidateFinder.cpp

@@ -1003 +1003 @@
                         assert( toType );
                         toType = resolveTypeof( toType, symtab );
-                        toType = SymTab::validateType( toType, symtab );
+                        toType = SymTab::validateType( castExpr->location, toType, symtab );
                         toType = adjustExprType( toType, tenv, symtab );
 
@@ -1410 +1410 @@
                                 // calculate target type
                                 const ast::Type * toType = resolveTypeof( initAlt.type, symtab );
-                                toType = SymTab::validateType( toType, symtab );
+                                toType = SymTab::validateType( initExpr->location, toType, symtab );
                                 toType = adjustExprType( toType, tenv, symtab );
                                 // The call to find must occur inside this loop, otherwise polymorphic return 

src/ResolvExpr/Resolver.cc

@@ -1154 +1154 @@
                         return findKindExpression( untyped, symtab );
                 }
-
-                /// Resolve `untyped` to the single expression whose candidate is the best match for the 
-                /// given type.
+        } // anonymous namespace
+
                 ast::ptr< ast::Expr > findSingleExpression(
                         const ast::Expr * untyped, const ast::Type * type, const ast::SymbolTable & symtab
@@ -1167 +1166 @@
                 }
 
+        namespace {
                 /// Predicate for "Candidate has integral type"
                 bool hasIntegralType( const Candidate & i ) {

src/ResolvExpr/Resolver.h

@@ -35 +35 @@
         class StmtExpr;
         class SymbolTable;
+        class Type;
         class TypeEnvironment;
 } // namespace ast
@@ -61 +62 @@
         ast::ptr< ast::Expr > resolveInVoidContext(
                 const ast::Expr * expr, const ast::SymbolTable & symtab, ast::TypeEnvironment & env );
+        /// Resolve `untyped` to the single expression whose candidate is the best match for the 
+        /// given type.
+        ast::ptr< ast::Expr > findSingleExpression(
+                const ast::Expr * untyped, const ast::Type * type, const ast::SymbolTable & symtab );
         /// Resolves a constructor init expression
         ast::ptr< ast::Init > resolveCtorInit(