Changes in src/InitTweak/FixInitNew.cpp [0bd3faf:fa761c2]

File:

• src/InitTweak/FixInitNew.cpp (modified) (4 diffs)

src/InitTweak/FixInitNew.cpp

@@ -178 +178 @@
 /// (currently by FixInit)
 struct InsertDtors final : public ObjDeclCollector, public ast::WithStmtsToAdd<> {
+        typedef std::list< ObjectDecl * > OrderedDecls;
+        typedef std::list< OrderedDecls > OrderedDeclsStack;
+
         InsertDtors( ast::Pass<LabelFinder> & finder ) : finder( finder ), labelVars( finder.core.vars ) {}
 
@@ -191 +194 @@
         ast::Pass<LabelFinder> & finder;
         LabelFinder::LabelMap & labelVars;
+        OrderedDeclsStack reverseDeclOrder;
 };
 
@@ -917 +921 @@
                                         // static variables with the same name in different functions.
                                         // Note: it isn't sufficient to modify only the mangleName, because
-                                        // then subsequent SymbolTable passes can choke on seeing the object's name
+                                        // then subsequent Indexer passes can choke on seeing the object's name
                                         // if another object has the same name and type. An unfortunate side-effect
                                         // of renaming the object is that subsequent NameExprs may fail to resolve,
@@ -1169 +1173 @@
                                 arg2 = new ast::MemberExpr(funcDecl->location, field, new ast::VariableExpr(funcDecl->location, function->params.back() ) );
                         }
-                        InitExpander srcParam( arg2 );
+                        InitExpander_new srcParam( arg2 );
                         // cast away reference type and construct field.
                         ast::Expr * thisExpr = new ast::CastExpr(funcDecl->location, new ast::VariableExpr(funcDecl->location, thisParam ), thisParam->get_type()->stripReferences());