Changeset e6b42e7 for src/ResolvExpr

Timestamp:

Sep 9, 2020, 11:33:01 AM (4 years ago)

Author:

Andrew Beach <ajbeach@…>

Branches:

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

Children:

2b7f6f0

Parents:

dfc13bb

Message:

Added the ast::Pass::read utility. Converted two passes to use its two different uses.

Location:

src/ResolvExpr

Files:

• ConversionCost.cc (modified) (2 diffs)
• ConversionCost.h (modified) (1 diff)
• Resolver.cc (modified) (2 diffs)

src/ResolvExpr/ConversionCost.cc

@@ -520 +520 @@
                 return convertToReferenceCost( src, refType, srcIsLvalue, symtab, env, localPtrsAssignable );
         } else {
-                ast::Pass<ConversionCost_new> converter( dst, srcIsLvalue, symtab, env, localConversionCost );
-                src->accept( converter );
-                return converter.core.cost;
+                return ast::Pass<ConversionCost_new>::read( src, dst, srcIsLvalue, symtab, env, localConversionCost );
         }
 }
@@ -563 +561 @@
                         }
                 } else {
-                        ast::Pass<ConversionCost_new> converter( dst, srcIsLvalue, symtab, env, localConversionCost );
-                        src->accept( converter );
-                        return converter.core.cost;
+                        return ast::Pass<ConversionCost_new>::read( src, dst, srcIsLvalue, symtab, env, localConversionCost );
                 }
         } else {

src/ResolvExpr/ConversionCost.h

@@ -88 +88 @@
         static size_t traceId;
         Cost cost;
+        Cost result() { return cost; }
 
         ConversionCost_new( const ast::Type * dst, bool srcIsLvalue, const ast::SymbolTable & symtab,

src/ResolvExpr/Resolver.cc

@@ -965 +965 @@
                 /// Finds deleted expressions in an expression tree
                 struct DeleteFinder_new final : public ast::WithShortCircuiting {
-                        const ast::DeletedExpr * delExpr = nullptr;
+                        const ast::DeletedExpr * result = nullptr;
 
                         void previsit( const ast::DeletedExpr * expr ) {
-                                if ( delExpr ) { visit_children = false; }
-                                else { delExpr = expr; }
+                                if ( result ) { visit_children = false; }
+                                else { result = expr; }
                         }
 
                         void previsit( const ast::Expr * ) {
-                                if ( delExpr ) { visit_children = false; }
+                                if ( result ) { visit_children = false; }
                         }
                 };
@@ -980 +980 @@
         /// Check if this expression is or includes a deleted expression
         const ast::DeletedExpr * findDeletedExpr( const ast::Expr * expr ) {
-                ast::Pass<DeleteFinder_new> finder;
-                expr->accept( finder );
-                return finder.core.delExpr;
+                return ast::Pass<DeleteFinder_new>::read( expr );
         }