Changeset 396ee0a for src/SynTree/Declaration.h

Timestamp:

Feb 22, 2017, 2:42:11 PM (9 years ago)

Author:

Aaron Moss <a3moss@…>

Branches:

ADT, aaron-thesis, arm-eh, ast-experimental, cleanup-dtors, 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:

131dbb3, 692de479

Parents:

0788b739 (diff), fc39193 (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 plg.uwaterloo.ca:software/cfa/cfa-cc

File:

• src/SynTree/Declaration.h (modified) (4 diffs)

src/SynTree/Declaration.h

@@ -10 +10 @@
 // Created On       : Mon May 18 07:44:20 2015
 // Last Modified By : Peter A. Buhr
-// Last Modified On : Thu Feb  9 14:27:08 2017
-// Update Count     : 56
+// Last Modified On : Thu Feb 16 14:53:35 2017
+// Update Count     : 57
 //
 
@@ -17 +17 @@
 #define DECLARATION_H
 
+#include <string>
+
+#include "BaseSyntaxNode.h"
+#include "Mutator.h"
+#include "Visitor.h"
 #include "SynTree.h"
-#include "Visitor.h"
-#include "Mutator.h"
 #include "Parser/LinkageSpec.h"
 #include "Parser/ParseNode.h"
-#include <string>
-
-class Declaration {
+
+class Declaration : public BaseSyntaxNode {
   public:
         Declaration( const std::string &name, DeclarationNode::StorageClass sc, LinkageSpec::Spec linkage );
@@ -138 +140 @@
         CompoundStmt *get_statements() const { return statements; }
         void set_statements( CompoundStmt *newValue ) { statements = newValue; }
-        std::list< std::string >& get_oldIdents() { return oldIdents; }
-        std::list< Declaration* >& get_oldDecls() { return oldDecls; }
 
         virtual FunctionDecl *clone() const { return new FunctionDecl( *this ); }
@@ -149 +149 @@
         FunctionType *type;
         CompoundStmt *statements;
-        std::list< std::string > oldIdents;
-        std::list< Declaration* > oldDecls;
 };