Changeset 3b56166 for src/AST/Decl.hpp

Timestamp:

Feb 10, 2020, 11:17:38 AM (6 years ago)

Author:

Thierry Delisle <tdelisle@…>

Branches:

ADT, arm-eh, ast-experimental, enum, forall-pointer-decay, jacob/cs343-translation, jenkins-sandbox, master, new-ast, new-ast-unique-expr, pthread-emulation, qualifiedEnum

Children:

3966d9a, 41efd33

Parents:

807a632 (diff), d231700 (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/AST/Decl.hpp (modified) (18 diffs)

src/AST/Decl.hpp

@@ -9 +9 @@
 // Author           : Aaron B. Moss
 // Created On       : Thu May 9 10:00:00 2019
-// Last Modified By : Aaron B. Moss
-// Last Modified On : Thu May 9 10:00:00 2019
-// Update Count     : 1
+// Last Modified By : Peter A. Buhr
+// Last Modified On : Fri Dec 13 17:38:33 2019
+// Update Count     : 29
 //
 
@@ -20 +20 @@
 #include <unordered_map>
 #include <vector>
+#include <algorithm>
 
 #include "FunctionSpec.hpp"
@@ -27 +28 @@
 #include "ParseNode.hpp"
 #include "StorageClasses.hpp"
-#include "TypeVar.hpp"
 #include "Visitor.hpp"
-#include "Parser/ParseNode.h"  // for DeclarationNode::Aggregate
+#include "Common/utility.h"
+#include "Common/SemanticError.h"                                               // error_str
 
 // Must be included in *all* AST classes; should be #undef'd at the end of the file
@@ -125 +126 @@
         std::vector< ptr<Expr> > withExprs;
 
-        FunctionDecl( const CodeLocation & loc, const std::string &name, FunctionType * type,
+        FunctionDecl( const CodeLocation & loc, const std::string & name, FunctionType * type,
                 CompoundStmt * stmts, Storage::Classes storage = {}, Linkage::Spec linkage = Linkage::C,
                 std::vector<ptr<Attribute>>&& attrs = {}, Function::Specs fs = {})
@@ -136 +137 @@
         bool has_body() const { return stmts; }
 
-        const DeclWithType * accept( Visitor &v ) const override { return v.visit( this ); }
+        const DeclWithType * accept( Visitor & v ) const override { return v.visit( this ); }
 private:
         FunctionDecl * clone() const override { return new FunctionDecl( *this ); }
@@ -154 +155 @@
 
         /// Produces a name for the kind of alias
-        virtual std::string typeString() const = 0;
+        virtual const char * typeString() const = 0;
 
 private:
@@ -163 +164 @@
 /// Cforall type variable: `dtype T`
 class TypeDecl final : public NamedTypeDecl {
-public:
-        TypeVar::Kind kind;
+  public:
+        enum Kind { Dtype, Otype, Ftype, Ttype, NUMBER_OF_KINDS };
+
+        Kind kind;
         bool sized;
         ptr<Type> init;
@@ -170 +173 @@
         /// Data extracted from a type decl
         struct Data {
-                TypeVar::Kind kind;
+                Kind kind;
                 bool isComplete;
 
-                Data() : kind( (TypeVar::Kind)-1 ), isComplete( false ) {}
+                Data() : kind( NUMBER_OF_KINDS ), isComplete( false ) {}
                 Data( const TypeDecl * d ) : kind( d->kind ), isComplete( d->sized ) {}
-                Data( TypeVar::Kind k, bool c ) : kind( k ), isComplete( c ) {}
+                Data( Kind k, bool c ) : kind( k ), isComplete( c ) {}
                 Data( const Data & d1, const Data & d2 )
-                : kind( d1.kind ), isComplete( d1.isComplete || d2.isComplete ) {}
-
-                bool operator== ( const Data & o ) const {
-                        return kind == o.kind && isComplete == o.isComplete;
-                }
-                bool operator!= ( const Data & o ) const { return !(*this == o); }
+                        : kind( d1.kind ), isComplete( d1.isComplete || d2.isComplete ) {}
+
+                bool operator==( const Data & o ) const { return kind == o.kind && isComplete == o.isComplete; }
+                bool operator!=( const Data & o ) const { return !(*this == o); }
         };
 
-        TypeDecl( const CodeLocation& loc, const std::string& name, Storage::Classes storage, Type* b,
-                TypeVar::Kind k, bool s, Type* i = nullptr )
-        : NamedTypeDecl( loc, name, storage, b ), kind( k ), sized( k == TypeVar::Ttype || s ),
-          init( i ) {}
-
-        std::string typeString() const override;
+        TypeDecl( const CodeLocation & loc, const std::string & name, Storage::Classes storage, Type * b,
+                          Kind k, bool s, Type * i = nullptr )
+                : NamedTypeDecl( loc, name, storage, b ), kind( k ), sized( k == Ttype || s ),
+                init( i ) {}
+
+        const char * typeString() const override;
         /// Produces a name for generated code
-        std::string genTypeString() const;
+        const char * genTypeString() const;
 
         /// convenience accessor to match Type::isComplete()
@@ -198 +199 @@
 
         const Decl * accept( Visitor & v ) const override { return v.visit( this ); }
-private:
+  private:
         TypeDecl * clone() const override { return new TypeDecl{ *this }; }
         MUTATE_FRIEND
@@ -212 +213 @@
         : NamedTypeDecl( loc, name, storage, b, spec ) {}
 
-        std::string typeString() const override { return "typedef"; }
+        const char * typeString() const override { return "typedef"; }
 
         const Decl * accept( Visitor & v ) const override { return v.visit( this ); }
@@ -223 +224 @@
 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;
@@ -237 +241 @@
 
         /// Produces a name for the kind of aggregate
-        virtual std::string typeString() const = 0;
+        virtual const char * typeString() const = 0;
 
 private:
@@ -247 +251 @@
 class StructDecl final : public AggregateDecl {
 public:
-        DeclarationNode::Aggregate kind;
+        Aggregate kind;
 
         StructDecl( const CodeLocation& loc, const std::string& name,
-                DeclarationNode::Aggregate kind = DeclarationNode::Struct,
+                Aggregate kind = 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 == 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"; }
+        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 ); }
 
 private:
@@ -276 +280 @@
         const Decl * accept( Visitor& v ) const override { return v.visit( this ); }
 
-        std::string typeString() const override { return "union"; }
+        const char * typeString() const override { return aggrString( Union ); }
 
 private:
@@ -295 +299 @@
         const Decl * accept( Visitor & v ) const override { return v.visit( this ); }
 
-        std::string typeString() const override { return "enum"; }
+        const char * typeString() const override { return aggrString( Enum ); }
 
 private:
@@ -314 +318 @@
         const Decl * accept( Visitor & v ) const override { return v.visit( this ); }
 
-        std::string typeString() const override { return "trait"; }
+        const char * typeString() const override { return "trait"; }
 
 private:
@@ -340 +344 @@
         ptr<AsmStmt> stmt;
 
-        AsmDecl( const CodeLocation & loc, AsmStmt *stmt )
+        AsmDecl( const CodeLocation & loc, AsmStmt * stmt )
         : Decl( loc, "", {}, {} ), stmt(stmt) {}
 
-        const AsmDecl * accept( Visitor &v ) const override { return v.visit( this ); }
-private:
-        AsmDecl *clone() const override { return new AsmDecl( *this ); }
+        const AsmDecl * accept( Visitor & v ) const override { return v.visit( this ); }
+private:
+        AsmDecl * clone() const override { return new AsmDecl( *this ); }
         MUTATE_FRIEND
 };
@@ -357 +361 @@
         : Decl( loc, "", {}, {} ), cond( condition ), msg( msg ) {}
 
-        const StaticAssertDecl * accept( Visitor &v ) const override { return v.visit( this ); }
+        const StaticAssertDecl * accept( Visitor & v ) const override { return v.visit( this ); }
 private:
         StaticAssertDecl * clone() const override { return new StaticAssertDecl( *this ); }