Changeset 97f65d5 for src/GenPoly

Timestamp:

Feb 15, 2017, 8:13:49 AM (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:

e6512c8

Parents:

aa9ee19 (diff), 3149e7e (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:/u/cforall/software/cfa/cfa-cc

Location:

src/GenPoly

Files:

• Box.cc (modified) (1 diff)
• InstantiateGeneric.cc (modified) (1 diff)

src/GenPoly/Box.cc

@@ -236 +236 @@
                                 } // if
                         } catch( SemanticError &e ) {
+                                e.set_location( (*i)->location );
                                 errors.append( e );
                         } // try

src/GenPoly/InstantiateGeneric.cc

@@ -122 +122 @@
                 /// Adds a value for a (key, typeList) pair to the current scope
                 void insert( Key *key, const std::list< TypeExpr* > &params, Value *value ) {
-                        instantiations[ key ].push_back( Instantiation( TypeList( params ), value ) );
+                        auto it = instantiations.findAt( instantiations.currentScope(), key );
+                        if ( it == instantiations.end() ) {
+                                instantiations.insert( key, ValueList{ Instantiation{ TypeList( params ), value } } );
+                        } else {
+                                it->second.push_back( Instantiation{ TypeList( params ), value } );
+                        }
                 }
         };