Changeset 839ccbb for src/SynTree

Timestamp:

Nov 20, 2015, 4:19:13 PM (10 years ago)

Author:

Peter A. Buhr <pabuhr@…>

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, string, with_gc

Children:

5189888

Parents:

05587c2 (diff), ed94eac (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.

git-author:

Peter A. Buhr <pabuhr@…> (11/20/15 12:51:58)

git-committer:

Peter A. Buhr <pabuhr@…> (11/20/15 16:19:13)

Message:

Merge branch 'master' of plg2:software/cfa/cfa-cc

Location:

src/SynTree

Files:

• Mutator.h (modified) (2 diffs)
• ReferenceToType.cc (modified) (2 diffs)
• Type.h (modified) (4 diffs)
• TypeSubstitution.cc (modified) (1 diff)

src/SynTree/Mutator.h

@@ -10 +10 @@
 // Created On       : Mon May 18 07:44:20 2015
 // Last Modified By : Peter A. Buhr
-// Last Modified On : Thu Jul 23 23:24:18 2015
-// Update Count     : 7
+// Last Modified On : Thu Nov 19 22:26:16 2015
+// Update Count     : 8
 //
 #include <cassert>
@@ -103 +103 @@
 inline TreeType *maybeMutate( TreeType *tree, MutatorType &mutator ) {
         if ( tree ) {
-                TreeType *newnode = dynamic_cast< TreeType* >( tree->acceptMutator( mutator ) );
+                TreeType *newnode = dynamic_cast< TreeType * >( tree->acceptMutator( mutator ) );
                 assert( newnode );
                 return newnode;

src/SynTree/ReferenceToType.cc

@@ -59 +59 @@
 std::string StructInstType::typeString() const { return "struct"; }
 
-std::list<TypeDecl*>& StructInstType::get_baseParameters() { return baseStruct->get_parameters(); }
+std::list<TypeDecl*>* StructInstType::get_baseParameters() {
+        if ( ! baseStruct ) return NULL;
+        return &baseStruct->get_parameters();
+}
 
 void StructInstType::lookup( const std::string &name, std::list< Declaration* > &foundDecls ) const {
@@ -68 +71 @@
 std::string UnionInstType::typeString() const { return "union"; }
 
-std::list<TypeDecl*>& UnionInstType::get_baseParameters() { return baseUnion->get_parameters(); }
+std::list<TypeDecl*>* UnionInstType::get_baseParameters() {
+        if ( ! baseUnion ) return NULL;
+        return &baseUnion->get_parameters();
+}
 
 void UnionInstType::lookup( const std::string &name, std::list< Declaration* > &foundDecls ) const {

src/SynTree/Type.h

@@ -10 +10 @@
 // Created On       : Mon May 18 07:44:20 2015
 // Last Modified By : Peter A. Buhr
-// Last Modified On : Thu Jul  9 16:46:15 2015
-// Update Count     : 14
+// Last Modified On : Fri Nov 20 12:54:09 2015
+// Update Count     : 15
 //
 
@@ -201 +201 @@
         std::list<DeclarationWithType*> parameters;
 
-        // does the function accept a variable number of arguments following the arguments
-        // specified in the parameters list.    This could be because of
+        // Does the function accept a variable number of arguments following the arguments specified in the parameters list.
+        // This could be because of
         // - an ellipsis in a prototype declaration
         // - an unprototyped declaration
@@ -238 +238 @@
         void set_baseStruct( StructDecl *newValue ) { baseStruct = newValue; }
 
-        /// Accesses generic parameters of base struct
-        std::list<TypeDecl*>& get_baseParameters();
+        /// Accesses generic parameters of base struct (NULL if none such)
+        std::list<TypeDecl*> * get_baseParameters();
         
         /// Looks up the members of this struct named "name" and places them into "foundDecls".
@@ -265 +265 @@
         void set_baseUnion( UnionDecl *newValue ) { baseUnion = newValue; }
 
-        /// Accesses generic parameters of base union
-        std::list<TypeDecl*>& get_baseParameters();
+        /// Accesses generic parameters of base union (NULL if none such)
+        std::list<TypeDecl*> * get_baseParameters();
         
         /// looks up the members of this union named "name" and places them into "foundDecls"

src/SynTree/TypeSubstitution.cc

@@ -147 +147 @@
         } // if
         // bind type variables from generic type instantiations
-        for ( std::list< TypeDecl* >::const_iterator tyvar = type->get_baseParameters().begin(); tyvar != type->get_baseParameters().end(); ++tyvar ) {
-                boundVars.insert( (*tyvar)->get_name() );
-        } // for
+        std::list< TypeDecl* > *baseParameters = type->get_baseParameters();
+        if ( baseParameters && ! type->get_parameters().empty() ) {
+                for ( std::list< TypeDecl* >::const_iterator tyvar = baseParameters->begin(); tyvar != baseParameters->end(); ++tyvar ) {
+                        boundVars.insert( (*tyvar)->get_name() );
+                } // for
+        } // if
         Type *ret = Mutator::mutate( type );
         boundVars = oldBoundVars;