Changeset 60aaa51d for src/AST/Convert.cpp

Timestamp:

Jun 7, 2019, 4:14:48 PM (7 years ago)

Author:

Aaron Moss <a3moss@…>

Branches:

ADT, arm-eh, ast-experimental, enum, forall-pointer-decay, jacob/cs343-translation, jenkins-sandbox, master, new-ast, new-ast-unique-expr, pthread-emulation, qualifiedEnum

Children:

05d55ff

Parents:

5684736

git-author:

Aaron Moss <a3moss@…> (06/07/19 16:14:40)

git-committer:

Aaron Moss <a3moss@…> (06/07/19 16:14:48)

Message:

More resolver porting; mostly CurrentObject

File:

• src/AST/Convert.cpp (modified) (6 diffs)

src/AST/Convert.cpp

@@ -16 +16 @@
 #include "Convert.hpp"
 
+#include <deque>
 #include <unordered_map>
 
@@ -575 +576 @@
 
                 if ( srcInferred.mode == ast::Expr::InferUnion::Params ) {
-                        const ast::InferredParams &srcParams = srcInferred.inferParamsConst();
+                        const ast::InferredParams &srcParams = srcInferred.inferParams();
                         for (auto srcParam : srcParams) {
                                 tgtInferParams[srcParam.first] = ParamEntry(
@@ -585 +586 @@
                         }
                 } else if ( srcInferred.mode == ast::Expr::InferUnion::Slots  ) {
-                        const ast::ResnSlots &srcSlots = srcInferred.resnSlotsConst();
+                        const ast::ResnSlots &srcSlots = srcInferred.resnSlots();
                         for (auto srcSlot : srcSlots) {
                                 tgtResnSlots.push_back(srcSlot);
@@ -1413 +1414 @@
 #       define GET_ACCEPT_V(child, type) \
                 getAcceptV< ast::type, decltype( old->child ) >( old->child )
+        
+        template<typename NewT, typename OldC>
+        std::deque< ast::ptr<NewT> > getAcceptD( OldC& old ) {
+                std::deque< ast::ptr<NewT> > ret;
+                for ( auto a : old ) {
+                        a->accept( *this );
+                        ret.emplace_back( strict_dynamic_cast< NewT * >(node) );
+                        node = nullptr;
+                }
+                return ret;
+        }
+
+#       define GET_ACCEPT_D(child, type) \
+                getAcceptD< ast::type, decltype( old->child ) >( old->child )
 
         ast::Label make_label(Label* old) {
@@ -2449 +2464 @@
 
         virtual void visit( UntypedInitExpr * old ) override final {
-                std::vector<ast::InitAlternative> initAlts;
+                std::deque<ast::InitAlternative> initAlts;
                 for (auto ia : old->initAlts) {
                         initAlts.push_back(ast::InitAlternative(
@@ -2714 +2729 @@
                 this->node = new ast::Designation(
                         old->location,
-                        GET_ACCEPT_V(designators, Expr)
+                        GET_ACCEPT_D(designators, Expr)
                 );
         }