Changeset 2acf5fc for src/Parser/ParseNode.h

Timestamp:

Aug 22, 2016, 3:11:00 PM (8 years ago)

Author:

Peter A. Buhr <pabuhr@…>

Branches:

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

Children:

837a17c, bd9f8be, c1c1112

Parents:

ab57786 (diff), 8d2844a (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 plg2:software/cfa/cfa-cc

Conflicts:

src/Parser/parser.cc
src/Parser/parser.yy

File:

• src/Parser/ParseNode.h (modified) (3 diffs)

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;
+}
 
 //##############################################################################