Changeset 5bf3976 for src

Timestamp:

Jan 18, 2023, 12:14:42 PM (15 months ago)

Author:

Andrew Beach <ajbeach@…>

Branches:

ADT, ast-experimental, master

Children:

378de69, a0d1f1c

Parents:

fed6a0f

Message:

Header Clean-Up: Created new headers for new AST typeops and moved declarations.

Location:

src

Files:

• GenPoly/InstantiateGeneric.cc (modified) (1 diff)
• GenPoly/InstantiateGenericNew.cpp (modified) (1 diff)
• ResolvExpr/AdjustExprType.hpp (added)
• ResolvExpr/AlternativeFinder.cc (modified) (3 diffs)
• ResolvExpr/CandidateFinder.cpp (modified) (1 diff)
• ResolvExpr/CastCost.cc (modified) (2 diffs)
• ResolvExpr/CastCost.hpp (added)
• ResolvExpr/CommonType.cc (modified) (1 diff)
• ResolvExpr/CommonType.hpp (added)
• ResolvExpr/ConversionCost.cc (modified) (1 diff)
• ResolvExpr/PolyCost.hpp (added)
• ResolvExpr/PtrsAssignable.cc (modified) (1 diff)
• ResolvExpr/PtrsAssignable.hpp (added)
• ResolvExpr/PtrsCastable.cc (modified) (4 diffs)
• ResolvExpr/PtrsCastable.hpp (added)
• ResolvExpr/ResolveAssertions.cc (modified) (2 diffs)
• ResolvExpr/SatisfyAssertions.cpp (modified) (1 diff)
• ResolvExpr/SpecCost.hpp (added)
• ResolvExpr/Unify.cc (modified) (2 diffs)
• ResolvExpr/WidenMode.h (modified) (2 diffs)
• ResolvExpr/module.mk (modified) (4 diffs)
• ResolvExpr/typeops.h (modified) (3 diffs)

src/GenPoly/InstantiateGeneric.cc

@@ -28 +28 @@
 #include "GenPoly.h"                   // for isPolyType, typesPolyCompatible
 #include "InitTweak/InitTweak.h"
-#include "ResolvExpr/typeops.h"        // for adjustExprType
+#include "ResolvExpr/AdjustExprType.hpp"  // for adjustExprType
 #include "ResolvExpr/Unify.h"          // for typesCompatible
 #include "ScopedSet.h"                 // for ScopedSet, ScopedSet<>::iterator

src/GenPoly/InstantiateGenericNew.cpp

@@ -32 +32 @@
 #include "GenPoly/GenPoly.h"           // for isPolyType, typesPolyCompatible
 #include "GenPoly/ScrubTyVars.h"       // for scrubAll
-#include "ResolvExpr/typeops.h"        // for adjustExprType
+#include "ResolvExpr/AdjustExprType.hpp"  // for adjustExprType
 #include "ResolvExpr/Unify.h"          // for typesCompatible
 

src/ResolvExpr/AlternativeFinder.cc

@@ -28 +28 @@
 
 #include "CompilationState.h"      // for resolvep
+#include "AdjustExprType.hpp"      // for adjustExprType
 #include "Alternative.h"           // for AltList, Alternative
 #include "AST/Expr.hpp"
 #include "AST/SymbolTable.hpp"
 #include "AST/Type.hpp"
+#include "CastCost.hpp"            // for castCost
 #include "Common/SemanticError.h"  // for SemanticError
 #include "Common/utility.h"        // for deleteAll, printAll, CodeLocation
@@ -38 +40 @@
 #include "ExplodedActual.h"        // for ExplodedActual
 #include "InitTweak/InitTweak.h"   // for getFunctionName
+#include "PolyCost.hpp"            // for polyCost
 #include "RenameVars.h"            // for RenameVars, global_renamer
 #include "ResolveAssertions.h"     // for resolveAssertions
 #include "ResolveTypeof.h"         // for resolveTypeof
 #include "Resolver.h"              // for resolveStmtExpr
