Changeset c28ea4e for src/ResolvExpr

Timestamp:

Nov 4, 2020, 2:56:30 PM (5 years ago)

Author:

Colby Alexander Parsons <caparsons@…>

Branches:

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

Children:

eeb5023

Parents:

4b30e8cc (diff), a3f5208a (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge branch 'master' of plg.uwaterloo.ca:software/cfa/cfa-cc

Location:

src/ResolvExpr

Files:

• Resolver.cc (modified) (6 diffs)
• Resolver.h (modified) (3 diffs)

src/ResolvExpr/Resolver.cc

@@ -1105 +1105 @@
                 }
 
-                /// Establish post-resolver invariants for expressions
+                
+        } // anonymous namespace
+/// Establish post-resolver invariants for expressions
                 void finishExpr(
                         ast::ptr< ast::Expr > & expr, const ast::TypeEnvironment & env,
@@ -1118 +1120 @@
                         StripCasts_new::strip( expr );
                 }
-        } // anonymous namespace
-
 
         ast::ptr< ast::Expr > resolveInVoidContext(
@@ -1139 +1139 @@
         }
 
-        namespace {
-                /// Resolve `untyped` to the expression whose candidate is the best match for a `void`
+        /// Resolve `untyped` to the expression whose candidate is the best match for a `void`
                 /// context.
                 ast::ptr< ast::Expr > findVoidExpression(
@@ -1151 +1150 @@
                         return newExpr;
                 }
+
+        namespace {
+                
 
                 /// resolve `untyped` to the expression whose candidate satisfies `pred` with the
@@ -1162 +1164 @@
                         CandidateRef choice =
                                 findUnfinishedKindExpression( untyped, symtab, kind, pred, mode );
-                        finishExpr( choice->expr, choice->env, untyped->env );
+                        ResolvExpr::finishExpr( choice->expr, choice->env, untyped->env );
                         return std::move( choice->expr );
                 }
@@ -1272 +1274 @@
         // size_t Resolver_new::traceId = Stats::Heap::new_stacktrace_id("Resolver");
 
-        void resolve( std::list< ast::ptr< ast::Decl > >& translationUnit ) {
+        void resolve( ast::TranslationUnit& translationUnit ) {
                 ast::Pass< Resolver_new >::run( translationUnit );
         }

src/ResolvExpr/Resolver.h

@@ -35 +35 @@
         class StmtExpr;
         class SymbolTable;
+        class TranslationUnit;
         class Type;
         class TypeEnvironment;
@@ -55 +56 @@
 
         /// Checks types and binds syntactic constructs to typed representations
-        void resolve( std::list< ast::ptr<ast::Decl> >& translationUnit );
+        void resolve( ast::TranslationUnit& translationUnit );
         /// Searches expr and returns the first DeletedExpr found, otherwise nullptr
         const ast::DeletedExpr * findDeletedExpr( const ast::Expr * expr );
@@ -66 +67 @@
         ast::ptr< ast::Expr > findSingleExpression(
                 const ast::Expr * untyped, const ast::Type * type, const ast::SymbolTable & symtab );
+        ast::ptr< ast::Expr > findVoidExpression(
+                const ast::Expr * untyped, const ast::SymbolTable & symtab);
         /// Resolves a constructor init expression
-        ast::ptr< ast::Init > resolveCtorInit( 
+        ast::ptr< ast::Init > resolveCtorInit(
                 const ast::ConstructorInit * ctorInit, const ast::SymbolTable & symtab );
         /// Resolves a statement expression
-        ast::ptr< ast::Expr > resolveStmtExpr( 
+        ast::ptr< ast::Expr > resolveStmtExpr(
                 const ast::StmtExpr * stmtExpr, const ast::SymbolTable & symtab );
 } // namespace ResolvExpr