Changes in src/AST/Convert.cpp [d88f8b3b:2c04369]

File:

• src/AST/Convert.cpp (modified) (11 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 17:05:00 2019
-// Update Count     : 9
+// 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"
 
 //================================================================================================
@@ -43 +40 @@
         }
 };
-
-//================================================================================================
-namespace {
-
-// This is to preserve the SymTab::dereferenceOperator hack. It does not (and perhaps should not)
-// allow us to use the same stratagy in the new ast.
-ast::FunctionDecl * dereferenceOperator = nullptr;
-
-}
 
 //================================================================================================
@@ -166 +154 @@
                         LinkageSpec::Spec( node->linkage.val ),
                         get<FunctionType>().accept1( node->type ),
-                        {},
+                        get<CompoundStmt>().accept1( node->stmts ),
                         get<Attribute>().acceptL( node->attributes ),
                         Type::FuncSpecifiers( node->funcSpec.val )
                 );
-                cache.emplace( node, decl );
-                decl->statements = get<CompoundStmt>().accept1( node->stmts );
                 decl->withExprs = get<Expression>().acceptL( node->withExprs );
-                if ( dereferenceOperator == node ) {
-                        Validate::dereferenceOperator = decl;
-                }
                 return declWithTypePostamble( decl, node );
         }
@@ -888 +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;
@@ -1438 +1425 @@
                         old->name,
                         GET_ACCEPT_1(type, FunctionType),
-                        {},
+                        GET_ACCEPT_1(statements, CompoundStmt),
                         { old->storageClasses.val },
                         { old->linkage.val },
@@ -1445 +1432 @@
                 };
                 cache.emplace( old, decl );
-                decl->stmts = GET_ACCEPT_1(statements, CompoundStmt);
                 decl->scopeLevel = old->scopeLevel;
                 decl->mangleName = old->mangleName;
@@ -1453 +1439 @@
 
                 this->node = decl;
-
-                if ( Validate::dereferenceOperator == old ) {
-                        dereferenceOperator = decl;
-                }
         }
 
@@ -1502 +1484 @@
         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,
@@ -1522 +1504 @@
         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,
@@ -2283 +2265 @@
                 );
 
+                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 );
         }