Changes in src/AST/Decl.hpp [312029a:e67991f]

File:

• src/AST/Decl.hpp (modified) (10 diffs)

src/AST/Decl.hpp

@@ -9 +9 @@
 // Author           : Aaron B. Moss
 // Created On       : Thu May 9 10:00:00 2019
-// Last Modified By : Peter A. Buhr
-// Last Modified On : Wed Dec 11 08:20:20 2019
-// Update Count     : 16
+// Last Modified By : Aaron B. Moss
+// Last Modified On : Thu May 9 10:00:00 2019
+// Update Count     : 1
 //
 
@@ -154 +154 @@
 
         /// Produces a name for the kind of alias
-        virtual const char * typeString() const = 0;
+        virtual std::string typeString() const = 0;
 
 private:
@@ -190 +190 @@
           init( i ) {}
 
-        const char * typeString() const override;
+        std::string typeString() const override;
         /// Produces a name for generated code
-        const char * genTypeString() const;
+        std::string genTypeString() const;
 
         /// convenience accessor to match Type::isComplete()
@@ -212 +212 @@
         : NamedTypeDecl( loc, name, storage, b, spec ) {}
 
-        const char * typeString() const override { return "typedef"; }
+        std::string typeString() const override { return "typedef"; }
 
         const Decl * accept( Visitor & v ) const override { return v.visit( this ); }
@@ -223 +223 @@
 class AggregateDecl : public Decl {
 public:
-        enum Aggregate { Struct, Union, Enum, Exception, Trait, Generator, Coroutine, Monitor, Thread, NoAggregate };
-        static const char * aggrString( Aggregate aggr );
-
         std::vector<ptr<Decl>> members;
         std::vector<ptr<TypeDecl>> params;
@@ -240 +237 @@
 
         /// Produces a name for the kind of aggregate
-        virtual const char * typeString() const = 0;
+        virtual std::string typeString() const = 0;
 
 private:
@@ -250 +247 @@
 class StructDecl final : public AggregateDecl {
 public:
-        Aggregate kind;
+        DeclarationNode::Aggregate kind;
 
         StructDecl( const CodeLocation& loc, const std::string& name,
-                Aggregate kind = Struct,
+                DeclarationNode::Aggregate kind = DeclarationNode::Struct,
                 std::vector<ptr<Attribute>>&& attrs = {}, Linkage::Spec linkage = Linkage::Cforall )
         : AggregateDecl( loc, name, std::move(attrs), linkage ), kind( kind ) {}
 
-        bool is_coroutine() { return kind == Coroutine; }
-        bool is_monitor() { return kind == Monitor; }
-        bool is_thread() { return kind == Thread; }
-
-        const Decl * accept( Visitor & v ) const override { return v.visit( this ); }
-
-        const char * typeString() const override { return aggrString( kind ); }
+        bool is_coroutine() { return kind == DeclarationNode::Coroutine; }
+        bool is_monitor() { return kind == DeclarationNode::Monitor; }
+        bool is_thread() { return kind == DeclarationNode::Thread; }
+
+        const Decl * accept( Visitor & v ) const override { return v.visit( this ); }
+
+        std::string typeString() const override { return "struct"; }
 
 private:
@@ -279 +276 @@
         const Decl * accept( Visitor& v ) const override { return v.visit( this ); }
 
-        const char * typeString() const override { return aggrString( Union ); }
+        std::string typeString() const override { return "union"; }
 
 private:
@@ -298 +295 @@
         const Decl * accept( Visitor & v ) const override { return v.visit( this ); }
 
-        const char * typeString() const override { return aggrString( Enum ); }
+        std::string typeString() const override { return "enum"; }
 
 private:
@@ -317 +314 @@
         const Decl * accept( Visitor & v ) const override { return v.visit( this ); }
 
-        const char * typeString() const override { return "trait"; }
+        std::string typeString() const override { return "trait"; }
 
 private: