Changes in src/SynTree/Declaration.h [312029a:e67991f]

File:

• src/SynTree/Declaration.h (modified) (12 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 : Wed Dec 11 16:48:20 2019
-// Update Count     : 149
+// Last Modified By : Andrew Beach
+// Last Modified On : Thr May  2 10:47:00 2019
+// Update Count     : 135
 //
 
@@ -25 +25 @@
 #include "Mutator.h"             // for Mutator
 #include "Parser/LinkageSpec.h"  // for Spec, Cforall
+#include "Parser/ParseNode.h"    // for DeclarationNode, DeclarationNode::Ag...
 #include "SynTree.h"             // for UniqueId
 #include "SynTree/Type.h"        // for Type, Type::StorageClasses, Type::Fu...
@@ -193 +194 @@
         std::list< DeclarationWithType* >& get_assertions() { return assertions; }
 
-        virtual const char * typeString() const = 0;
+        virtual std::string typeString() const = 0;
 
         virtual NamedTypeDecl *clone() const override = 0;
@@ -236 +237 @@
         TypeDecl * set_sized( bool newValue ) { sized = newValue; return this; }
 
-        virtual const char * typeString() const override;
-        virtual const char * genTypeString() const;
+        virtual std::string typeString() const override;
+        virtual std::string genTypeString() const;
 
         virtual TypeDecl *clone() const override { return new TypeDecl( *this ); }
@@ -256 +257 @@
         TypedefDecl( const TypedefDecl &other ) : Parent( other ) {}
 
-        virtual const char * typeString() const override;
+        virtual std::string typeString() const override;
 
         virtual TypedefDecl *clone() const override { return new TypedefDecl( *this ); }
@@ -268 +269 @@
         typedef Declaration Parent;
   public:
-        enum Aggregate { Struct, Union, Enum, Exception, Trait, Generator, Coroutine, Monitor, Thread, NoAggregate };
-        static const char * aggrString( Aggregate aggr );
-
         std::list<Declaration*> members;
         std::list<TypeDecl*> parameters;
@@ -293 +291 @@
         virtual void printShort( std::ostream &os, Indenter indent = {} ) const override;
   protected:
-        virtual const char * typeString() const = 0;
+        virtual std::string typeString() const = 0;
 };
 
@@ -299 +297 @@
         typedef AggregateDecl Parent;
   public:
-        StructDecl( const std::string &name, Aggregate kind = 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 ) {}
         StructDecl( const StructDecl &other ) : Parent( other ), kind( other.kind ) {}
 
-        bool is_coroutine() { return kind == Coroutine; }
-        bool is_monitor() { return kind == Monitor; }
-        bool is_thread() { return kind == Thread; }
+        bool is_coroutine() { return kind == DeclarationNode::Coroutine; }
+        bool is_monitor() { return kind == DeclarationNode::Monitor; }
+        bool is_thread() { return kind == DeclarationNode::Thread; }
 
         virtual StructDecl *clone() const override { return new StructDecl( *this ); }
@@ -310 +308 @@
         virtual void accept( Visitor & v ) const override { v.visit( this ); }
         virtual Declaration *acceptMutator( Mutator &m )  override { return m.mutate( this ); }
-        Aggregate kind;
-  private:
-        virtual const char * typeString() const override;
+        DeclarationNode::Aggregate kind;
+  private:
+        virtual std::string typeString() const override;
 };
 
@@ -326 +324 @@
         virtual Declaration *acceptMutator( Mutator &m )  override { return m.mutate( this ); }
   private:
-        virtual const char * typeString() const override;
+        virtual std::string typeString() const override;
 };
 
@@ -343 +341 @@
   private:
         std::unordered_map< std::string, long long int > enumValues;
-        virtual const char * typeString() const override;
+        virtual std::string typeString() const override;
 };
 
@@ -359 +357 @@
         virtual Declaration *acceptMutator( Mutator &m )  override { return m.mutate( this ); }
   private:
-        virtual const char * typeString() const override;
+        virtual std::string typeString() const override;
 };