Changeset 7f6a7c9 for src/ResolvExpr/typeops.h

Timestamp:

Sep 21, 2022, 11:02:15 AM (3 years ago)

Author:

Thierry Delisle <tdelisle@…>

Branches:

ADT, ast-experimental, master, pthread-emulation

Children:

95dab9e

Parents:

428adbc (diff), 0bd46fd (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge branch 'master' into pthread-emulation

File:

• src/ResolvExpr/typeops.h (modified) (4 diffs)

src/ResolvExpr/typeops.h

@@ -138 +138 @@
         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, WidenMode widen,
-                const ast::SymbolTable & symtab, ast::TypeEnvironment & env, const ast::OpenVarSet & open );
+                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 Unify.cc
+        std::vector< ast::ptr< ast::Type > > flattenList(
+                const std::vector< ast::ptr< ast::Type > > & src, ast::TypeEnvironment & env
+        );
 
         // in PolyCost.cc
@@ -181 +187 @@
 
         /// flatten tuple type into existing list of types
-        static inline void flatten(
+        inline void flatten(
                 const ast::Type * type, std::vector< ast::ptr< ast::Type > > & out
         ) {
@@ -194 +200 @@
 
         /// flatten tuple type into list of types
-        static inline std::vector< ast::ptr< ast::Type > > flatten( const ast::Type * type ) {
+        inline std::vector< ast::ptr< ast::Type > > flatten( const ast::Type * type ) {
                 std::vector< ast::ptr< ast::Type > > out;
                 out.reserve( type->size() );
@@ -200 +206 @@
                 return out;
         }
+
+        template< typename Iter >
+        const ast::Type * tupleFromTypes( Iter crnt, Iter end ) {
+                std::vector< ast::ptr< ast::Type > > types;
+                while ( crnt != end ) {
+                        // it is guaranteed that a ttype variable will be bound to a flat tuple, so ensure
+                        // that this results in a flat tuple
+                        flatten( *crnt, types );
+
+                        ++crnt;
+                }
+
+
+                return new ast::TupleType{ std::move(types) };
+        }
+
+        inline const ast::Type * tupleFromTypes(
+                const std::vector< ast::ptr< ast::Type > > & tys
+        ) {
+                return tupleFromTypes( tys.begin(), tys.end() );
+        }
+
+        
 
         // in TypeEnvironment.cc