Changeset f80e0218 for src/SynTree/TypeSubstitution.h

Timestamp:

Jun 30, 2016, 4:32:56 PM (9 years ago)

Author:

Thierry Delisle <tdelisle@…>

Branches:

ADT, aaron-thesis, arm-eh, ast-experimental, cleanup-dtors, ctor, deferred_resn, demangler, enum, forall-pointer-decay, gc_noraii, jacob/cs343-translation, jenkins-sandbox, master, memory, new-ast, new-ast-unique-expr, new-env, no_list, persistent-indexer, pthread-emulation, qualifiedEnum, resolv-new, with_gc

Children:

ea29e73

Parents:

1b5c81ed (diff), 84d4d6f (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 gc_noraii

Conflicts:

Jenkinsfile
src/SymTab/Validate.cc

File:

• src/SynTree/TypeSubstitution.h (modified) (8 diffs)

src/SynTree/TypeSubstitution.h

@@ -5 +5 @@
 // file "LICENCE" distributed with Cforall.
 //
-// TypeSubstitution.h -- 
+// TypeSubstitution.h --
 //
 // Author           : Richard C. Bilson
 // Created On       : Mon May 18 07:44:20 2015
-// Last Modified By : Peter A. Buhr
-// Last Modified On : Wed Mar  2 17:33:19 2016
+// Last Modified By : Rob Schluntz
+// Last Modified On : Fri Apr 29 15:00:20 2016
 // Update Count     : 2
 //
@@ -33 +33 @@
         TypeSubstitution( const TypeSubstitution &other );
         virtual ~TypeSubstitution();
-        
+
         TypeSubstitution &operator=( const TypeSubstitution &other );
-        
+
         template< typename SynTreeClass > int apply( SynTreeClass *&input );
         template< typename SynTreeClass > int applyFree( SynTreeClass *&input );
-        
+
         void add( std::string formalType, Type *actualType );
         void add( const TypeSubstitution &other );
@@ -44 +44 @@
         Type *lookup( std::string formalType ) const;
         bool empty() const;
-        
+
         template< typename FormalIterator, typename ActualIterator >
         void add( FormalIterator formalBegin, FormalIterator formalEnd, ActualIterator actualBegin );
-        
+
+        /// this function is unused...
         template< typename TypeInstListIterator >
         void extract( TypeInstListIterator begin, TypeInstListIterator end, TypeSubstitution &result );
-        
+
         void normalize();
 
@@ -63 +64 @@
         /// Records type variable bindings from forall-statements and instantiations of generic types
         template< typename TypeClass > Type *handleAggregateType( TypeClass *type );
-        
+
         virtual Type* mutate(VoidType *basicType);
         virtual Type* mutate(BasicType *basicType);
@@ -75 +76 @@
         virtual Type* mutate(TupleType *tupleType);
         virtual Type* mutate(VarArgsType *varArgsType);
-        
+
         // TODO: worry about traversing into a forall-qualified function type or type decl with assertions
-        
+
         void initialize( const TypeSubstitution &src, TypeSubstitution &dest );
 
@@ -136 +137 @@
         return subCount;
 }
-        
+
 template< typename SynTreeClass >
 int TypeSubstitution::applyFree( SynTreeClass *&input ) {
@@ -149 +150 @@
         return subCount;
 }
-        
+
 template< typename TypeInstListIterator >
 void TypeSubstitution::extract( TypeInstListIterator begin, TypeInstListIterator end, TypeSubstitution &result ) {
+        // xxx - this function doesn't extract varEnv - is this intentional?
         while ( begin != end ) {
                 TypeEnvType::iterator cur = typeEnv.find( (*begin++)->get_name() );
@@ -173 +175 @@
 }
 
+std::ostream & operator<<( std::ostream & out, const TypeSubstitution & sub );
+
 #endif // TYPESUBSTITUTION_H