Changes in src/AST/Decl.hpp [23f99e1:8a5530c]

File:

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

src/AST/Decl.hpp

@@ -26 +26 @@
 #include "ParseNode.hpp"
 #include "StorageClasses.hpp"
-#include "Type.hpp"            // for Type, ptr<Type>
+#include "TypeVar.hpp"
 #include "Visitor.hpp"
 #include "Parser/ParseNode.h"  // for DeclarationNode::Aggregate
@@ -119 +119 @@
 };
 
+/// Object declaration `int foo()`
 class FunctionDecl : public DeclWithType {
 public:
@@ -131 +132 @@
           stmts( stmts ) {}
 
-        const Type * get_type() const override { return type.get(); }
-        void set_type(Type * t) override { type = strict_dynamic_cast< FunctionType* >( t ); }
+        const Type * get_type() const override;
+        void set_type(Type * t) override;
 
         bool has_body() const { return stmts; }
@@ -166 +167 @@
 class TypeDecl final : public NamedTypeDecl {
 public:
-        /// type variable variants. otype is a specialized dtype
-        enum Kind { Dtype, Ftype, Ttype, NUMBER_OF_KINDS } kind;
+        TypeVar::Kind kind;
         bool sized;
         ptr<Type> init;
@@ -173 +173 @@
         /// Data extracted from a type decl
         struct Data {
-                Kind kind;
+                TypeVar::Kind kind;
                 bool isComplete;
 
-                Data() : kind( (Kind)-1 ), isComplete( false ) {}
+                Data() : kind( (TypeVar::Kind)-1 ), isComplete( false ) {}
                 Data( TypeDecl* d ) : kind( d->kind ), isComplete( d->sized ) {}
-                Data( Kind k, bool c ) : kind( k ), isComplete( c ) {}
+                Data( TypeVar::Kind k, bool c ) : kind( k ), isComplete( c ) {}
                 Data( const Data& d1, const Data& d2 )
                 : kind( d1.kind ), isComplete( d1.isComplete || d2.isComplete ) {}
@@ -189 +189 @@
 
         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 ) {}
+                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;
         /// Produces a name for generated code
         std::string genTypeString() const;
+
+        /// convenience accessor to match Type::isComplete()
+        bool isComplete() { return sized; }
 
         const Decl * accept( Visitor & v ) const override { return v.visit( this ); }