Changeset a2e758e

Timestamp:

May 23, 2019, 10:42:20 AM (6 years ago)

Author:

Thierry Delisle <tdelisle@…>

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:

335f2d8

Parents:

0b8bf27 (diff), 0b57626 (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:

• Attribute.cpp (modified) (1 diff)
• Attribute.hpp (modified) (1 diff)
• Convert.cpp (modified) (12 diffs)
• Expr.cpp (modified) (1 diff)
• Pass.impl.hpp (modified) (1 diff)
• Print.cpp (modified) (4 diffs)
• TypeSubstitution.hpp (modified) (1 diff)
• porting.md (modified) (1 diff)

src/AST/Attribute.cpp

@@ -28 +28 @@
         auto end = name.find_last_not_of('_');
         if ( begin == std::string::npos || end == std::string::npos ) return "";
-        
+
         // convert to lowercase
         std::string ret;

src/AST/Attribute.hpp

@@ -30 +30 @@
 public:
         std::string name;
-        std::vector<ptr<Expr>> parameters;
+        std::vector<ptr<Expr>> params;
 
         Attribute( const std::string & name = "", std::vector<ptr<Expr>> && params = {})
-        : name( name ), parameters( params ) {}
+        : name( name ), params( params ) {}
         virtual ~Attribute() = default;
 

src/AST/Convert.cpp

@@ -1130 +1130 @@
         const ast::Type * visit( const ast::FunctionType * node ) override final {
                 auto ty = new FunctionType {
-                        cv( node ), 
+                        cv( node ),
                         (bool)node->isVarArgs
                 };
@@ -1328 +1328 @@
                 auto attr = new Attribute(
                         node->name,
-                        get<Expression>().acceptL(node->parameters)
+                        get<Expression>().acceptL(node->params)
                 );
                 this->node = attr;
@@ -1338 +1338 @@
                 // TypeSubstitution is not a node in the old model, so the conversion result wouldn't fit in this->node.
                 assert( 0 );
+                (void)node;
                 return nullptr;
         }
@@ -1409 +1410 @@
 #       define GET_LABELS_V(labels) \
                 to<std::vector>::from( make_labels( std::move( labels ) ) )
-        
+
         static ast::CV::Qualifiers cv( Type * ty ) { return { ty->get_qualifiers().val }; }
 
@@ -1549 +1550 @@
 
         virtual void visit( TypeDecl * old ) override final {
-                if ( inCache( old ) ) return;   
+                if ( inCache( old ) ) return;
                 auto decl = new ast::TypeDecl{
                         old->location,
@@ -1587 +1588 @@
         virtual void visit( AsmDecl * old ) override final {
                 auto decl = new ast::AsmDecl{
-                        old->location, 
+                        old->location,
                         GET_ACCEPT_1(stmt, AsmStmt)
                 };
@@ -2142 +2143 @@
                         rslt = new ast::ConstantExpr(
                                 old->location,
-                                GET_ACCEPT_1(result, Type), 
-                                old->constant.get_value(), 
+                                GET_ACCEPT_1(result, Type),
+                                old->constant.get_value(),
                                 (double) old->constant.get_dval()
                         );
@@ -2163 +2164 @@
                         assert(!old->isType);
                         rslt = new ast::SizeofExpr(
-                                old->location, 
+                                old->location,
                                 GET_ACCEPT_1(expr, Expr)
                         );
@@ -2170 +2171 @@
                         assert(old->isType);
                         rslt = new ast::SizeofExpr(
-                                old->location, 
+                                old->location,
                                 GET_ACCEPT_1(type, Type)
                         );
@@ -2184 +2185 @@
                         assert(!old->isType);
                         rslt = new ast::AlignofExpr(
-                                old->location, 
+                                old->location,
                                 GET_ACCEPT_1(expr, Expr)
                         );
@@ -2191 +2192 @@
                         assert(old->isType);
                         rslt = new ast::AlignofExpr(
-                                old->location, 
+                                old->location,
                                 GET_ACCEPT_1(type, Type)
                         );
@@ -2235 +2236 @@
                                 GET_ACCEPT_1(arg1, Expr),
                                 GET_ACCEPT_1(arg2, Expr),
-                                old->get_isAnd() ? 
+                                old->get_isAnd() ?
                                         ast::LogicalFlag::AndExpr :
                                         ast::LogicalFlag::OrExpr

src/AST/Expr.cpp

@@ -345 +345 @@
 }
 
-TupleAssignExpr::TupleAssignExpr( 
+TupleAssignExpr::TupleAssignExpr(
         const CodeLocation & loc, const Type * result, const StmtExpr * s )
 : Expr( loc, result ), stmtExpr() {

src/AST/Pass.impl.hpp

@@ -1879 +1879 @@
 
         VISIT(
-                maybe_accept( node, &Attribute::parameters );
+                maybe_accept( node, &Attribute::params );
         )
 

src/AST/Print.cpp

@@ -7 +7 @@
 // Print.cpp --
 //
-// Author           : Thierry Delisle
-// Created On       : Tue May 21 16:20:15 2019
+// Author : Thierry Delisle
+// Created On : Tue May 21 16:20:15 2019
 // Last Modified By :
 // Last Modified On :
-// Update Count     :
+// Update Count :
 //
 
@@ -21 +21 @@
 #include "Type.hpp"
 #include "TypeSubstitution.hpp"
+
+#include "Common/utility.h" // for group_iterate
 
 using namespace std;
@@ -155 +157 @@
 public:
         virtual const ast::DeclWithType * visit( const ast::ObjectDecl * node ) {
-                if (  !node->name.empty() ) os << node->name << ": ";
+                if ( !node->name.empty() ) os << node->name << ": ";
 
                 if ( node->linkage != Linkage::Cforall ) {
@@ -636 +638 @@
 
         virtual const ast::Designation * visit( const ast::Designation * node ) {
+                if ( node->designators.empty() ) return node;
+                os << "... designated by: " << std::endl;
+                ++indent;
+                for ( const ast::Expr * d : node->designators ) {
+                        os << indent;
+                        d->accept( *this );
+                        os << std::endl;
+                }
+                --indent;
                 return node;
         }
 
         virtual const ast::Init * visit( const ast::SingleInit * node ) {
+                os << "Simple Initializer: ";
+                node->value->accept( *this );
                 return node;
         }
 
         virtual const ast::Init * visit( const ast::ListInit * node ) {
+                os << "Compound initializer: " << std::endl;
+                ++indent;
+                for ( auto p : group_iterate( node->designations, node->initializers ) ) {
+                        const ast::Designation * d = std::get<0>(p);
+                        const ast::Init * init = std::get<1>(p);
+                        os << indent;
+                        init->accept( *this );
+                        os << std::endl;
+                        if ( ! d->designators.empty() ) {
+                                os << indent;
+                                d->accept( *this );
+                        }
+                }
+                --indent;
                 return node;
         }
 
         virtual const ast::Init * visit( const ast::ConstructorInit * node ) {
+                os << "Constructor initializer: " << std::endl;
+                if ( node->ctor ) {
+                        os << indent << "... initially constructed with ";
+                        ++indent;
+                        node->ctor->accept( *this );
+                        --indent;
+                }
+
+                if ( node->dtor ) {
+                        os << indent << "... destructed with ";
+                        ++indent;
+                        node->dtor->accept( *this );
+                        --indent;
+                }
+
+                if ( node->init ) {
+                        os << indent << "... with fallback C-style initializer: ";
+                        ++indent;
+                        node->init->accept( *this );
+                        --indent;
+                }
                 return node;
         }
 
         virtual const ast::Attribute * visit( const ast::Attribute * node ) {
+                if ( node->empty() ) return node;
+                os << "Attribute with name: " << node->name;
+                if ( node->params.empty() ) return node;
+                os << " with parameters: " << std::endl;
+                ++indent;
+                printAll( node->params );
+                --indent;
                 return node;
         }

src/AST/TypeSubstitution.hpp

@@ -25 +25 @@
 #include "Fwd.hpp"        // for UniqueId
 #include "ParseNode.hpp"
-#include "Type.hpp"       
+#include "Type.hpp"
 #include "Common/SemanticError.h"  // for SemanticError
 #include "Visitor.hpp"

src/AST/porting.md

@@ -110 +110 @@
 
 ## Specific Nodes ##
+`Attribute`
+* `parameters` => `params`
+
 `Decl`
 * `storageClasses` => `storage`