Changeset 8217e8f for src/SynTree

Timestamp:

Aug 14, 2017, 2:07:34 PM (8 years ago)

Author:

Rob Schluntz <rschlunt@…>

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:

6cfe8bb

Parents:

36a5a77 (diff), bd46af4 (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 references

File:

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

src/SynTree/Declaration.h

@@ -10 +10 @@
 // Created On       : Mon May 18 07:44:20 2015
 // Last Modified By : Andrew Beach
-// Last Modified On : Wed Aug  9 14:45:00 2017
-// Update Count     : 126
+// Last Modified On : Mon Aug 14 10:15:00 2017
+// Update Count     : 128
 //
 
@@ -269 +269 @@
         typedef AggregateDecl Parent;
   public:
-        StructDecl( const std::string &name, DeclarationNode::Aggregate kind = DeclarationNode::Struct, const std::list< Attribute * > & attributes = std::list< class Attribute * >(), LinkageSpec::Spec linkage = LinkageSpec::Cforall ) : Parent( name, attributes, linkage ), kind( kind ), tagged( false ), parent_name( "" ) {}
-        StructDecl( const std::string &name, const std::string *parent, const std::list< Attribute * > & attributes = std::list< class Attribute * >(), LinkageSpec::Spec linkage = LinkageSpec::Cforall ) : Parent( name, attributes, linkage ), kind( DeclarationNode::Struct ), tagged( true ), parent_name( parent ? *parent : "" ) {}
-        StructDecl( const StructDecl &other ) : Parent( other ) {}
+        StructDecl( const std::string &name, DeclarationNode::Aggregate kind = DeclarationNode::Struct, const std::list< Attribute * > & attributes = std::list< class Attribute * >(), LinkageSpec::Spec linkage = LinkageSpec::Cforall ) : Parent( name, attributes, linkage ), kind( kind ) {}
+        StructDecl( const StructDecl &other ) : Parent( other ), kind( other.kind ) {}
 
         bool is_coroutine() { return kind == DeclarationNode::Coroutine; }
@@ -277 +276 @@
         bool is_thread() { return kind == DeclarationNode::Thread; }
 
-        // Tagged/Tree Structure Excetion
-        bool get_tagged() { return tagged; }
-        void set_tagged( bool newValue ) { tagged = newValue; }
-        bool has_parent() { return parent_name != ""; }
-        std::string get_parentName() { return parent_name; }
-
         virtual StructDecl *clone() const { return new StructDecl( *this ); }
         virtual void accept( Visitor &v ) { v.visit( this ); }
@@ -289 +282 @@
         DeclarationNode::Aggregate kind;
         virtual std::string typeString() const;
-
-        bool tagged;
-        std::string parent_name;
 };
 
@@ -323 +313 @@
         typedef AggregateDecl Parent;
   public:
-        TraitDecl( const std::string &name, const std::list< Attribute * > & attributes ) : Parent( name ) {
+        TraitDecl( const std::string &name, const std::list< Attribute * > & attributes, LinkageSpec::Spec linkage ) : Parent( name, attributes, linkage ) {
                 assertf( attributes.empty(), "attribute unsupported for traits" );
         }