Changeset 78a0b88 for src/GenPoly/GenPoly.cc

Timestamp:

Sep 1, 2017, 3:33:25 PM (7 years ago)

Author:

Peter A. Buhr <pabuhr@…>

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:

bc3127d

Parents:

e8ccca3 (diff), a01f7c94 (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 plg2:software/cfa/cfa-cc

File:

• src/GenPoly/GenPoly.cc (modified) (4 diffs)

src/GenPoly/GenPoly.cc

@@ -336 +336 @@
                                 assertf(bparam, "Aggregate parameters should be type expressions");
 
-                                // xxx - might need to let VoidType be a wildcard here too; could have some voids 
+                                // xxx - might need to let VoidType be a wildcard here too; could have some voids
                                 // stuffed in for dtype-statics.
                                 // if ( is<VoidType>( aparam->get_type() ) || is<VoidType>( bparam->get_type() ) ) continue;
                                 if ( ! typesPolyCompatible( aparam->get_type(), bparam->get_type() ) ) return false;
                         }
-                        
+
                         return true;
                 }
@@ -350 +350 @@
                 // polymorphic types always match
                 if ( aid == type_index{typeid(TypeInstType)} ) return true;
-                
+
                 type_index bid{ typeid(*b) };
                 // polymorphic types always match
                 if ( bid == type_index{typeid(TypeInstType)} ) return true;
-                
+
                 // can't match otherwise if different types
                 if ( aid != bid ) return false;
@@ -377 +377 @@
                                 ConstantExpr *ad = dynamic_cast<ConstantExpr*>( aa->get_dimension() );
                                 ConstantExpr *bd = dynamic_cast<ConstantExpr*>( ba->get_dimension() );
-                                if ( ad && bd 
+                                if ( ad && bd
                                                 && ad->get_constant()->get_value() != bd->get_constant()->get_value() )
                                         return false;
@@ -433 +433 @@
 
         void addToTyVarMap( TypeDecl * tyVar, TyVarMap &tyVarMap ) {
+                // xxx - should this actually be insert?
                 tyVarMap[ tyVar->get_name() ] = TypeDecl::Data{ tyVar };
         }