Changeset 1ced874 for src/ResolvExpr/Resolver.cc

Timestamp:

Sep 6, 2016, 4:36:29 PM (8 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:

e76acbe

Parents:

0362d42 (diff), f04a8b81 (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 tuples

File:

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

src/ResolvExpr/Resolver.cc

@@ -528 +528 @@
 
         void Resolver::visit( ConstructorInit *ctorInit ) {
-                try {
-                        maybeAccept( ctorInit->get_ctor(), *this );
-                        maybeAccept( ctorInit->get_dtor(), *this );
-                } 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 );
-                        return;
-                }
+                // xxx - fallback init has been removed => remove fallbackInit function and remove complexity from FixInit and remove C-init from ConstructorInit
+                maybeAccept( ctorInit->get_ctor(), *this );
+                maybeAccept( ctorInit->get_dtor(), *this );
 
                 // found a constructor - can get rid of C-style initializer