Changeset 87b5bf0 for src/Parser/ParseNode.h

Timestamp:

Jun 29, 2016, 2:30:12 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, gc_noraii, 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:

e64365c

Parents:

7305915 (diff), 2fb2ad5 (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

File:

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

src/Parser/ParseNode.h

@@ -28 +28 @@
 //#include "SynTree/Declaration.h"
 #include "Common/UniqueName.h"
+#include "SynTree/Label.h"
 
 class ExpressionNode;
@@ -284 +285 @@
         virtual void printOneLine( std::ostream &, int indent = 0) const;
 
-        const std::list< std::string > &get_labels() const { return labels; };
+        const std::list< Label > &get_labels() const { return labels; };
         void append_label( std::string *label ) { labels.push_back( *label ); delete label; }
   private:
-        std::list< std::string > labels;
+        std::list< Label > labels;
 };
 
@@ -532 +533 @@
         ExpressionNode *output, *input;
         ConstantNode *clobber;
-        std::list<std::string> gotolabels;
+        std::list< Label > gotolabels;
 };