Changes in src/AST/Decl.hpp [b0d9ff7:3606fe4]

File:

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

src/AST/Decl.hpp

@@ -108 +108 @@
         ObjectDecl( const CodeLocation & loc, const std::string & name, const Type * type,
                 const Init * init = nullptr, Storage::Classes storage = {},
-                Linkage::Spec linkage = Linkage::C, const Expr * bitWd = nullptr,
+                Linkage::Spec linkage = Linkage::Cforall, const Expr * bitWd = nullptr,
                 std::vector< ptr<Attribute> > && attrs = {}, Function::Specs fs = {} )
         : DeclWithType( loc, name, storage, linkage, std::move(attrs), fs ), type( type ),
@@ -143 +143 @@
         FunctionDecl( const CodeLocation & loc, const std::string & name, std::vector<ptr<TypeDecl>>&& forall,
                 std::vector<ptr<DeclWithType>>&& params, std::vector<ptr<DeclWithType>>&& returns,
-                CompoundStmt * stmts, Storage::Classes storage = {}, Linkage::Spec linkage = Linkage::C,
+                CompoundStmt * stmts, Storage::Classes storage = {}, Linkage::Spec linkage = Linkage::Cforall,
                 std::vector<ptr<Attribute>>&& attrs = {}, Function::Specs fs = {}, bool isVarArgs = false);
 
@@ -149 +149 @@
                 std::vector<ptr<TypeDecl>>&& forall, std::vector<ptr<DeclWithType>>&& assertions,
                 std::vector<ptr<DeclWithType>>&& params, std::vector<ptr<DeclWithType>>&& returns,
-                CompoundStmt * stmts, Storage::Classes storage = {}, Linkage::Spec linkage = Linkage::C,
+                CompoundStmt * stmts, Storage::Classes storage = {}, Linkage::Spec linkage = Linkage::Cforall,
                 std::vector<ptr<Attribute>>&& attrs = {}, Function::Specs fs = {}, bool isVarArgs = false);
 
@@ -217 +217 @@
 
         /// convenience accessor to match Type::isComplete()
-        bool isComplete() { return sized; }
+        bool isComplete() const { return sized; }
 
         const Decl * accept( Visitor & v ) const override { return v.visit( this ); }
@@ -312 +312 @@
 class EnumDecl final : public AggregateDecl {
 public:
-        bool isTyped;
         ptr<Type> base;
 
-        EnumDecl( const CodeLocation& loc, const std::string& name, bool isTyped = false, 
-                std::vector<ptr<Attribute>>&& attrs = {}, Linkage::Spec linkage = Linkage::Cforall,
-                Type const * base = nullptr,
+        EnumDecl( const CodeLocation& loc, const std::string& name,
+                std::vector<ptr<Attribute>>&& attrs = {}, Linkage::Spec linkage = Linkage::Cforall, Type const * base = nullptr,
                 std::unordered_map< std::string, long long > enumValues = std::unordered_map< std::string, long long >() )
-        : AggregateDecl( loc, name, std::move(attrs), linkage ), isTyped(isTyped), base(base), enumValues(enumValues) {}
+        : AggregateDecl( loc, name, std::move(attrs), linkage ), base(base), enumValues(enumValues) {}
 
         /// gets the integer value for this enumerator, returning true iff value found
@@ -329 +327 @@
         const char * typeString() const override { return aggrString( Enum ); }
 
+        bool isTyped() {return base && base.get();}
 
 private: