Changeset a4da45e for src/Parser/TypeData.h

Timestamp:

Feb 26, 2024, 3:53:42 AM (7 months ago)

Author:

JiadaL <j82liang@…>

Branches:

master

Children:

3f9a8d0

Parents:

0522ebe (diff), 022bce0 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Resolve conflict

File:

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

src/Parser/TypeData.h

@@ -9 +9 @@
 // Author           : Peter A. Buhr
 // Created On       : Sat May 16 15:18:36 2015
-// Last Modified By : Andrew Beach
-// Last Modified On : Wed Mar  1 10:44:00 2023
-// Update Count     : 206
+// Last Modified By : Peter A. Buhr
+// Last Modified On : Thu Feb 22 16:30:31 2024
+// Update Count     : 210
 //
 
@@ -30 +30 @@
                 ast::AggregateDecl::Aggregate kind;
                 const std::string * name = nullptr;
+                const std::string * parent = nullptr;
                 DeclarationNode * params = nullptr;
                 ExpressionNode * actuals = nullptr;                             // holds actual parameters later applied to AggInst
                 DeclarationNode * fields = nullptr;
+                std::vector<ast::ptr<ast::Attribute>> attributes;
                 bool body;
                 bool anon;
                 bool tagged;
-                const std::string * parent = nullptr;
         };