+#include "SpecCost.hpp"            // for specCost
 #include "SymTab/Indexer.h"        // for Indexer
 #include "SymTab/Mangler.h"        // for Mangler
@@ -53 +57 @@
 #include "Tuples/Explode.h"        // for explode
 #include "Tuples/Tuples.h"         // for isTtype, handleTupleAssignment
+#include "typeops.h"               // for combos
 #include "Unify.h"                 // for unify
-#include "typeops.h"               // for adjustExprType, polyCost, castCost
 
 #define PRINT( text ) if ( resolvep ) { text }

src/ResolvExpr/CandidateFinder.cpp

@@ -23 +23 @@
 #include <vector>
 
+#include "AdjustExprType.hpp"
 #include "Candidate.hpp"
+#include "CastCost.hpp"           // for castCost
 #include "CompilationState.h"
 #include "ConversionCost.h"       // for conversionCast
 #include "Cost.h"
 #include "ExplodedArg.hpp"
+#include "PolyCost.hpp"
 #include "RenameVars.h"           // for renameTyVars
 #include "Resolver.h"
 #include "ResolveTypeof.h"
 #include "SatisfyAssertions.hpp"
-#include "typeops.h"              // for adjustExprType, polyCost, specCost
+#include "SpecCost.hpp"
+#include "typeops.h"              // for combos
 #include "Unify.h"
 #include "AST/Expr.hpp"

src/ResolvExpr/CastCost.cc

@@ -13 +13 @@
 // Update Count     : 9
 //
+
+#include "CastCost.hpp"
 
 #include <cassert>                       // for assert
@@ -22 +24 @@
 #include "ConversionCost.h"              // for ConversionCost
 #include "Cost.h"                        // for Cost, Cost::infinity
+#include "ResolvExpr/ConversionCost.h"   // for conversionCost
+#include "ResolvExpr/PtrsCastable.hpp"   // for ptrsCastable
 #include "ResolvExpr/TypeEnvironment.h"  // for TypeEnvironment, EqvClass
 #include "ResolvExpr/typeops.h"          // for ptrsCastable

src/ResolvExpr/CommonType.cc

@@ -13 +13 @@
 // Update Count     : 24
 //
+
+#include "CommonType.hpp"
 
 #include <cassert>                       // for strict_dynamic_cast

src/ResolvExpr/ConversionCost.cc

@@ -22 +22 @@
 #include "ResolvExpr/Cost.h"             // for Cost
 #include "ResolvExpr/TypeEnvironment.h"  // for EqvClass, TypeEnvironment
-#include "ResolvExpr/Unify.h"
+#include "ResolvExpr/Unify.h"            // for typesCompatibleIgnoreQualifiers
+#include "ResolvExpr/PtrsAssignable.hpp" // for ptrsAssignable
 #include "SymTab/Indexer.h"              // for Indexer
 #include "SynTree/Declaration.h"         // for TypeDecl, NamedTypeDecl
 #include "SynTree/Type.h"                // for Type, BasicType, TypeInstType
-#include "typeops.h"                     // for typesCompatibleIgnoreQualifiers
 
 

src/ResolvExpr/PtrsAssignable.cc

@@ -14 +14 @@
 //
 
-#include "typeops.h"
+#include "PtrsAssignable.hpp"
 
 #include "AST/Pass.hpp"

src/ResolvExpr/PtrsCastable.cc

@@ -14 +14 @@
 //
 
+#include "PtrsCastable.hpp"
+
 #include "AST/Decl.hpp"
 #include "AST/Pass.hpp"
@@ -19 +21 @@
 #include "AST/TypeEnvironment.hpp"
 #include "Common/PassVisitor.h"
+#include "ResolvExpr/PtrsAssignable.hpp" // for ptrsAssignable
 #include "ResolvExpr/TypeEnvironment.h"  // for EqvClass, TypeEnvironment
 #include "SymTab/Indexer.h"              // for Indexer
@@ -24 +27 @@
 #include "SynTree/Type.h"                // for TypeInstType, Type, BasicType
 #include "SynTree/Visitor.h"             // for Visitor
