Changes in / [80722d0:d30790f]

Location:

src

Files:

• Common/utility.h (modified) (1 diff)
• Parser/DeclarationNode.cc (modified) (1 diff)
• Parser/ExpressionNode.cc (modified) (5 diffs)
• Parser/InitializerNode.cc (modified) (1 diff)
• Parser/ParseNode.h (modified) (3 diffs)
• Parser/StatementNode.cc (modified) (2 diffs)
• Parser/TypeData.cc (modified) (1 diff)
• include/assert.h (modified) (3 diffs)

src/Common/utility.h

@@ -56 +56 @@
 }
 
-
 template< typename Input_iterator >
 void printEnums( Input_iterator begin, Input_iterator end, const char * const *name_array, std::ostream &os ) {

src/Parser/DeclarationNode.cc

@@ -230 +230 @@
         DeclarationNode *newnode = new DeclarationNode;
         newnode->name = assign_strptr( name );
-        newnode->enumeratorValue = constant;
+        newnode->enumeratorValue.reset( constant );
         typedefTable.addToEnclosingScope( newnode->name, TypedefTable::ID );
         return newnode;

src/Parser/ExpressionNode.cc

@@ -183 +183 @@
 
 Expression *build_cast( DeclarationNode *decl_node, ExpressionNode *expr_node ) {
-        Type *targetType = decl_node->buildType();
+        Type *targetType = maybeMoveBuildType( decl_node );
         if ( dynamic_cast< VoidType * >( targetType ) ) {
                 delete targetType;
@@ -213 +213 @@
 }
 Expression *build_sizeOftype( DeclarationNode *decl_node ) {
-        Expression* ret = new SizeofExpr( decl_node->buildType() );
-        delete decl_node;
-        return ret;
+        return new SizeofExpr( maybeMoveBuildType( decl_node ) );
 }
 Expression *build_alignOfexpr( ExpressionNode *expr_node ) {
@@ -221 +219 @@
 }
 Expression *build_alignOftype( DeclarationNode *decl_node ) {
-        return new AlignofExpr( decl_node->buildType() );
+        return new AlignofExpr( maybeMoveBuildType( decl_node) );
 }
 Expression *build_offsetOf( DeclarationNode *decl_node, NameExpr *member ) {
-        Expression* ret = new UntypedOffsetofExpr( decl_node->buildType(), member->get_name() );
-        delete decl_node;
+        Expression* ret = new UntypedOffsetofExpr( maybeMoveBuildType( decl_node ), member->get_name() );
         delete member;
         return ret;
@@ -269 +266 @@
 }
 Expression *build_attrtype( NameExpr *var, DeclarationNode * decl_node ) {
-        return new AttrExpr( var, decl_node->buildType() );
+        return new AttrExpr( var, maybeMoveBuildType( decl_node ) );
 }
 
@@ -296 +293 @@
 }
 Expression *build_typevalue( DeclarationNode *decl ) {
-        return new TypeExpr( decl->buildType() );
+        return new TypeExpr( maybeMoveBuildType( decl ) );
 }
 

src/Parser/InitializerNode.cc

@@ -45 +45 @@
 InitializerNode::~InitializerNode() {
         delete expr;
+        delete designator;
+        delete kids;
 }
 

src/Parser/ParseNode.h

@@ -280 +280 @@
         LinkageSpec::Spec get_linkage() const { return linkage; }
         DeclarationNode *extractAggregate() const;
-        ExpressionNode *get_enumeratorValue() const { return enumeratorValue; }
+        bool has_enumeratorValue() const { return (bool)enumeratorValue; }
+        ExpressionNode *consume_enumeratorValue() const { return const_cast<DeclarationNode*>(this)->enumeratorValue.release(); }
 
         bool get_extension() const { return extension; }
@@ -295 +296 @@
         std::list< std::string > attributes;
         ExpressionNode *bitfieldWidth;
-        ExpressionNode *enumeratorValue;
+        std::unique_ptr<ExpressionNode> enumeratorValue;
         InitializerNode *initializer;
         bool hasEllipsis;
@@ -306 +307 @@
 
 Type *buildType( TypeData *type );
+
+static inline Type * maybeMoveBuildType( const DeclarationNode *orig ) {
+        Type* ret = orig ? orig->buildType() : nullptr;
+        delete orig;
+        return ret;
+}
 
 //##############################################################################

src/Parser/StatementNode.cc

@@ -54 +54 @@
         // find end of list and maintain previous pointer
         for ( StatementNode * curr = prev; curr != nullptr; curr = (StatementNode *)curr->get_next() ) {
-                StatementNode *node = dynamic_cast< StatementNode * >(curr);
-                assert( node );
+                StatementNode *node = safe_dynamic_cast< StatementNode * >(curr);
                 assert( dynamic_cast< CaseStmt * >(node->stmt.get()) );
                 prev = curr;
@@ -160 +159 @@
         std::list< Statement * > branches;
         buildMoveList< Statement, StatementNode >( catch_stmt, branches );
-        CompoundStmt *tryBlock = dynamic_cast< CompoundStmt * >(maybeMoveBuild< Statement >(try_stmt));
-        assert( tryBlock );
+        CompoundStmt *tryBlock = safe_dynamic_cast< CompoundStmt * >(maybeMoveBuild< Statement >(try_stmt));
         FinallyStmt *finallyBlock = dynamic_cast< FinallyStmt * >(maybeMoveBuild< Statement >(finally_stmt) );
         return new TryStmt( noLabels, tryBlock, branches, finallyBlock );

src/Parser/TypeData.cc

@@ -909 +909 @@
         std::list< Declaration * >::iterator members = ret->get_members().begin();
         for ( const DeclarationNode *cur = enumeration->constants; cur != nullptr; cur = dynamic_cast< DeclarationNode * >( cur->get_next() ), ++members ) {
-                if ( cur->get_enumeratorValue() != nullptr ) {
+                if ( cur->has_enumeratorValue() ) {
                         ObjectDecl *member = dynamic_cast< ObjectDecl * >(*members);
-                        member->set_init( new SingleInit( maybeBuild< Expression >( cur->get_enumeratorValue() ), std::list< Expression * >() ) );
+                        member->set_init( new SingleInit( maybeMoveBuild< Expression >( cur->consume_enumeratorValue() ), std::list< Expression * >() ) );
                 } // if
         } // for

src/include/assert.h

@@ -4 +4 @@
 // The contents of this file are covered under the licence agreement in the
 // file "LICENCE" distributed with Cforall.
-// 
-// assert.h -- 
-// 
+//
+// assert.h --
+//
 // Author           : Peter A. Buhr
 // Created On       : Thu Aug 18 13:19:26 2016
@@ -12 +12 @@
 // Last Modified On : Thu Aug 18 13:25:55 2016
 // Update Count     : 4
-// 
+//
+
+#pragma once
 
 #include_next <assert.h>
@@ -22 +24 @@
 void __assert_fail_f( const char *assertion, const char *file, unsigned int line, const char *function, const char *fmt, ... );
 
+template<typename T, typename U>
+static inline T safe_dynamic_cast(const U& src) {
+        T ret = dynamic_cast<T>(src);
+        assert(ret);
+        return ret;
+}
+
 // Local Variables: //
 // tab-width: 4 //