Changeset 18997b9 for src

Timestamp:

Jul 22, 2015, 1:16:49 PM (9 years ago)

Author:

Rob Schluntz <rschlunt@…>

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:

353d168

Parents:

893256d (diff), 51b986f (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 ctor

File:

• src/SymTab/Validate.cc (modified) (2 diffs)

src/SymTab/Validate.cc

@@ -9 +9 @@
 // Author           : Richard C. Bilson
 // Created On       : Sun May 17 21:50:04 2015
-// Last Modified By : Peter A. Buhr
-// Last Modified On : Thu Jul 16 16:10:02 2015
-// Update Count     : 189
+// Last Modified By : Rob Schluntz
+// Last Modified On : Wed Jul 22 13:16:00 2015
+// Update Count     : 194
 //
 
@@ -404 +404 @@
                         } // for
                 } // for
+
+                if ( ctx->get_parameters().size() != contextInst->get_parameters().size() ) {
+                        throw SemanticError( "incorrect number of context parameters: ", contextInst );
+                } // if
+
                 applySubstitution( ctx->get_parameters().begin(), ctx->get_parameters().end(), contextInst->get_parameters().begin(), ctx->get_members().begin(), ctx->get_members().end(), back_inserter( contextInst->get_members() ) );
         }