Changeset 40cd873

Timestamp:

Sep 13, 2018, 11:09:15 AM (6 years ago)

Author:

Aaron Moss <a3moss@…>

Branches:

ADT, aaron-thesis, arm-eh, ast-experimental, cleanup-dtors, deferred_resn, enum, forall-pointer-decay, jacob/cs343-translation, jenkins-sandbox, master, new-ast, new-ast-unique-expr, no_list, persistent-indexer, pthread-emulation, qualifiedEnum

Children:

4d59ff9, b499c18

Parents:

b181639

Message:

Fix gcc-5 support for ResolvProtoDump?

File:

• src/CodeTools/ResolvProtoDump.cc (modified) (6 diffs)

src/CodeTools/ResolvProtoDump.cc

@@ -23 +23 @@
 #include <string>
 #include <unordered_set>
+#include <utility>
 #include <vector>
 
@@ -36 +37 @@
         /// Visitor for dumping resolver prototype output
         class ProtoDump : public WithShortCircuiting, public WithVisitorRef<ProtoDump> {
-                std::set<std::string> decls;               ///< Declarations in this scope
-                std::vector<std::string> exprs;            ///< Expressions in this scope
-                std::vector<PassVisitor<ProtoDump>> subs;  ///< Sub-scopes
-                const ProtoDump* parent;                   ///< Outer lexical scope
+                std::set<std::string> decls;     ///< Declarations in this scope
+                std::vector<std::string> exprs;  ///< Expressions in this scope
+                std::vector<ProtoDump> subs;     ///< Sub-scopes
+                const ProtoDump* parent;         ///< Outer lexical scope
 
         public:
@@ -46 +47 @@
 
                 /// Child constructor
-                ProtoDump(const ProtoDump& p) : decls(), exprs(), subs(), parent(&p) {}
+                ProtoDump(const ProtoDump* p) : decls(), exprs(), subs(), parent(p) {}
 
         private:
@@ -67 +68 @@
 
                 /// adds a new subscope to this scope, returning a reference
-                PassVisitor<ProtoDump>& addSub() {
-                        subs.emplace_back( *this );
-                        return subs.back();
+                void addSub( PassVisitor<ProtoDump>&& sub ) {
+                        subs.emplace_back( std::move(sub.pass) );
                 }
         
@@ -517 +517 @@
                         // add body if available
                         if ( decl->statements ) {
-                                PassVisitor<ProtoDump>& body = addSub();
+                                PassVisitor<ProtoDump> body{ this };
                                 
                                 // add named parameters and returns to local scope
@@ -529 +529 @@
                                 // add contents of function to new scope
                                 decl->statements->accept( body );
+
+                                // store sub-scope
+                                addSub( std::move(body) );
                         }