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

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 : Tue May 28 12:00:00 2019
-// Update Count     : 7
+// Last Modified On : Wed May 29 17:05:00 2019
+// Update Count     : 9
 //
 
@@ -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"
 
 //================================================================================================
@@ -40 +43 @@
         }
 };
+
+//================================================================================================
+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;
+
+}
 
 //================================================================================================
@@ -154 +166 @@
                         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 );
         }
@@ -871 +888 @@
                 );
 
-                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;
@@ -1425 +1438 @@
                         old->name,
                         GET_ACCEPT_1(type, FunctionType),
-                        GET_ACCEPT_1(statements, CompoundStmt),
+                        {},
                         { old->storageClasses.val },
                         { old->linkage.val },
@@ -1432 +1445 @@
                 };
                 cache.emplace( old, decl );
+                decl->stmts = GET_ACCEPT_1(statements, CompoundStmt);
                 decl->scopeLevel = old->scopeLevel;
                 decl->mangleName = old->mangleName;
@@ -1439 +1453 @@
 
                 this->node = decl;
+
+                if ( Validate::dereferenceOperator == old ) {
+                        dereferenceOperator = decl;
+                }
         }
 
@@ -1484 +1502 @@
         virtual void visit( EnumDecl * old ) override final {
                 if ( inCache( old ) ) return;
-                auto decl = new ast::UnionDecl(
+                auto decl = new ast::EnumDecl(
                         old->location,
                         old->name,
@@ -1504 +1522 @@
         virtual void visit( TraitDecl * old ) override final {
                 if ( inCache( old ) ) return;
-                auto decl = new ast::UnionDecl(
+                auto decl = new ast::TraitDecl(
                         old->location,
                         old->name,
@@ -2265 +2283 @@
                 );
 
-                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 );
         }