Changeset 67467a3 for src/Parser/TypeData.h

Timestamp:

Mar 26, 2024, 3:17:51 PM (3 months ago)

Author:

Andrew Beach <ajbeach@…>

Branches:

master

Children:

544b799

Parents:

84886499

Message:

Fused TypeData::Enum and TypeData::Aggregate, an enumeration is a kind of aggregate after all. There will always be some unused fields in Aggregate_t (but less in TypeData? overall) but the code is almost always simpler.

File:

• src/Parser/TypeData.h (modified) (4 diffs)

src/Parser/TypeData.h

@@ -42 +42 @@
         static const char * builtinTypeNames[];
 
-        enum Kind { Basic, Pointer, Reference, Array, Function, Aggregate, AggregateInst, Enum, EnumConstant, Symbolic,
+        enum Kind { Basic, Pointer, Reference, Array, Function, Aggregate, AggregateInst, EnumConstant, Symbolic,
                                 SymbolicInst, Tuple, Basetypeof, Typeof, Vtable, Builtin, GlobalScope, Qualified, Unknown };
 
@@ -48 +48 @@
                 ast::AggregateDecl::Aggregate kind;
                 const std::string * name = nullptr;
+                // Polymorphics parameters. (Polymorphic types only.)
                 DeclarationNode * params = nullptr;
-                ExpressionNode * actuals = nullptr;                             // holds actual parameters later applied to AggInst
+                // Arguments later applied to AggInst. (Polymorphic types only.)
+                ExpressionNode * actuals = nullptr;
+                // Only set if body is true. (Constants for enumerations.)
                 DeclarationNode * fields = nullptr;
                 std::vector<ast::ptr<ast::Attribute>> attributes;
+                // Is this a declaration with a body (may have fields)?
                 bool body;
+                // Is this type anonymous? (Name can still be set to generated name.)
                 bool anon;
+                // Is this a typed enumeration? Type may be stored in base.
+                bool typed;
+                EnumHiding hiding;
         };
 
@@ -66 +74 @@
                 bool isVarLen;
                 bool isStatic;
-        };
-
-        struct Enumeration_t {
-                const std::string * name = nullptr;
-                DeclarationNode * constants = nullptr;
-                bool body;
-                bool anon;
-                bool typed;
-                EnumHiding hiding;
         };
 
@@ -114 +113 @@
         AggInst_t aggInst;
         Array_t array;
-        Enumeration_t enumeration;
         Function_t function;
         Symbolic_t symbolic;