-#include "typeops.h"                     // for ptrsAssignable
 
 namespace ResolvExpr {
@@ -291 +293 @@
                 return objectCast( src, env, symtab );
         } else {
-                ast::Pass< PtrsCastable_new > ptrs{ dst, env, symtab };
-                src->accept( ptrs );
-                return ptrs.core.result;
+                return ast::Pass<PtrsCastable_new>::read( src, dst, env, symtab );
         }
 }

src/ResolvExpr/ResolveAssertions.cc

@@ -26 +26 @@
 #include <vector>                   // for vector
 
+#include "AdjustExprType.hpp"       // for adjustExprType
 #include "Alternative.h"            // for Alternative, AssertionItem, AssertionList
 #include "Common/FilterCombos.h"    // for filterCombos
@@ -33 +34 @@
 #include "ResolvExpr/AlternativeFinder.h"  // for computeConversionCost
 #include "ResolvExpr/RenameVars.h"  // for renameTyVars
+#include "SpecCost.hpp"             // for specCost
 #include "SymTab/Indexer.h"         // for Indexer
 #include "SymTab/Mangler.h"         // for Mangler
 #include "SynTree/Expression.h"     // for InferredParams
 #include "TypeEnvironment.h"        // for TypeEnvironment, etc.
-#include "typeops.h"                // for adjustExprType, specCost
 #include "Unify.h"                  // for unify
 

src/ResolvExpr/SatisfyAssertions.cpp

@@ -23 +23 @@
 #include <vector>
 
+#include "AdjustExprType.hpp"
 #include "Candidate.hpp"
 #include "CandidateFinder.hpp"
+#include "CommonType.hpp"
 #include "Cost.h"
 #include "RenameVars.h"
+#include "SpecCost.hpp"
 #include "typeops.h"
 #include "Unify.h"

src/ResolvExpr/Unify.cc

@@ -33 +33 @@
 #include "AST/TypeEnvironment.hpp"
 #include "Common/PassVisitor.h"     // for PassVisitor
+#include "CommonType.hpp"           // for commonType
 #include "FindOpenVars.h"           // for findOpenVars
+#include "SpecCost.hpp"             // for SpecCost
 #include "SynTree/LinkageSpec.h"    // for C
 #include "SynTree/Constant.h"       // for Constant
@@ -43 +45 @@
 #include "Tuples/Tuples.h"          // for isTtype
 #include "TypeEnvironment.h"        // for EqvClass, AssertionSet, OpenVarSet
-#include "typeops.h"                // for flatten, occurs, commonType
+#include "typeops.h"                // for flatten, occurs
 
 namespace ast {

src/ResolvExpr/WidenMode.h

@@ -19 +19 @@
         struct WidenMode {
                 WidenMode( bool first, bool second ): first( first ), second( second ) {}
-                
+
                 WidenMode &operator|=( const WidenMode &other ) {
                         first |= other.first; second |= other.second; return *this;
@@ -35 +35 @@
                         WidenMode newWM( *this ); newWM &= other; return newWM;
                 }
-                
+
                 operator bool() { return first && second; }
 

src/ResolvExpr/module.mk

@@ -17 +17 @@
 SRC_RESOLVEXPR = \
       ResolvExpr/AdjustExprType.cc \
+      ResolvExpr/AdjustExprType.hpp \
       ResolvExpr/Alternative.cc \
       ResolvExpr/AlternativeFinder.cc \
@@ -26 +27 @@
       ResolvExpr/Candidate.hpp \
       ResolvExpr/CastCost.cc \
+      ResolvExpr/CastCost.hpp \
       ResolvExpr/CommonType.cc \
+      ResolvExpr/CommonType.hpp \
       ResolvExpr/ConversionCost.cc \
       ResolvExpr/ConversionCost.h \
@@ -40 +43 @@
       ResolvExpr/Occurs.cc \
       ResolvExpr/PolyCost.cc \
+      ResolvExpr/PolyCost.hpp \
       ResolvExpr/PtrsAssignable.cc \
+      ResolvExpr/PtrsAssignable.hpp \
       ResolvExpr/PtrsCastable.cc \
+      ResolvExpr/PtrsCastable.hpp \
       ResolvExpr/RenameVars.cc \
       ResolvExpr/RenameVars.h \
@@ -54 +60 @@
       ResolvExpr/SatisfyAssertions.hpp \
       ResolvExpr/SpecCost.cc \
+      ResolvExpr/SpecCost.hpp \
       ResolvExpr/TypeEnvironment.cc \
       ResolvExpr/TypeEnvironment.h \

src/ResolvExpr/typeops.h

@@ -10 +10 @@
 // Created On       : Sun May 17 07:28:22 2015
 // Last Modified By : Andrew Beach
-// Last Modified On : Tue Oct  1 09:45:00 2019
-// Update Count     : 6
+// Last Modified On : Wed Jan 18 11:54:00 2023
+// Update Count     : 7
 //
 
@@ -60 +60 @@
                 }
         }
