Changeset 0555f4b

Timestamp:

Aug 24, 2016, 12:37:56 PM (8 years ago)

Author:

Rob Schluntz <rschlunt@…>

Branches:

ADT, aaron-thesis, arm-eh, ast-experimental, cleanup-dtors, ctor, deferred_resn, demangler, enum, forall-pointer-decay, jacob/cs343-translation, jenkins-sandbox, master, new-ast, new-ast-unique-expr, new-env, no_list, persistent-indexer, pthread-emulation, qualifiedEnum, resolv-new, with_gc

Children:

486341f

Parents:

79970ed (diff), f39096c (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' into ctor

Location:

src

Files:

• Parser/DeclarationNode.cc (modified) (2 diffs)
• Parser/ParseNode.h (modified) (1 diff)
• Parser/StatementNode.cc (modified) (1 diff)
• Parser/TypeData.cc (modified) (1 diff)
• SynTree/Initializer.cc (modified) (1 diff)

src/Parser/DeclarationNode.cc

@@ -50 +50 @@
         newnode->isInline = isInline;
         newnode->isNoreturn = isNoreturn;
-        newnode->bitfieldWidth = bitfieldWidth;
+        newnode->bitfieldWidth = maybeClone( bitfieldWidth );
         newnode->hasEllipsis = hasEllipsis;
-        newnode->initializer = initializer;
+        newnode->initializer = maybeClone( initializer );
         newnode->set_next( maybeClone( get_next() ) );
         newnode->linkage = linkage;
@@ -804 +804 @@
                                         *out++ = decl;
                                 } // if
+                                delete extr;
                         } // if
                         Declaration *decl = cur->build();

src/Parser/ParseNode.h

@@ -109 +109 @@
         ExpressionNode( const ExpressionNode &other );
         virtual ~ExpressionNode() {}
-        virtual ExpressionNode *clone() const { assert( false ); return nullptr; }
+        virtual ExpressionNode *clone() const { return expr ? new ExpressionNode( expr->clone() ) : nullptr; }
 
         bool get_extension() const { return extension; }

src/Parser/StatementNode.cc

@@ -44 +44 @@
                         agg = decl;
                 } // if
-                stmt.reset( new DeclStmt( noLabels, maybeBuild< Declaration >(agg) ) );
+                stmt.reset( new DeclStmt( noLabels, maybeMoveBuild< Declaration >(agg) ) );
         } else {
                 assert( false );

src/Parser/TypeData.cc

@@ -182 +182 @@
                 break;
           case Array:
-                newtype->array->dimension = array->dimension;
+                newtype->array->dimension = maybeClone( array->dimension );
                 newtype->array->isVarLen = array->isVarLen;
                 newtype->array->isStatic = array->isStatic;

src/SynTree/Initializer.cc

@@ -43 +43 @@
 
 SingleInit::~SingleInit() {
+        delete value;
         deleteAll(designators);
 }