Changeset b1e63ac5 for src/SynTree/Declaration.h

Timestamp:

Jul 4, 2017, 9:40:16 AM (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:

208e5be

Parents:

9c951e3 (diff), f7cb0bc (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) (7 diffs)

src/SynTree/Declaration.h

@@ -9 +9 @@
 // Author           : Richard C. Bilson
 // Created On       : Mon May 18 07:44:20 2015
-// Last Modified By : Peter A. Buhr
-// Last Modified On : Fri Mar 17 16:05:08 2017
-// Update Count     : 121
+// Last Modified By : Andrew Beach
+// Last Modified On : Tus Jun 27 15:31:00 2017
+// Update Count     : 122
 //
 
@@ -194 +194 @@
         };
 
-        TypeDecl( const std::string &name, Type::StorageClasses scs, Type *type, Kind kind );
+        TypeDecl( const std::string &name, Type::StorageClasses scs, Type *type, Kind kind, Type * init = nullptr );
         TypeDecl( const TypeDecl &other );
+        virtual ~TypeDecl();
 
         Kind get_kind() const { return kind; }
+
+        Type * get_init() const { return init; }
+        TypeDecl * set_init( Type * newValue ) { init = newValue; return this; }
 
         bool isComplete() const { return kind == Any || sized; }
@@ -209 +213 @@
         virtual void accept( Visitor &v ) { v.visit( this ); }
         virtual TypeDecl *acceptMutator( Mutator &m ) { return m.mutate( this ); }
+        virtual void print( std::ostream &os, int indent = 0 ) const;
+
   private:
         Kind kind;
+        Type * init;
         bool sized;
 };
@@ -231 +238 @@
         typedef Declaration Parent;
   public:
-        AggregateDecl( const std::string &name, const std::list< Attribute * > & attributes = std::list< class Attribute * >() );
+        AggregateDecl( const std::string &name, const std::list< Attribute * > & attributes = std::list< class Attribute * >(), LinkageSpec::Spec linkage = LinkageSpec::Cforall );
         AggregateDecl( const AggregateDecl &other );
         virtual ~AggregateDecl();
@@ -259 +266 @@
         typedef AggregateDecl Parent;
   public:
-        StructDecl( const std::string &name, DeclarationNode::Aggregate kind = DeclarationNode::Struct, const std::list< Attribute * > & attributes = std::list< class Attribute * >() ) : Parent( name, attributes ), 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 ) {}
         StructDecl( const StructDecl &other ) : Parent( other ) {}
 
@@ -277 +284 @@
         typedef AggregateDecl Parent;
   public:
-        UnionDecl( const std::string &name, const std::list< Attribute * > & attributes = std::list< class Attribute * >() ) : Parent( name, attributes ) {}
+        UnionDecl( const std::string &name, const std::list< Attribute * > & attributes = std::list< class Attribute * >(), LinkageSpec::Spec linkage = LinkageSpec::Cforall ) : Parent( name, attributes, linkage ) {}
         UnionDecl( const UnionDecl &other ) : Parent( other ) {}
 
@@ -290 +297 @@
         typedef AggregateDecl Parent;
   public:
-        EnumDecl( const std::string &name, const std::list< Attribute * > & attributes = std::list< class Attribute * >() ) : Parent( name, attributes ) {}
+        EnumDecl( const std::string &name, const std::list< Attribute * > & attributes = std::list< class Attribute * >(), LinkageSpec::Spec linkage = LinkageSpec::Cforall ) : Parent( name, attributes, linkage ) {}
         EnumDecl( const EnumDecl &other ) : Parent( other ) {}