Changes in / [ef5ef56:dff6452]

Location:

src

Files:

• AST/Convert.cpp (modified) (16 diffs)
• AST/Expr.cpp (modified) (1 diff)
• AST/Node.hpp (modified) (1 diff)
• Common/utility.h (modified) (1 diff)
• include/cassert (modified) (1 diff)

src/AST/Convert.cpp

@@ -1342 +1342 @@
 };
 
-std::list< Declaration * > convert( const std::list< ast::ptr< ast::Decl > > && translationUnit ) {
+std::list< Declaration * > convert( std::list< ast::ptr< ast::Decl > > && translationUnit ) {
         ConverterNewToOld c;
         std::list< Declaration * > decls;
         for(auto d : translationUnit) {
                 decls.emplace_back( c.decl( d ) );
+                delete d;
         }
         return decls;
@@ -1435 +1436 @@
                         { old->get_funcSpec().val }
                 );
-                cache.emplace( old, decl );
                 decl->scopeLevel = old->scopeLevel;
                 decl->mangleName = old->mangleName;
@@ -1441 +1441 @@
                 decl->uniqueId   = old->uniqueId;
                 decl->extension  = old->extension;
+                cache.emplace( old, decl );
 
                 this->node = decl;
@@ -1457 +1458 @@
                         { old->get_funcSpec().val }
                 };
-                cache.emplace( old, decl );
                 decl->scopeLevel = old->scopeLevel;
                 decl->mangleName = old->mangleName;
@@ -1463 +1463 @@
                 decl->uniqueId   = old->uniqueId;
                 decl->extension  = old->extension;
+                cache.emplace( old, decl );
 
                 this->node = decl;
@@ -1476 +1477 @@
                         { old->linkage.val }
                 );
-                cache.emplace( old, decl );
                 decl->parent = GET_ACCEPT_1(parent, AggregateDecl);
                 decl->body   = old->body;
@@ -1484 +1484 @@
                 decl->uniqueId   = old->uniqueId;
                 decl->storage    = { old->storageClasses.val };
+                cache.emplace( old, decl );
 
                 this->node = decl;
@@ -1496 +1497 @@
                         { old->linkage.val }
                 );
-                cache.emplace( old, decl );
                 decl->parent = GET_ACCEPT_1(parent, AggregateDecl);
                 decl->body   = old->body;
@@ -1504 +1504 @@
                 decl->uniqueId   = old->uniqueId;
                 decl->storage    = { old->storageClasses.val };
+                cache.emplace( old, decl );
 
                 this->node = decl;
@@ -1516 +1517 @@
                         { old->linkage.val }
                 );
-                cache.emplace( old, decl );
                 decl->parent = GET_ACCEPT_1(parent, AggregateDecl);
                 decl->body   = old->body;
@@ -1524 +1524 @@
                 decl->uniqueId   = old->uniqueId;
                 decl->storage    = { old->storageClasses.val };
+                cache.emplace( old, decl );
 
                 this->node = decl;
@@ -1536 +1537 @@
                         { old->linkage.val }
                 );
-                cache.emplace( old, decl );
                 decl->parent = GET_ACCEPT_1(parent, AggregateDecl);
                 decl->body   = old->body;
@@ -1544 +1544 @@
                 decl->uniqueId   = old->uniqueId;
                 decl->storage    = { old->storageClasses.val };
+                cache.emplace( old, decl );
 
                 this->node = decl;
@@ -1559 +1560 @@
                         GET_ACCEPT_1(init, Type)
                 };
-                cache.emplace( old, decl );
                 decl->assertions = GET_ACCEPT_V(assertions, DeclWithType);
                 decl->params     = GET_ACCEPT_V(parameters, TypeDecl);
                 decl->extension  = old->extension;
                 decl->uniqueId   = old->uniqueId;
+                cache.emplace( old, decl );
 
                 this->node = decl;
@@ -1911 +1912 @@
         ast::TypeSubstitution * convertTypeSubstitution(const TypeSubstitution * old) {
 
-                if (!old) return nullptr;
-
                 ast::TypeSubstitution *rslt = new ast::TypeSubstitution();
 
@@ -2704 +2703 @@
                 d->accept( c );
                 decls.emplace_back( c.decl() );
-        }
-        deleteAll(translationUnit);
+                delete d;
+        }
         return decls;
 }

src/AST/Expr.cpp

@@ -157 +157 @@
         assert( aggregate->result );
 
-//      assert(!"unimplemented; need TypeSubstitution, genericSubstitution");
+        assert(!"unimplemented; need TypeSubstitution, genericSubstitution");
 }
 

src/AST/Node.hpp

@@ -115 +115 @@
         template<typename o_node_t>
         ptr_base & operator=( const o_node_t * node ) {
-                assign( node ? strict_dynamic_cast<const node_t *>(node) : nullptr );
+                assign(strict_dynamic_cast<const node_t *>(node));
                 return *this;
         }

src/Common/utility.h

@@ -74 +74 @@
 
 template< typename Container >
-void deleteAll( const Container &container ) {
-        for ( const auto &i : container ) {
-                delete i;
+void deleteAll( Container &container ) {
+        for ( typename Container::iterator i = container.begin(); i != container.end(); ++i ) {
+                delete *i;
         } // for
 }

src/include/cassert

@@ -44 +44 @@
 
 template<typename T, typename U>
-static inline __attribute__((nonnull)) T strict_dynamic_cast( const U & src ) {
-        assert(src);
+static inline T strict_dynamic_cast( const U & src ) {
         T ret = dynamic_cast<T>(src);
         assertf(ret, "%s", toString(src).c_str());