Changeset eba615c

Timestamp:

May 28, 2019, 4:26:07 PM (5 years ago)

Author:

Aaron Moss <a3moss@…>

Branches:

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

Children:

157a816, c786e1d, d76c588, ebc0a85

Parents:

c519942 (diff), 0d70e0d (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) (4 diffs)
• Print.cpp (modified) (13 diffs)
• Stmt.hpp (modified) (3 diffs)

src/AST/Convert.cpp

@@ -10 +10 @@
 // Created On       : Thu May 09 15::37::05 2019
 // Last Modified By : Andrew Beach
-// Last Modified On : Thu May 23 16:59:00 2019
-// Update Count     : 6
+// Last Modified On : Tue May 28 12:00:00 2019
+// Update Count     : 7
 //
 
@@ -1341 +1341 @@
                 if ( ! old ) return nullptr;
                 old->accept(*this);
-                return strict_dynamic_cast< NewT * >( node );
+                ast::Node * ret = node;
+                node = nullptr;
+                return strict_dynamic_cast< NewT * >( ret );
         }
 
@@ -1354 +1356 @@
                         a->accept( *this );
                         ret.emplace_back( strict_dynamic_cast< NewT * >(node) );
+                        node = nullptr;
                 }
                 return ret;
@@ -1877 +1880 @@
                         GET_LABELS_V(old->labels)
                 );
+                cache.emplace( old, stmt );
+                stmt->callStmt = GET_ACCEPT_1(callStmt, Stmt);
                 this->node = stmt;
-                cache.emplace( old, this->node );
-                stmt->callStmt = GET_ACCEPT_1(callStmt, Stmt);
         }
 

src/AST/Print.cpp

@@ -132 +132 @@
                 case ast::Expr::InferUnion::Empty: return;
                 case ast::Expr::InferUnion::Slots: {
-                        os << indent << "with " << inferred.data.resnSlots.size() 
+                        os << indent << "with " << inferred.data.resnSlots.size()
                            << " pending inference slots" << endl;
                         return;
@@ -152 +152 @@
 
         void print( const ast::ParameterizedType::ForallList & forall ) {
-                if ( forall.empty() ) return;   
+                if ( forall.empty() ) return;
                 os << "forall" << endl;
                 ++indent;
@@ -178 +178 @@
         void print( const ast::AggregateDecl * node ) {
                 os << node->typeString() << " " << node->name;
-                
+
                 if ( ! short_mode && node->linkage != Linkage::Cforall ) {
                         os << " " << Linkage::name( node->linkage );
                 }
-                
+
                 os << " " << (node->body ? "with" : "without") << " body";
 
@@ -218 +218 @@
                 print( node->storage );
                 os << node->typeString();
-                
+
                 if ( node->base ) {
                         os << " for ";
@@ -623 +623 @@
         virtual const ast::Stmt * visit( const ast::TryStmt * node ) {
                 ++indent;
-                os << "Try Statement" << endl << indent-1 
+                os << "Try Statement" << endl << indent-1
                    << "... with block:" << endl << indent;
                 safe_print( node->body );
@@ -663 +663 @@
                 safe_print( node->body );
                 --indent;
-                
+
                 return node;
         }
@@ -684 +684 @@
                         os << indent-1 << "target function: ";
                         safe_print( clause.target.func );
-                        
+
                         if ( ! clause.target.args.empty() ) {
                                 os << endl << indent-1 << "... with arguments:" << endl;
@@ -800 +800 @@
                 os << "Name: " << node->name;
                 postprint( node );
-                
+
                 return node;
         }
@@ -931 +931 @@
                 --indent;
                 postprint( node );
-                
+
                 return node;
         }
@@ -1015 +1015 @@
                 if ( node->operand ) node->operand->accept( *this );
                 --indent;
-                
+
                 return node;
         }
@@ -1093 +1093 @@
                 --indent;
                 postprint( node );
-                
+
                 return node;
         }
@@ -1292 +1292 @@
         virtual const ast::Type * visit( const ast::FunctionType * node ) {
                 preprint( node );
-                
+
                 os << "function" << endl;
                 if ( ! node->params.empty() ) {
@@ -1362 +1362 @@
         virtual const ast::Type * visit( const ast::TypeInstType * node ) {
                 preprint( node );
-                os << "instance of type " << node->name 
+                os << "instance of type " << node->name
                    << " (" << (node->kind == ast::TypeVar::Ftype ? "" : "not ") << "function type)";
                 print( node->params );

src/AST/Stmt.hpp

@@ -278 +278 @@
         ExceptionKind kind;
 
-        ThrowStmt( 
+        ThrowStmt(
                 const CodeLocation & loc, ExceptionKind kind, const Expr * expr, const Expr * target,
                 std::vector<Label> && labels = {} )
@@ -296 +296 @@
         ptr<FinallyStmt> finally;
 
-        TryStmt( 
+        TryStmt(
                 const CodeLocation & loc, const CompoundStmt * body,
                 std::vector<ptr<CatchStmt>> && handlers, const FinallyStmt * finally,
@@ -316 +316 @@
         ExceptionKind kind;
 
-        CatchStmt( 
+        CatchStmt(
                 const CodeLocation & loc, ExceptionKind kind, const Decl * decl, const Expr * cond,
                 const Stmt * body, std::vector<Label> && labels = {} )