Changeset 9ea38de for src/ResolvExpr

Timestamp:

Jun 25, 2019, 11:26:30 AM (5 years ago)

Author:

Aaron Moss <a3moss@…>

Branches:

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

Children:

bcb311b

Parents:

28af389

Message:

Fix ast::Pass guard classes

Location:

src/ResolvExpr

Files:

• AdjustExprType.cc (modified) (1 diff)
• CandidateFinder.cpp (modified) (5 diffs)
• CandidateFinder.hpp (modified) (1 diff)
• PolyCost.cc (modified) (1 diff)

src/ResolvExpr/AdjustExprType.cc

@@ -100 +100 @@
 
 namespace {
-        struct AdjustExprType_new final : public ast::WithShortCircuiting {
+        class AdjustExprType_new final : public ast::WithShortCircuiting {
+                const ast::SymbolTable & symtab;
+        public:
                 const ast::TypeEnvironment & tenv;
-                const ast::SymbolTable & symtab;
 
                 AdjustExprType_new( const ast::TypeEnvironment & e, const ast::SymbolTable & syms )
-                : tenv( e ), symtab( syms ) {}
+                : symtab( syms ), tenv( e ) {}
 
                 void premutate( const ast::VoidType * ) { visit_children = false; }

src/ResolvExpr/CandidateFinder.cpp

@@ -594 +594 @@
 
         /// Actually visits expressions to find their candidate interpretations
-        struct Finder final : public ast::WithShortCircuiting {
+        class Finder final : public ast::WithShortCircuiting {
+                const ast::SymbolTable & symtab;
+        public:
                 CandidateFinder & selfFinder;
-                const ast::SymbolTable & symtab;
                 CandidateList & candidates;
                 const ast::TypeEnvironment & tenv;
@@ -602 +603 @@
 
                 Finder( CandidateFinder & f )
-                : selfFinder( f ), symtab( f.symtab ), candidates( f.candidates ), tenv( f.env ), 
+                : symtab( f.localSyms ), selfFinder( f ), candidates( f.candidates ), tenv( f.env ), 
                   targetType( f.targetType ) {}
                 
@@ -1558 +1559 @@
                 std::vector< std::string > errors;
                 for ( CandidateRef & candidate : candidates ) {
-                        satisfyAssertions( candidate, symtab, satisfied, errors );
+                        satisfyAssertions( candidate, localSyms, satisfied, errors );
                 }
 
@@ -1613 +1614 @@
                         r->expr = ast::mutate_field( 
                                 r->expr.get(), &ast::Expr::result, 
-                                adjustExprType( r->expr->result, r->env, symtab ) );
+                                adjustExprType( r->expr->result, r->env, localSyms ) );
                 }
         }
@@ -1631 +1632 @@
 
         for ( const auto & x : xs ) {
-                out.emplace_back( symtab, env );
+                out.emplace_back( localSyms, env );
                 out.back().find( x, ResolvMode::withAdjustment() );
                 

src/ResolvExpr/CandidateFinder.hpp

@@ -28 +28 @@
 struct CandidateFinder {
         CandidateList candidates;          ///< List of candidate resolutions
-        const ast::SymbolTable & symtab;   ///< Symbol table to lookup candidates
+        const ast::SymbolTable & localSyms;   ///< Symbol table to lookup candidates
         const ast::TypeEnvironment & env;  ///< Substitutions performed in this resolution
         ast::ptr< ast::Type > targetType;  ///< Target type for resolution
 
         CandidateFinder( 
-                const ast::SymbolTable & symtab, const ast::TypeEnvironment & env, 
+                const ast::SymbolTable & syms, const ast::TypeEnvironment & env, 
                 const ast::Type * tt = nullptr )
-        : candidates(), symtab( symtab ), env( env ), targetType( tt ) {}
+        : candidates(), localSyms( syms ), env( env ), targetType( tt ) {}
 
         /// Fill candidates with feasible resolutions for `expr`

src/ResolvExpr/PolyCost.cc

@@ -58 +58 @@
 
 // TODO: When the old PolyCost is torn out get rid of the _new suffix.
-struct PolyCost_new {
+class PolyCost_new {
+        const ast::SymbolTable &symtab;
+public:
         int result;
-        const ast::SymbolTable &symtab;
         const ast::TypeEnvironment &env_;
 
-        PolyCost_new( const ast::SymbolTable & symtab, const ast::TypeEnvironment & env ) :
-                result( 0 ), symtab( symtab ), env_( env ) {}
+        PolyCost_new( const ast::SymbolTable & symtab, const ast::TypeEnvironment & env ) 
+        : symtab( symtab ), result( 0 ), env_( env ) {}
 
         void previsit( const ast::TypeInstType * type ) {