Changes in src/ResolvExpr/Resolver.cc [60aaa51d:2d11663]

File:

• src/ResolvExpr/Resolver.cc (modified) (3 diffs)

src/ResolvExpr/Resolver.cc

@@ -1227 +1227 @@
                 void previsit( const ast::WaitForStmt * );
 
-                const ast::SingleInit * previsit( const ast::SingleInit * );
-                const ast::ListInit * previsit( const ast::ListInit * );
-                void previsit( const ast::ConstructorInit * );
+                const ast::SingleInit *      previsit( const ast::SingleInit * );
+                const ast::ListInit *        previsit( const ast::ListInit * );
+                const ast::ConstructorInit * previsit( const ast::ConstructorInit * );
         };
 
@@ -1510 +1510 @@
                         // iterate designations and initializers in pairs, moving the cursor to the current 
                         // designated object and resolving the initializer against that object
-                        #warning unimplemented; Resolver port in progress
-                        assert(false);
-                }
+                        listInit = ast::mutate_field_index(
+                                listInit, &ast::ListInit::designations, i, 
+                                currentObject.findNext( listInit->designations[i] ) );
+                        listInit = ast::mutate_field_index(
+                                listInit, &ast::ListInit::initializers, i,
+                                listInit->initializers[i]->accept( *visitor ) );
+                }
+
+                // move cursor out of brace-enclosed initializer-list
+                currentObject.exitListInit();
 
                 visit_children = false;
@@ -1518 +1525 @@
         }
 
-        void Resolver_new::previsit( const ast::ConstructorInit * ctorInit ) {
-                #warning unimplemented; Resolver port in progress
-                (void)ctorInit;
-                assert(false);
+        const ast::ConstructorInit * Resolver_new::previsit( const ast::ConstructorInit * ctorInit ) {
+                visitor->maybe_accept( ctorInit, &ast::ConstructorInit::ctor );
+                visitor->maybe_accept( ctorInit, &ast::ConstructorInit::dtor );
+
+                // found a constructor - can get rid of C-style initializer
+                // xxx - Rob suggests this field is dead code
+                ctorInit = ast::mutate_field( ctorInit, &ast::ConstructorInit::init, nullptr );
+
+                // intrinsic single-parameter constructors and destructors do nothing. Since this was 
+                // implicitly generated, there's no way for it to have side effects, so get rid of it to 
+                // clean up generated code
+                if ( InitTweak::isIntrinsicSingleArgCallStmt( ctorInit->ctor ) ) {
+                        ctorInit = ast::mutate_field( ctorInit, &ast::ConstructorInit::ctor, nullptr );
+                }
+                if ( InitTweak::isIntrinsicSingleArgCallStmt( ctorInit->dtor ) ) {
+                        ctorInit = ast::mutate_field( ctorInit, &ast::ConstructorInit::dtor, nullptr );
+                }
+
+                return ctorInit;
         }