-
-        // in AdjustExprType.cc
-        /// Replaces array types with the equivalent pointer, and function types with a pointer-to-function
-        void adjustExprType( Type *& type, const TypeEnvironment & env, const SymTab::Indexer & indexer );
-
-        /// Replaces array types with the equivalent pointer, and function types with a pointer-to-function using empty TypeEnvironment and Indexer
-        void adjustExprType( Type *& type );
-
-        template< typename ForwardIterator >
-        void adjustExprTypeList( ForwardIterator begin, ForwardIterator end, const TypeEnvironment & env, const SymTab::Indexer & indexer ) {
-                while ( begin != end ) {
-                        adjustExprType( *begin++, env, indexer );
-                } // while
-        }
-
-        /// Replaces array types with equivalent pointer, and function types with a pointer-to-function
-        const ast::Type * adjustExprType(
-                const ast::Type * type, const ast::TypeEnvironment & env, const ast::SymbolTable & symtab );
-
-        // in CastCost.cc
-        Cost castCost( const Type * src, const Type * dest, bool srcIsLvalue,
-                const SymTab::Indexer & indexer, const TypeEnvironment & env );
-        Cost castCost(
-                const ast::Type * src, const ast::Type * dst, bool srcIsLvalue,
-                const ast::SymbolTable & symtab, const ast::TypeEnvironment & env );
-
-        // in PtrsAssignable.cc
-        int ptrsAssignable( const Type * src, const Type * dest, const TypeEnvironment & env );
-        int ptrsAssignable( const ast::Type * src, const ast::Type * dst,
-                const ast::TypeEnvironment & env );
-
-        // in PtrsCastable.cc
-        int ptrsCastable( const Type * src, const Type * dest, const TypeEnvironment & env, const SymTab::Indexer & indexer );
-        int ptrsCastable(
-                const ast::Type * src, const ast::Type * dst, const ast::SymbolTable & symtab,
-                const ast::TypeEnvironment & env );
-
-        // in CommonType.cc
-        Type * commonType( Type * type1, Type * type2, bool widenFirst, bool widenSecond, const SymTab::Indexer & indexer, TypeEnvironment & env, const OpenVarSet & openVars );
-        ast::ptr< ast::Type > commonType(
-                const ast::ptr< ast::Type > & type1, const ast::ptr< ast::Type > & type2,
-                        ast::TypeEnvironment & env, ast::AssertionSet & need, ast::AssertionSet & have,
-                        const ast::OpenVarSet & open, WidenMode widen, const ast::SymbolTable & symtab
-        );
-
-        // in PolyCost.cc
-        int polyCost( Type * type, const TypeEnvironment & env, const SymTab::Indexer & indexer );
-        int polyCost(
-                const ast::Type * type, const ast::SymbolTable & symtab, const ast::TypeEnvironment & env );
-
-        // in SpecCost.cc
-        int specCost( Type * type );
-        int specCost( const ast::Type * type );
 
         // in Occurs.cc
@@ -171 +118 @@
                 }
 
-
                 return new ast::TupleType{ std::move(types) };
         }