Changes in src/AST/Decl.hpp [93c10de:19a8c40]

File:

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

src/AST/Decl.hpp

@@ -10 +10 @@
 // Created On       : Thu May 9 10:00:00 2019
 // Last Modified By : Andrew Beach
-// Last Modified On : Thu Nov 24  9:44:00 2022
-// Update Count     : 34
+// Last Modified On : Thu May  5 12:09:00 2022
+// Update Count     : 33
 //
 
@@ -191 +191 @@
         ptr<Type> init;
 
+        /// Data extracted from a type decl
+        struct Data {
+                Kind kind;
+                bool isComplete;
+
+                Data() : kind( NUMBER_OF_KINDS ), isComplete( false ) {}
+                Data( const TypeDecl * d ) : kind( d->kind ), isComplete( d->sized ) {}
+                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); }
+        };
+
         TypeDecl(
                 const CodeLocation & loc, const std::string & name, Storage::Classes storage,
@@ -210 +225 @@
 };
 
-/// Data extracted from a TypeDecl.
-struct TypeData {
-        TypeDecl::Kind kind;
-        bool isComplete;
-
-        TypeData() : kind( TypeDecl::NUMBER_OF_KINDS ), isComplete( false ) {}
-        TypeData( const TypeDecl * d ) : kind( d->kind ), isComplete( d->sized ) {}
-        TypeData( TypeDecl::Kind k, bool c ) : kind( k ), isComplete( c ) {}
-        TypeData( const TypeData & d1, const TypeData & d2 )
-                : kind( d1.kind ), isComplete( d1.isComplete || d2.isComplete ) {}
-
-        bool operator==( const TypeData & o ) const { return kind == o.kind && isComplete == o.isComplete; }
-        bool operator!=( const TypeData & o ) const { return !(*this == o); }
-};
-
-std::ostream & operator<< ( std::ostream &, const TypeData & );
+std::ostream & operator<< ( std::ostream &, const TypeDecl::Data & );
 
 /// C-style typedef `typedef Foo Bar`
@@ -315 +315 @@
         // enum (type_optional) Name {...} 
         ptr<Type> base; // if isTyped == true && base.get() == nullptr, it is a "void" type enum
-        enum class EnumHiding { Visible, Hide } hide;
-
-        EnumDecl( const CodeLocation& loc, const std::string& name, bool isTyped = false,
+
+        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, EnumHiding hide = EnumHiding::Hide,
+                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), hide(hide), 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