Changeset 7b5694d for src/ResolvExpr

Timestamp:

Jan 17, 2023, 2:05:52 PM (16 months ago)

Author:

Andrew Beach <ajbeach@…>

Branches:

ADT, ast-experimental, master

Children:

fed6a0f

Parents:

e563edf

Message:

Header Clean-up: Moved more things from typeops to Unify.

Location:

src/ResolvExpr

Files:

• Unify.h (modified) (1 diff)
• typeops.h (modified) (3 diffs)

src/ResolvExpr/Unify.h

@@ -85 +85 @@
         const ast::TypeEnvironment & env = {} );
 
+/// Creates the type represented by the list of returnVals in a FunctionType.
+/// The caller owns the return value.
+Type * extractResultType( FunctionType * functionType );
+/// Creates or extracts the type represented by returns in a `FunctionType`.
+ast::ptr<ast::Type> extractResultType( const ast::FunctionType * func );
+
+std::vector<ast::ptr<ast::Type>> flattenList(
+        const std::vector<ast::ptr<ast::Type>> & src, ast::TypeEnvironment & env
+);
+
 } // namespace ResolvExpr
 

src/ResolvExpr/typeops.h

@@ -108 +108 @@
                 const ast::TypeEnvironment & env );
 
-        /// creates the type represented by the list of returnVals in a FunctionType. The caller owns the return value.
-        Type * extractResultType( FunctionType * functionType );
-        /// Creates or extracts the type represented by the list of returns in a `FunctionType`.
-        ast::ptr<ast::Type> extractResultType( const ast::FunctionType * func );
-
         // in CommonType.cc
         Type * commonType( Type * type1, Type * type2, bool widenFirst, bool widenSecond, const SymTab::Indexer & indexer, TypeEnvironment & env, const OpenVarSet & openVars );
@@ -119 +114 @@
                         ast::TypeEnvironment & env, ast::AssertionSet & need, ast::AssertionSet & have,
                         const ast::OpenVarSet & open, WidenMode widen, const ast::SymbolTable & symtab
-        );
-        // in Unify.cc
-        std::vector< ast::ptr< ast::Type > > flattenList(
-                const std::vector< ast::ptr< ast::Type > > & src, ast::TypeEnvironment & env
         );
 
@@ -206 +197 @@
         }
 
-        
-
         // in TypeEnvironment.cc
         bool isFtype( const Type * type );