Changeset 071a31a for src/ResolvExpr

Timestamp:

Mar 3, 2016, 2:45:51 PM (8 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:

620cb95

Parents:

c14cff1

Message:

removed array ctor/dtors from prelude, generalized struct routine generation, fix fall back on initializer if ctor not found, begin special casing array ctor/dtor

File:

• src/ResolvExpr/Resolver.cc (modified) (1 diff)

src/ResolvExpr/Resolver.cc

@@ -479 +479 @@
                 TypeEnvironment env;
                 AlternativeFinder finder( *this, env );
-                finder.find( ctorInit->get_ctor() );
-
-                if ( finder.get_alternatives().size() == 0 ) {
+                try {
+                        finder.find( ctorInit->get_ctor() );
+                } catch ( SemanticError ) {
+                        // no alternatives for the constructor initializer - fallback on C-style initializer
+                        // xxx- not sure if this makes a ton of sense - should maybe never be able to have this situation?
                         fallbackInit( ctorInit );
-                } else if ( finder.get_alternatives().size() == 1 ) {
+                        return;
+                }
+
+                assert( ! finder.get_alternatives().empty() );
+
+                if ( finder.get_alternatives().size() == 1 ) {
                         Alternative &choice = finder.get_alternatives().front();
                         if ( ApplicationExpr * appExpr = dynamic_cast< ApplicationExpr * >( choice.expr ) ) {