Changeset fed6a0f

Timestamp:

Jan 17, 2023, 4:27:18 PM (2 years ago)

Author:

Andrew Beach <ajbeach@…>

Branches:

ADT, ast-experimental, master

Children:

5bf3976

Parents:

7b5694d

Message:

Header Clean-up: Moving more declarations to the header of the implementation file.

Location:

src

Files:

• AST/SymbolTable.cpp (modified) (2 diffs)
• ResolvExpr/AlternativeFinder.cc (modified) (3 diffs)
• ResolvExpr/AlternativeFinder.h (modified) (1 diff)
• ResolvExpr/CandidateFinder.cpp (modified) (2 diffs)
• ResolvExpr/CandidateFinder.hpp (modified) (1 diff)
• ResolvExpr/ConversionCost.h (modified) (3 diffs)
• ResolvExpr/ResolveAssertions.cc (modified) (1 diff)
• ResolvExpr/typeops.h (modified) (2 diffs)
• SymTab/Indexer.cc (modified) (1 diff)

src/AST/SymbolTable.cpp ¶

@@ -22 +22 @@
 #include "Inspect.hpp"
 #include "Type.hpp"
-#include "CodeGen/OperatorTable.h"  // for isCtorDtorAssign
+#include "CodeGen/OperatorTable.h"         // for isCtorDtorAssign
 #include "Common/SemanticError.h"
 #include "Common/Stats/Counter.h"
@@ -28 +28 @@
 #include "InitTweak/InitTweak.h"
 #include "ResolvExpr/Cost.h"
-#include "ResolvExpr/typeops.h"     // for referenceToRvalueConversion
+#include "ResolvExpr/CandidateFinder.hpp"  // for referenceToRvalueConversion
 #include "ResolvExpr/Unify.h"
 #include "SymTab/Mangler.h"

src/ResolvExpr/AlternativeFinder.cc ¶

@@ -14 +14 @@
 //
 
+#include "AlternativeFinder.h"
+
 #include <algorithm>               // for copy
 #include <cassert>                 // for strict_dynamic_cast, assert, assertf
@@ -27 +29 @@
 #include "CompilationState.h"      // for resolvep
 #include "Alternative.h"           // for AltList, Alternative
-#include "AlternativeFinder.h"
 #include "AST/Expr.hpp"
 #include "AST/SymbolTable.hpp"
@@ -33 +34 @@
 #include "Common/SemanticError.h"  // for SemanticError
 #include "Common/utility.h"        // for deleteAll, printAll, CodeLocation
+#include "ConversionCost.h"        // for conversionCost
 #include "Cost.h"                  // for Cost, Cost::zero, operator<<, Cost...
 #include "ExplodedActual.h"        // for ExplodedActual

src/ResolvExpr/AlternativeFinder.h ¶

@@ -34 +34 @@
 namespace ResolvExpr {
         struct ArgPack;
+
+        Cost computeConversionCost( Type * actualType, Type * formalType, bool actualIsLvalue,
+                const SymTab::Indexer & indexer, const TypeEnvironment & env );
+
+        void referenceToRvalueConversion( Expression *& expr, Cost & cost );
 
         /// First index is which argument, second index is which alternative for that argument,

src/ResolvExpr/CandidateFinder.cpp ¶

@@ -25 +25 @@
 #include "Candidate.hpp"
 #include "CompilationState.h"
+#include "ConversionCost.h"       // for conversionCast
 #include "Cost.h"
 #include "ExplodedArg.hpp"
@@ -31 +32 @@
 #include "ResolveTypeof.h"
 #include "SatisfyAssertions.hpp"
-#include "typeops.h"              // for adjustExprType, conversionCost, polyCost, specCost
+#include "typeops.h"              // for adjustExprType, polyCost, specCost
 #include "Unify.h"
 #include "AST/Expr.hpp"

src/ResolvExpr/CandidateFinder.hpp ¶

@@ -63 +63 @@
         const ast::SymbolTable & symtab, const ast::TypeEnvironment & env );
 
