Changes in src/AST/Convert.cpp [043a5b6:d76c588]

File:

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

src/AST/Convert.cpp

@@ -10 +10 @@
 // Created On       : Thu May 09 15::37::05 2019
 // Last Modified By : Andrew Beach
-// Last Modified On : Wed May 29 11:05:00 2019
-// Update Count     : 8
+// Last Modified On : Tue May 28 12:00:00 2019
+// Update Count     : 7
 //
 
@@ -25 +25 @@
 #include "AST/TypeSubstitution.hpp"
 
-#include "SymTab/Autogen.h"
 #include "SynTree/Attribute.h"
 #include "SynTree/Declaration.h"
 #include "SynTree/TypeSubstitution.h"
-
-#include "Validate/FindSpecialDecls.h"
 
 //================================================================================================
@@ -45 +42 @@
 
 //================================================================================================
-namespace {
-
-// This is to preserve the FindSpecialDecls hack. It does not (and perhaps should not)
-// allow us to use the same stratagy in the new ast.
-ast::FunctionDecl * dereferenceOperator = nullptr;
-ast::StructDecl   * dtorStruct = nullptr;
-ast::FunctionDecl * dtorStructDestroy = nullptr;
-
-}
-
-//================================================================================================
 class ConverterNewToOld : public ast::Visitor {
         BaseSyntaxNode * node = nullptr;
@@ -77 +63 @@
                 std::list< T * > acceptL( const U & container ) {
                         std::list< T * > ret;
-                        for (auto ptr : container ) {
+                        for ( auto ptr : container ) {
                                 ret.emplace_back( accept1( ptr ) );
                         }
@@ -173 +159 @@
                 );
                 decl->withExprs = get<Expression>().acceptL( node->withExprs );
-                if ( dereferenceOperator == node ) {
-                        Validate::dereferenceOperator = decl;
-                }
-                if ( dtorStructDestroy == node ) {
-                        Validate::dtorStructDestroy = decl;
-                }
                 return declWithTypePostamble( decl, node );
         }
@@ -234 +214 @@
                         LinkageSpec::Spec( node->linkage.val )
                 );
-
-                if ( dtorStruct == node ) {
-                        Validate::dtorStruct = decl;
-                }
-
                 return aggregatePostamble( decl, node );
         }
@@ -896 +871 @@
                 );
 
+                rslt->tempDecls = get<ObjectDecl>().acceptL(node->tempDecls);
+                rslt->returnDecls = get<ObjectDecl>().acceptL(node->returnDecls);
+                rslt->dtors = get<Expression>().acceptL(node->dtors);
+
                 auto expr = visitBaseExpr( node, rslt );
                 this->node = expr;
@@ -1453 +1432 @@
                 };
                 cache.emplace( old, decl );
+                decl->withExprs = GET_ACCEPT_V(withExprs, Expr);
                 decl->scopeLevel = old->scopeLevel;
                 decl->mangleName = old->mangleName;
@@ -1460 +1440 @@
 
                 this->node = decl;
-
-                if ( Validate::dereferenceOperator == old ) {
-                        dereferenceOperator = decl;
-                }
-
-                if ( Validate::dtorStructDestroy == old ) {
-                        dtorStructDestroy = decl;
-                }
         }
 
@@ -1489 +1461 @@
 
                 this->node = decl;
-
-                if ( Validate::dtorStruct == old ) {
-                        dtorStruct = decl;
-                }
         }
 
@@ -1517 +1485 @@
         virtual void visit( EnumDecl * old ) override final {
                 if ( inCache( old ) ) return;
-                auto decl = new ast::EnumDecl(
+                auto decl = new ast::UnionDecl(
                         old->location,
                         old->name,
@@ -1537 +1505 @@
         virtual void visit( TraitDecl * old ) override final {
                 if ( inCache( old ) ) return;
-                auto decl = new ast::TraitDecl(
+                auto decl = new ast::UnionDecl(
                         old->location,
                         old->name,
@@ -2298 +2266 @@
                 );
 
+                rslt->tempDecls = GET_ACCEPT_V(tempDecls, ObjectDecl);
+                rslt->returnDecls = GET_ACCEPT_V(returnDecls, ObjectDecl);
+                rslt->dtors = GET_ACCEPT_V(dtors, Expr);
+
                 this->node = visitBaseExpr( old, rslt );
         }