Changeset 8c49c0e for src/SynTree

Timestamp:

Sep 19, 2016, 4:39:33 PM (9 years ago)

Author:

Rob Schluntz <rschlunt@…>

Branches:

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

Children:

aefcc3b

Parents:

3c13c03

Message:

decouple code that uses Type's forall list from std::list in preparation for trying to replace with a managed list

Location:

src/SynTree

Files:

• Expression.cc (modified) (1 diff)
• Type.h (modified) (3 diffs)
• TypeSubstitution.cc (modified) (3 diffs)

src/SynTree/Expression.cc ¶

@@ -318 +318 @@
 void UntypedMemberExpr::print( std::ostream &os, int indent ) const {
         os << "Untyped Member Expression, with field: " << std::endl;
+        os << std::string( indent+2, ' ' );
         get_member()->print(os, indent+4);
         os << std::string( indent+2, ' ' );

src/SynTree/Type.h ¶

@@ -20 +20 @@
 #include "Visitor.h"
 #include "Mutator.h"
+#include "Common/utility.h"
 
 class Type {
@@ -64 +65 @@
         void set_isAtomic( bool newValue ) { tq.isAtomic = newValue; }
         void set_isAttribute( bool newValue ) { tq.isAttribute = newValue; }
-        std::list<TypeDecl*>& get_forall() { return forall; }
+
+        typedef std::list<TypeDecl *> ForallList;
+        ForallList& get_forall() { return forall; }
 
         /// How many elemental types are represented by this type
@@ -76 +79 @@
   private:
         Qualifiers tq;
-        std::list<TypeDecl*> forall;
+        ForallList forall;
 };
 

src/SynTree/TypeSubstitution.cc ¶

@@ -72 +72 @@
 Type *TypeSubstitution::lookup( std::string formalType ) const {
         TypeEnvType::const_iterator i = typeEnv.find( formalType );
-        
+
         // break on not in substitution set
         if ( i == typeEnv.end() ) return 0;
-        
+
         // attempt to transitively follow TypeInstType links.
         while ( TypeInstType *actualType = dynamic_cast< TypeInstType* >( i->second ) ) {
                 const std::string& typeName = actualType->get_name();
-                
+
                 // break cycles in the transitive follow
                 if ( formalType == typeName ) break;
-                
+
                 // Look for the type this maps to, returning previous mapping if none-such
                 i = typeEnv.find( typeName );
                 if ( i == typeEnv.end() ) return actualType;
         }
-        
+
         // return type from substitution set
         return i->second;
-        
+
 #if 0
         if ( i == typeEnv.end() ) {
@@ -149 +149 @@
         // bind type variables from forall-qualifiers
         if ( freeOnly ) {
-                for ( std::list< TypeDecl* >::const_iterator tyvar = type->get_forall().begin(); tyvar != type->get_forall().end(); ++tyvar ) {
+                for ( Type::ForallList::const_iterator tyvar = type->get_forall().begin(); tyvar != type->get_forall().end(); ++tyvar ) {
                         boundVars.insert( (*tyvar )->get_name() );
                 } // for
@@ -163 +163 @@
         // bind type variables from forall-qualifiers
         if ( freeOnly ) {
-                for ( std::list< TypeDecl* >::const_iterator tyvar = type->get_forall().begin(); tyvar != type->get_forall().end(); ++tyvar ) {
+                for ( Type::ForallList::const_iterator tyvar = type->get_forall().begin(); tyvar != type->get_forall().end(); ++tyvar ) {
                         boundVars.insert( (*tyvar )->get_name() );
                 } // for