+/// Create an expression that preforms reference to rvalue conversion on
+/// the given expression and update the cost of the expression.
+const ast::Expr * referenceToRvalueConversion(
+        const ast::Expr * expr, Cost & cost );
+
 } // namespace ResolvExpr
 

src/ResolvExpr/ConversionCost.h ¶

@@ -32 +32 @@
 namespace ResolvExpr {
         class TypeEnvironment;
+
+        Cost conversionCost(
+                const Type * src, const Type * dest, bool srcIsLvalue,
+                const SymTab::Indexer & indexer, const TypeEnvironment & env );
 
         typedef std::function<Cost(const Type *, const Type *, bool,
@@ -80 +84 @@
         const ast::SymbolTable &, const ast::TypeEnvironment &)>;
 
+Cost conversionCost(
+        const ast::Type * src, const ast::Type * dst, bool srcIsLvalue,
+        const ast::SymbolTable & symtab, const ast::TypeEnvironment & env );
+
+Cost convertToReferenceCost( const ast::Type * src, const ast::ReferenceType * dest,
+        bool srcIsLvalue, const ast::SymbolTable & indexer, const ast::TypeEnvironment & env,
+        PtrsCalculation func );
+
 #warning when the old ConversionCost is removed, get ride of the _new suffix.
 class ConversionCost_new : public ast::WithShortCircuiting {
@@ -119 +131 @@
 };
 
-Cost convertToReferenceCost( const ast::Type * src, const ast::ReferenceType * dest,
-        bool srcIsLvalue, const ast::SymbolTable & indexer, const ast::TypeEnvironment & env,
-        PtrsCalculation func );
-
 } // namespace ResolvExpr
 

src/ResolvExpr/ResolveAssertions.cc ¶

@@ -31 +31 @@
 #include "Common/utility.h"         // for sort_mins
 #include "GenPoly/GenPoly.h"        // for getFunctionType
+#include "ResolvExpr/AlternativeFinder.h"  // for computeConversionCost
 #include "ResolvExpr/RenameVars.h"  // for renameTyVars
 #include "SymTab/Indexer.h"         // for Indexer

src/ResolvExpr/typeops.h ¶

@@ -86 +86 @@
                 const ast::SymbolTable & symtab, const ast::TypeEnvironment & env );
 
-        // in ConversionCost.cc
-        Cost conversionCost( const Type * src, const Type * dest, bool srcIsLvalue,
-                const SymTab::Indexer & indexer, const TypeEnvironment & env );
-        Cost conversionCost(
-                const ast::Type * src, const ast::Type * dst, bool srcIsLvalue,
-                const ast::SymbolTable & symtab, const ast::TypeEnvironment & env );
-
-        // in AlternativeFinder.cc
-        Cost computeConversionCost( Type * actualType, Type * formalType, bool actualIsLvalue,
-                const SymTab::Indexer & indexer, const TypeEnvironment & env );
-
         // in PtrsAssignable.cc
         int ptrsAssignable( const Type * src, const Type * dest, const TypeEnvironment & env );
@@ -137 +126 @@
                 return false;
         }
-
-        // in AlternativeFinder.cc
-        void referenceToRvalueConversion( Expression *& expr, Cost & cost );
-        // in CandidateFinder.cpp
-        const ast::Expr * referenceToRvalueConversion( const ast::Expr * expr, Cost & cost );
 
         /// flatten tuple type into list of types

src/SymTab/Indexer.cc ¶

@@ -31 +31 @@
 #include "InitTweak/InitTweak.h"   // for isConstructor, isCopyFunction, isC...
 #include "Mangler.h"               // for Mangler
-#include "ResolvExpr/typeops.h"    // for referenceToRvalueConversion
+#include "ResolvExpr/AlternativeFinder.h"  // for referenceToRvalueConversion
 #include "ResolvExpr/Unify.h"      // for typesCompatible
 #include "SynTree/LinkageSpec.h"   // for isMangled, isOverridable, Spec