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

File:

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

src/AST/Decl.hpp

@@ -105 +105 @@
         ptr<Init> init;
         ptr<Expr> bitfieldWidth;
+        bool enumInLine = false; // enum inline is not a real object declaration. 
+        // It is a place holder for a set of enum value (ObjectDecl)
+        bool importValue = false; // if the value copied from somewhere else
 
         ObjectDecl( const CodeLocation & loc, const std::string & name, const Type * type,
@@ -125 +128 @@
 class FunctionDecl : public DeclWithType {
 public:
+        std::vector<ptr<TypeDecl>> type_params;
+        std::vector<ptr<DeclWithType>> assertions;
         std::vector<ptr<DeclWithType>> params;
         std::vector<ptr<DeclWithType>> returns;
-        std::vector<ptr<TypeDecl>> type_params;
-        std::vector<ptr<DeclWithType>> assertions;
         // declared type, derived from parameter declarations
         ptr<FunctionType> type;
@@ -312 +315 @@
 class EnumDecl final : public AggregateDecl {
 public:
-        ptr<Type> base;
-
-        EnumDecl( const CodeLocation& loc, const std::string& name,
-                std::vector<ptr<Attribute>>&& attrs = {}, Linkage::Spec linkage = Linkage::Cforall, Type const * base = nullptr,
+        bool isTyped; // isTyped indicated if the enum has a declaration like:
+        // enum (type_optional) Name {...} 
+        ptr<Type> base; // if isTyped == true && base.get() == nullptr, it is a "void" type enum
+
+        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,
                 std::unordered_map< std::string, long long > enumValues = std::unordered_map< std::string, long long >() )
-        : AggregateDecl( loc, name, std::move(attrs), linkage ), base(base), enumValues(enumValues) {}
+        : AggregateDecl( loc, name, std::move(attrs), linkage ), isTyped(isTyped), base(base), enumValues(enumValues) {}
 
         /// gets the integer value for this enumerator, returning true iff value found
@@ -327 +333 @@
         const char * typeString() const override { return aggrString( Enum ); }
 
-        bool isTyped() {return base && base.get();}
 
 private: