Changeset 6054b18 for src/AST

Timestamp:

May 29, 2019, 9:09:30 PM (5 years ago)

Author:

Peter A. Buhr <pabuhr@…>

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:

466fa01

Parents:

c786e1d (diff), d88f8b3b (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge branch 'master' of plg.uwaterloo.ca:software/cfa/cfa-cc

Location:

src/AST

Files:

• Convert.cpp (modified) (11 diffs)
• Expr.hpp (modified) (1 diff)
• Pass.impl.hpp (modified) (1 diff)
• Print.cpp (modified) (1 diff)

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 );
         }

src/AST/Expr.hpp

@@ -530 +530 @@
 public:
         ptr<ApplicationExpr> callExpr;
-        std::vector<ptr<ObjectDecl>> tempDecls;
-        std::vector<ptr<ObjectDecl>> returnDecls;
-        std::vector<ptr<Expr>> dtors;
 
         ImplicitCopyCtorExpr( const CodeLocation& loc, const ApplicationExpr * call )
-        : Expr( loc, call->result ), tempDecls(), returnDecls(), dtors() { assert( call ); }
+        : Expr( loc, call->result ) { assert( call ); }
 
         const Expr * accept( Visitor & v ) const override { return v.visit( this ); }

src/AST/Pass.impl.hpp

@@ -1319 +1319 @@
                 }
                 maybe_accept( node, &ImplicitCopyCtorExpr::callExpr    );
-                maybe_accept( node, &ImplicitCopyCtorExpr::tempDecls   );
-                maybe_accept( node, &ImplicitCopyCtorExpr::returnDecls );
-                maybe_accept( node, &ImplicitCopyCtorExpr::dtors       );
         )
 

src/AST/Print.cpp

@@ -1023 +1023 @@
                 os << "Implicit Copy Constructor Expression:" << endl << indent;
                 safe_print( node->callExpr );
-                os << endl << indent-1 << "... with temporaries:" << endl;
-                printAll( node->tempDecls );
-                os << endl << indent-1 << "... with return temporaries:" << endl;
-                printAll( node->returnDecls );
                 --indent;
                 postprint( node );