Changeset 33218c6 for src/SynTree/Declaration.h

Timestamp:

Jul 26, 2017, 12:19:41 PM (8 years ago)

Author:

Thierry Delisle <tdelisle@…>

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:

b947fb2

Parents:

e0a653d (diff), ea91c42 (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) (5 diffs)

src/SynTree/Declaration.h

@@ -9 +9 @@
 // Author           : Richard C. Bilson
 // Created On       : Mon May 18 07:44:20 2015
-// Last Modified By : Andrew Beach
-// Last Modified On : Tus Jun 27 15:31:00 2017
-// Update Count     : 122
-//
-
-#ifndef DECLARATION_H
-#define DECLARATION_H
+// Last Modified By : Peter A. Buhr
+// Last Modified On : Sat Jul 22 09:52:59 2017
+// Update Count     : 124
+//
+
+#pragma once
 
 #include <string>
@@ -266 +265 @@
         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 ) {}
+        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 ) {}
 
@@ -273 +273 @@
         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 ); }
@@ -279 +285 @@
         DeclarationNode::Aggregate kind;
         virtual std::string typeString() const;
+
+        bool tagged;
+        std::string parent_name;
 };
 
@@ -342 +351 @@
 std::ostream & operator<<( std::ostream & out, const Declaration * decl );
 std::ostream & operator<<( std::ostream & os, const TypeDecl::Data & data );
-
-#endif // DECLARATION_H
 
 // Local Variables: //