Changes in / [896737b:10a1225]

Location:

src/AST

Files:

• Convert.cpp (modified) (13 diffs)
• Stmt.hpp (modified) (2 diffs)

src/AST/Convert.cpp

@@ -10 +10 @@
 // Created On       : Thu May 09 15::37::05 2019
 // Last Modified By : Andrew Beach
-// Last Modified On : Fri May 17 11:14:00 2019
-// Update Count     : 2
+// Last Modified On : Thu May 16 17:21:00 2019
+// Update Count     : 1
 //
 
@@ -54 +54 @@
 //================================================================================================
 
+#define ACCEPT_1(name, child, type) \
+        old->child->accept(*this); \
+        auto name = strict_dynamic_cast< ast::type * >( node );
+
+#define ACCEPT_N(name, child, type) \
+        std::vector< ast::ptr<ast::type> > name; \
+        name.reserve( old->child.size() ); \
+        for( auto a : old->child ) { \
+                a->accept( *this ); \
+                name.emplace_back( strict_dynamic_cast< ast::type * >(node) ); \
+        }
+
 class ConverterOldToNew : public Visitor {
 public:
@@ -110 +122 @@
 
         virtual void visit( ObjectDecl * old ) override final {
+                ACCEPT_1(type, type, Type)
+                ACCEPT_1(init, init, Init)
+                ACCEPT_1(bitWd, bitfieldWidth, Expr)
+                ACCEPT_N(attr, attributes, Attribute)
+
                 auto decl = new ast::ObjectDecl(
                         old->location,
                         old->name,
-                        GET_ACCEPT_1(type, Type),
-                        GET_ACCEPT_1(init, Init),
+                        type,
+                        init,
                         { old->get_storageClasses().val },
                         { old->linkage.val },
-                        GET_ACCEPT_1(bitfieldWidth, Expr),
-                        GET_ACCEPT_V(attributes, Attribute),
+                        bitWd,
+                        std::move( attr ),
                         { old->get_funcSpec().val }
                 );
@@ -135 +152 @@
 
         virtual void visit( StructDecl * old ) override final {
+                ACCEPT_N(members, members, Decl)
+                ACCEPT_N(params, parameters, TypeDecl)
+                ACCEPT_1(parent, parent, AggregateDecl)
+                ACCEPT_N(attr, attributes, Attribute)
+
                 auto decl = new ast::StructDecl(
                         old->location,
                         old->name,
                         old->kind,
-                        GET_ACCEPT_V(attributes, Attribute),
+                        std::move( attr ),
                         { old->linkage.val }
                 );
-                decl->parent = GET_ACCEPT_1(parent, AggregateDecl);
+                decl->parent = parent;
                 decl->body   = old->body;
-                decl->params = GET_ACCEPT_V(parameters, TypeDecl);
-                decl->members    = GET_ACCEPT_V(members, Decl);
+                decl->params = params;
+                decl->members    = members;
                 decl->extension  = old->extension;
                 decl->uniqueId   = old->uniqueId;
@@ -154 +176 @@
 
         virtual void visit( UnionDecl * old ) override final {
+                ACCEPT_N(members, members, Decl)
+                ACCEPT_N(params, parameters, TypeDecl)
+                ACCEPT_1(parent, parent, AggregateDecl)
+                ACCEPT_N(attr, attributes, Attribute)
+
                 auto decl = new ast::UnionDecl(
                         old->location,
                         old->name,
-                        GET_ACCEPT_V(attributes, Attribute),
+                        std::move( attr ),
                         { old->linkage.val }
                 );
-                decl->parent = GET_ACCEPT_1(parent, AggregateDecl);
+                decl->parent = parent;
                 decl->body   = old->body;
-                decl->params = GET_ACCEPT_V(parameters, TypeDecl);
-                decl->members    = GET_ACCEPT_V(members, Decl);
+                decl->params = params;
+                decl->members    = members;
                 decl->extension  = old->extension;
                 decl->uniqueId   = old->uniqueId;
@@ -172 +199 @@
 
         virtual void visit( EnumDecl * old ) override final {
+                ACCEPT_N(members, members, Decl)
+                ACCEPT_N(params, parameters, TypeDecl)
+                ACCEPT_1(parent, parent, AggregateDecl)
+                ACCEPT_N(attr, attributes, Attribute)
+
                 auto decl = new ast::UnionDecl(
                         old->location,
                         old->name,
-                        GET_ACCEPT_V(attributes, Attribute),
+                        std::move( attr ),
                         { old->linkage.val }
                 );
-                decl->parent = GET_ACCEPT_1(parent, AggregateDecl);
+                decl->parent = parent;
                 decl->body   = old->body;
-                decl->params = GET_ACCEPT_V(parameters, TypeDecl);
-                decl->members    = GET_ACCEPT_V(members, Decl);
+                decl->params = params;
+                decl->members    = members;
                 decl->extension  = old->extension;
                 decl->uniqueId   = old->uniqueId;
@@ -190 +222 @@
 
         virtual void visit( TraitDecl * old ) override final {
+                ACCEPT_N(members, members, Decl)
+                ACCEPT_N(params, parameters, TypeDecl)
+                ACCEPT_1(parent, parent, AggregateDecl)
+                ACCEPT_N(attr, attributes, Attribute)
+
                 auto decl = new ast::UnionDecl(
                         old->location,
                         old->name,
-                        GET_ACCEPT_V(attributes, Attribute),
+                        std::move( attr ),
                         { old->linkage.val }
                 );
-                decl->parent = GET_ACCEPT_1(parent, AggregateDecl);
+                decl->parent = parent;
                 decl->body   = old->body;
-                decl->params = GET_ACCEPT_V(parameters, TypeDecl);
-                decl->members    = GET_ACCEPT_V(members, Decl);
+                decl->params = params;
+                decl->members    = members;
                 decl->extension  = old->extension;
                 decl->uniqueId   = old->uniqueId;
@@ -212 +249 @@
 
         virtual void visit( TypedefDecl * old ) override final {
+                ACCEPT_1(type, base, Type)
+                ACCEPT_N(params, parameters, TypeDecl)
+                ACCEPT_N(asserts, assertions, DeclWithType)
                 auto decl = new ast::TypedefDecl(
                         old->location,
                         old->name,
                         { old->storageClasses.val },
-                        GET_ACCEPT_1(base, Type),
+                        type,
                         { old->linkage.val }
                 );
-                decl->assertions = GET_ACCEPT_V(assertions, DeclWithType);
-                decl->params     = GET_ACCEPT_V(parameters, TypeDecl);
+
+                decl->assertions = asserts;
+                decl->params     = params;
                 decl->extension  = old->extension;
                 decl->uniqueId   = old->uniqueId;
@@ -237 +278 @@
 
         virtual void visit( CompoundStmt * old ) override final {
+                ACCEPT_N(kids, kids, Stmt)
                 auto stmt = new ast::CompoundStmt(
                         old->location,
-                        to<std::list>::from( GET_ACCEPT_V(kids, Stmt) ),
-                        GET_LABELS_V(old->labels)
-                );
+                        to<std::list>::from( std::move(kids) )
+                );
+                stmt->labels = to<std::vector>::from( make_labels( std::move( old->labels ) ) );
 
                 this->node = stmt;
@@ -346 +388 @@
                         CASE(FallThroughDefault);
                         #undef CASE
-                        default:
-                                assertf(false, "Invalid BranchStmt::Type %d\n", old->type);
                         }
 
@@ -379 +419 @@
                         kind = ast::ThrowStmt::Resume;
                         break;
-                default:
-                        assertf(false, "Invalid ThrowStmt::Kind %d\n", old->kind);
                 }
 
@@ -411 +449 @@
                         kind = ast::CatchStmt::Resume;
                         break;
-                default:
-                        assertf(false, "Invalid CatchStmt::Kind %d\n", old->kind);
                 }
 
@@ -753 +789 @@
 #undef GET_ACCEPT_1
 
+#undef ACCEPT_N
+#undef ACCEPT_1
+
 std::list< ast::ptr< ast::Decl > > convert( const std::list< Declaration * > & translationUnit ) {
         ConverterOldToNew c;

src/AST/Stmt.hpp

@@ -10 +10 @@
 // Created On       : Wed May  8 13:00:00 2019
 // Last Modified By : Andrew Beach
-// Last Modified On : Fri May 17 10:03:00 2019
-// Update Count     : 4
+// Last Modified On : Wed May 16 12:20:00 2019
+// Update Count     : 3
 //
 
@@ -54 +54 @@
         std::list<ptr<Stmt>> kids;
 
-        CompoundStmt(const CodeLocation & loc, std::list<ptr<Stmt>> && ks = {},
-                std::vector<Label>&& labels = {} )
-        : Stmt(loc, std::move(labels)), kids(std::move(ks)) {}
+        CompoundStmt(const CodeLocation & loc, std::list<ptr<Stmt>> && ks = {} )
+        : Stmt(loc), kids(std::move(ks)) {}
 
         CompoundStmt( const CompoundStmt& o );