Changeset 8d182b1 for src/ResolvExpr/typeops.h

Timestamp:

Nov 14, 2023, 12:19:09 PM (23 months ago)

Author:

caparson <caparson@…>

Branches:

master

Children:

1ccae59, 89a8bab

Parents:

df8ba61a (diff), 5625427 (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' of plg.uwaterloo.ca:software/cfa/cfa-cc

File:

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

src/ResolvExpr/typeops.h

@@ -19 +19 @@
 
 #include "AST/Type.hpp"
-#include "SynTree/Type.h"
-
-namespace SymTab {
-        class Indexer;
-}
 
 namespace ResolvExpr {
@@ -52 +47 @@
                         std::copy( i.begin(), i.end(), inserter );
                         *out++ = result;
-                }
-        }
-
-        // in Occurs.cc
-        bool occurs( const Type * type, const std::string & varName, const TypeEnvironment & env );
-        // new AST version in TypeEnvironment.cpp (only place it was used in old AST)
-
-        template<typename Iter>
-        bool occursIn( Type* ty, Iter begin, Iter end, const TypeEnvironment & env ) {
-                while ( begin != end ) {
-                        if ( occurs( ty, *begin, env ) ) return true;
-                        ++begin;
-                }
-                return false;
-        }
-
-        /// flatten tuple type into list of types
-        template< typename OutputIterator >
-        void flatten( Type * type, OutputIterator out ) {
-                if ( TupleType * tupleType = dynamic_cast< TupleType * >( type ) ) {
-                        for ( Type * t : tupleType->get_types() ) {
-                                flatten( t, out );
-                        }
-                } else {
-                        *out++ = type->clone();
                 }
         }
@@ -120 +90 @@
                 return tupleFromTypes( tys.begin(), tys.end() );
         }
-
-        // in TypeEnvironment.cc
-        bool isFtype( const Type * type );
 } // namespace ResolvExpr